aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2002-08-21 16:40:33 +0000
committerMax Horn2002-08-21 16:40:33 +0000
commit85a03808017fdaebb02d3c14bf7f5f15227e6c79 (patch)
treed258ddd96dcc0402fe968abfb5d314011bde088b
parent96476a9ca0d6cda09ef30273149e0820cb98e52e (diff)
downloadscummvm-rg350-85a03808017fdaebb02d3c14bf7f5f15227e6c79.tar.gz
scummvm-rg350-85a03808017fdaebb02d3c14bf7f5f15227e6c79.tar.bz2
scummvm-rg350-85a03808017fdaebb02d3c14bf7f5f15227e6c79.zip
really fixed dependency checking this time (I hope :-)
svn-id: r4793
-rw-r--r--Makefile.common5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.common b/Makefile.common
index 69258f2f98..a47208a554 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -61,7 +61,8 @@ clean:
# 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 @@ DEPFILES = $(wildcard $(DEPDIRS)/*.d) /dev/null
cat "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
rm -f "$(*D)/$(DEPDIR)/$(*F).d2"
--include $(DEPDIR)/*.d
+-include $(DEPFILES) /dev/null