[Scummvm-cvs-logs] CVS: scummvm-new Makefile.common,1.3,1.4

Max Horn fingolfin at users.sourceforge.net
Wed Aug 21 09:41:06 CEST 2002


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

Modified Files:
	Makefile.common 
Log Message:
really fixed dependency checking this time (I hope :-)

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/Makefile.common,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.common	21 Aug 2002 16:28:17 -0000	1.3
+++ Makefile.common	21 Aug 2002 16:40:33 -0000	1.4
@@ -61,7 +61,8 @@
 # dependency tracking. 
 DEPDIR := .deps
 DEPDIRS = $(patsubst %,%/$(DEPDIR),$(MODULES))
-DEPFILES = $(wildcard $(DEPDIRS)/*.d) /dev/null
+DEPFILES = $(wildcard $(patsubst %,%/$(DEPDIR)/*.d,$(MODULES)))
+
 .cpp.o:
 	mkdir -p $(*D)/$(DEPDIR)
 	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
@@ -69,4 +70,4 @@
 	cat "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
 	rm -f "$(*D)/$(DEPDIR)/$(*F).d2"
 
--include $(DEPDIR)/*.d
+-include $(DEPFILES) /dev/null





More information about the Scummvm-git-logs mailing list