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

[svn_grass at osgeo.org]

Author: glynn
Date: 2011-09-29 16:42:27 -0700 (Thu, 29 Sep 2011)
New Revision: 48563

Modified:
   grass/trunk/include/Make/Compile.make
   grass/trunk/include/Make/Vars.make
Log:
Remove rules for .cc extension


Modified: grass/trunk/include/Make/Compile.make
===================================================================
--- grass/trunk/include/Make/Compile.make	2011-09-29 23:36:57 UTC (rev 48562)
+++ grass/trunk/include/Make/Compile.make	2011-09-29 23:42:27 UTC (rev 48563)
@@ -24,16 +24,13 @@
 
 compiler_x = $(1) $(2) $(ALL_CFLAGS) -o $@ -c $<
 compiler_c = $(call compiler_x,$(CC),$(COMPILE_FLAGS_C) $($*_c_FLAGS))
-compiler_cxx = $(call compiler_x,$(CXX),$(COMPILE_FLAGS_CXX) $($*_cc_FLAGS) $($*_cpp_FLAGS) $($*_cxx_FLAGS))
+compiler_cxx = $(call compiler_x,$(CXX),$(COMPILE_FLAGS_CXX) $($*_cxx_FLAGS))
 compiler = $(call compiler_x,$(CC))
 
 # default cc rules
 $(OBJDIR)/%.o : %.c $(LOCAL_HEADERS) $(EXTRA_HEADERS) | $(OBJDIR)
 	$(call compiler_c)
 
-$(OBJDIR)/%.o : %.cc $(LOCAL_HEADERS) $(EXTRA_HEADERS) | $(OBJDIR)
-	$(call compiler_cxx)
-
 $(OBJDIR)/%.o : %.cpp $(LOCAL_HEADERS) $(EXTRA_HEADERS) | $(OBJDIR)
 	$(call compiler_cxx)
 

Modified: grass/trunk/include/Make/Vars.make
===================================================================
--- grass/trunk/include/Make/Vars.make	2011-09-29 23:36:57 UTC (rev 48562)
+++ grass/trunk/include/Make/Vars.make	2011-09-29 23:42:27 UTC (rev 48563)
@@ -8,14 +8,12 @@
 endif
 
 C_SOURCES    := $(wildcard *.c)
-CC_SOURCES   := $(wildcard *.cc)
 CPP_SOURCES  := $(wildcard *.cpp)
 LEX_SOURCES  := $(wildcard *.l)
 YACC_SOURCES := $(wildcard *.y)
 
 AUTO_OBJS := \
 	$(subst .c,.o,$(C_SOURCES)) \
-	$(subst .cc,.o,$(CC_SOURCES)) \
 	$(subst .cpp,.o,$(CPP_SOURCES)) \
 	$(subst .l,.yy.o,$(LEX_SOURCES)) \
 	$(subst .y,.tab.o,$(YACC_SOURCES))