[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.26,1.27

Max Horn fingolfin at users.sourceforge.net
Fri Nov 1 14:13:02 CET 2002


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

Modified Files:
	Makefile.common 
Log Message:
improved gcc build rule to avoid problems when files are removed from the repository, and to make it less likely that aborting a build leaves bad .d2 files around (thanks Willem!)

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.common	23 Oct 2002 08:02:36 -0000	1.26
+++ Makefile.common	1 Nov 2002 20:28:51 -0000	1.27
@@ -119,10 +119,7 @@
 
 .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"
+	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 
 -include $(DEPFILES) /dev/null
 





More information about the Scummvm-git-logs mailing list