[GRASS-SVN] r37929 - grass/trunk/include/Make

[svn_grass at osgeo.org]

Author: glynn
Date: 2009-06-18 14:11:37 -0400 (Thu, 18 Jun 2009)
New Revision: 37929

Modified:
   grass/trunk/include/Make/Compile.make
Log:
Fix handling of $($*_c_FLAGS) etc


Modified: grass/trunk/include/Make/Compile.make
===================================================================
--- grass/trunk/include/Make/Compile.make	2009-06-18 16:44:15 UTC (rev 37928)
+++ grass/trunk/include/Make/Compile.make	2009-06-18 18:11:37 UTC (rev 37929)
@@ -10,33 +10,33 @@
 linker = $(call linker_x,$(LINK))
 
 compiler_x = $(1) $(2) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC) -o $@ -c $<
-compiler_c = $(call compiler_x,$(CC),$(CFLAGS))
-compiler_cxx = $(call compiler_x,$(CXX),$(CXXFLAGS))
+compiler_c = $(call compiler_x,$(CC),$(CFLAGS) $($*_c_FLAGS))
+compiler_cxx = $(call compiler_x,$(CXX),$(CXXFLAGS) $($*_cc_FLAGS) $($*_cpp_FLAGS))
 compiler = $(call compiler_x,$(CC))
 
 # default cc rules
 ifeq ($(BROKEN_MAKE),)
 
-$(OBJDIR)/%.o : %.c $(LOCAL_HEADERS) $(EXTRA_HEADERS) $($*_c_FLAGS) | $(OBJDIR)
+$(OBJDIR)/%.o : %.c $(LOCAL_HEADERS) $(EXTRA_HEADERS) | $(OBJDIR)
 	$(call compiler_c)
 
-$(OBJDIR)/%.o : %.cc $(LOCAL_HEADERS) $(EXTRA_HEADERS) $($*_cc_FLAGS) | $(OBJDIR)
+$(OBJDIR)/%.o : %.cc $(LOCAL_HEADERS) $(EXTRA_HEADERS) | $(OBJDIR)
 	$(call compiler_cxx)
 
-$(OBJDIR)/%.o : %.cpp $(LOCAL_HEADERS) $(EXTRA_HEADERS) $($*_cpp_FLAGS) | $(OBJDIR)
+$(OBJDIR)/%.o : %.cpp $(LOCAL_HEADERS) $(EXTRA_HEADERS) | $(OBJDIR)
 	$(call compiler_cxx)
 
 else
 
-$(OBJDIR)/%.o : %.c $(LOCAL_HEADERS) $(EXTRA_HEADERS) $($*_c_FLAGS)
+$(OBJDIR)/%.o : %.c $(LOCAL_HEADERS) $(EXTRA_HEADERS)
 	$(MAKE) $(OBJDIR)
 	$(call compiler_c)
 
-$(OBJDIR)/%.o : %.cc $(LOCAL_HEADERS) $(EXTRA_HEADERS) $($*_cc_FLAGS)
+$(OBJDIR)/%.o : %.cc $(LOCAL_HEADERS) $(EXTRA_HEADERS)
 	$(MAKE) $(OBJDIR)
 	$(call compiler_cxx)
 
-$(OBJDIR)/%.o : %.cpp $(LOCAL_HEADERS) $(EXTRA_HEADERS) $($*_cpp_FLAGS)
+$(OBJDIR)/%.o : %.cpp $(LOCAL_HEADERS) $(EXTRA_HEADERS)
 	$(MAKE) $(OBJDIR)
 	$(call compiler_cxx)