From: stephan b. <sg...@us...> - 2004-12-30 15:30:51
|
Update of /cvsroot/pclasses/pclasses2/toc/make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8008/toc/make Modified Files: toc.make.at toc_functions.make Log Message: Mass commit: a number of tweaks vis-a-vis CXXFLAGS and friends. Index: toc.make.at =================================================================== RCS file: /cvsroot/pclasses/pclasses2/toc/make/toc.make.at,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- toc.make.at 24 Dec 2004 23:06:28 -0000 1.2 +++ toc.make.at 30 Dec 2004 15:30:41 -0000 1.3 @@ -159,10 +159,10 @@ INCLUDES += -I$(top_srcdir)/include CPPFLAGS += -DHAVE_CONFIG_H=1 endif -ifeq (1,$(configure_cpp_debug)) - CPPFLAGS += -g -endif -CPPFLAGS += $(INCLUDES) $(WARN) $(CFLAGS_OPT) +#obsolete ifeq (1,$(configure_cpp_debug)) +# CPPFLAGS += -g +#endif +CPPFLAGS += $(INCLUDES) ##################################################### end C/C++ stuff Index: toc_functions.make =================================================================== RCS file: /cvsroot/pclasses/pclasses2/toc/make/toc_functions.make,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- toc_functions.make 22 Dec 2004 19:04:24 -0000 1.1 +++ toc_functions.make 30 Dec 2004 15:30:41 -0000 1.2 @@ -73,14 +73,14 @@ ###################################################################### # Experimental override of %.o:%.cpp COMPILE_COMMAND_CXX = $(CXX) $(CXXFLAGS) $($(subst .,_,$<)_CXXFLAGS) \ - $(CPPFLAGS) $($(subst .,_,$<)_CPPFLAGS) $($(<).CPPFLAGS) $(TARGET_ARCH) -c -o $@ $< + $(CPPFLAGS) $($(subst .,_,$<)_CPPFLAGS) -c -o $@ $< # ^^^ ..._CPPFLAGS == e.g., main.cpp.CPPFLAGS or main_cpp_CPPFLAGS %.o: %.cpp $(COMPILE_COMMAND_QUIET_PREFIX)$(COMPILE_COMMAND_CXX) ###################################################################### # Experimental override of %.o:%.c COMPILE_COMMAND_C = $(CC) $(CFLAGS) $($(subst .,_,$<)_CFLAGS) \ - $(CPPFLAGS) $($(subst .,_,$<)_CPPFLAGS) $(TARGET_ARCH) -c -o $@ $< + $(CPPFLAGS) $($(subst .,_,$<)_CPPFLAGS) -c -o $@ $< %.o: %.c $(COMPILE_COMMAND_QUIET_PREFIX)$(COMPILE_COMMAND_C) |