aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Brown2002-11-02 08:16:04 +0000
committerJames Brown2002-11-02 08:16:04 +0000
commit35678731d91410c60a9f00bce0d037b252e45044 (patch)
tree8737e86537a1fe60af54b7529ba76ac49dab8187
parent9e114938d3a198429eea38286719ffb68da43c40 (diff)
downloadscummvm-rg350-35678731d91410c60a9f00bce0d037b252e45044.tar.gz
scummvm-rg350-35678731d91410c60a9f00bce0d037b252e45044.tar.bz2
scummvm-rg350-35678731d91410c60a9f00bce0d037b252e45044.zip
Revert back to revision 1.26.
Fingolfin, this breaks compilation on linux gcc 2.9x.. debian at least. svn-id: r5372
-rw-r--r--Makefile.common5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common
index 1621c0b6c1..4908c32a09 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -119,7 +119,10 @@ DEPFILES = $(wildcard $(patsubst %,%/$(DEPDIR)/*.d,$(MODULES)))
.cpp.o:
$(MKDIR) $(*D)/$(DEPDIR)
- $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+ $(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"
-include $(DEPFILES) /dev/null