[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.35,1.36

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv5409

Modified Files:
	Makefile.common 
Log Message:
oops - default to gcc 2.9x build rules, not gcc 3.x build rules

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Makefile.common	21 Nov 2002 05:00:40 -0000	1.35
+++ Makefile.common	21 Nov 2002 05:10:30 -0000	1.36
@@ -50,18 +50,18 @@
 DEPDIRS = $(patsubst %,%/$(DEPDIR),$(MODULES))
 DEPFILES = $(wildcard $(patsubst %,%/*.d,$(DEPDIRS)))
 
-#.cpp.o:
-#	$(MKDIR) $(*D)/$(DEPDIR)
-#	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-#	$(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
-#	$(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
-#	$(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
+.cpp.o:
+	$(MKDIR) $(*D)/$(DEPDIR)
+	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+	$(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
+	$(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
+	$(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
 
 # If you even have GCC 3.x, you can use this build rule, which is safer; the above
 # rule can get you into a bad state if you Ctrl-C it in the wrong moment.
-.cpp.o:
-	$(MKDIR) $(*D)/$(DEPDIR)
-	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+#.cpp.o:
+#	$(MKDIR) $(*D)/$(DEPDIR)
+#	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 
 -include $(DEPFILES) /dev/null