[Scummvm-cvs-logs] CVS: scummvm-new .cvsignore,NONE,1.1 Makefile.common,1.2,1.3

Max Horn fingolfin at users.sourceforge.net
Wed Aug 21 09:29:03 CEST 2002


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

Modified Files:
	Makefile.common 
Added Files:
	.cvsignore 
Log Message:
fixed the 'intelligent' GCC build rules; added .cvsignore files

--- NEW FILE: .cvsignore ---
.deps
scummvm

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/Makefile.common,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.common	21 Aug 2002 16:11:09 -0000	1.2
+++ Makefile.common	21 Aug 2002 16:28:17 -0000	1.3
@@ -2,6 +2,9 @@
 # This file is used by Makefile, Makefile.irix, Makefile.macosx and declares
 # common rules, a list of common object files etc.
 
+# List of all sub modules
+MODULES := common gui scumm simon sound
+
 ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
 
 INCS	= scumm/scumm.h common/scummsys.h common/stdafx.h
@@ -49,19 +52,21 @@
 .PHONY: all clean dist
 
 # Default (dumb) compile & dependcy rules
-.cpp.o:
-	$(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-$(OBJS): $(INCS)
+#.cpp.o:
+#	$(CXX) $(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 $(*D)/$(DEPDIR)
-#	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-#	echo -n "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
-#	cat "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
-#	rm -f "$(*D)/$(DEPDIR)/$(*F).d2"
-#
-#-include $(DEPDIR)/*.d
+DEPDIR := .deps
+DEPDIRS = $(patsubst %,%/$(DEPDIR),$(MODULES))
+DEPFILES = $(wildcard $(DEPDIRS)/*.d) /dev/null
+.cpp.o:
+	mkdir -p $(*D)/$(DEPDIR)
+	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+	echo -n "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
+	cat "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
+	rm -f "$(*D)/$(DEPDIR)/$(*F).d2"
+
+-include $(DEPDIR)/*.d





More information about the Scummvm-git-logs mailing list