[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.11,1.12

Travis Howell kirben at users.sourceforge.net
Sat Jul 13 02:42:03 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv22701

Modified Files:
	Makefile.common 
Log Message:



Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.common	12 Jul 2002 16:24:11 -0000	1.11
+++ Makefile.common	13 Jul 2002 09:41:21 -0000	1.12
@@ -33,19 +33,19 @@
 .PHONY: all clean dist
 
 # Default (dumb) compile & dependcy rules
-#.cpp.o:
-#	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-#$(OBJS): $(INCS)
+.cpp.o:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+$(OBJS): $(INCS)
 
 
 # If you use GCC, disable the above and enable this for intelligent
 # dependency tracking. 
-DEPDIR := .deps
-.cpp.o:
-	mkdir -p $(DEPDIR)
-	$(CC) -Wp,-MMD,"$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-	echo -n "$(*D)/" > $(DEPDIR)/$(*F).d
-	cat "$(DEPDIR)/$(*F).d2" >> "$(DEPDIR)/$(*F).d"
-	rm -f "$(DEPDIR)/$(*F).d2"
-
--include $(DEPDIR)/*.d
+#DEPDIR := .deps
+#.cpp.o:
+#	mkdir -p $(DEPDIR)
+#	$(CC) -Wp,-MMD,"$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+#	echo -n "$(*D)/" > $(DEPDIR)/$(*F).d
+#	cat "$(DEPDIR)/$(*F).d2" >> "$(DEPDIR)/$(*F).d"
+#	rm -f "$(DEPDIR)/$(*F).d2"
+#
+#-include $(DEPDIR)/*.d





More information about the Scummvm-git-logs mailing list