diff options
| author | tron <tron@openttd.org> | 2005-01-25 16:10:06 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-01-25 16:10:06 +0000 |
| commit | b85925cbae60b1f79ac223021bdd861968564617 (patch) | |
| tree | c29a2f5da2b12579c080fa7d85af3728e556e281 | |
| parent | fd8c74c83cd3e6503500a785c0eb433dc434de21 (diff) | |
| download | openttd-b85925cbae60b1f79ac223021bdd861968564617.tar.xz | |
(svn r1672) Simplify dependency tracking and actually implement it for C++ files, too.
Note: Do "make clean" to get rid of the old dependency files
| -rw-r--r-- | Makefile | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -667,8 +667,7 @@ ifdef WITH_DIRECTMUSIC CXX_SOURCES += w32dm2.cpp endif -DEPS1 = $(foreach obj,$(OBJS),.deps/$(obj)) -DEPS = $(DEPS1:%.o=%.P) +DEPS = $(OBJS:%.o=.deps/%.d) LANG_TXT = $(filter-out %.unfinished.txt,$(wildcard lang/*.txt)) LANGS = $(LANG_TXT:%.txt=%.lng) @@ -912,20 +911,19 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) # first compilation round as we just build everything at that time anyway, # therefore we do not need to watch deps. - %.o: %.c $(MAKE_CONFIG) endian.h table/strings.h @echo '===> Compiling $<' - @$(CC) $(CFLAGS) $(CDEFS) -Wp,-MD,.deps/$(*F).pp -c $< -o $@ - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - -# For DirectMusic build and BeOS specific parts + @$(CC) $(CFLAGS) $(CDEFS) -MD -c $< -o $@ + @mv $(<:%.c=%.d) $(<:%.c=.deps/%.d) + %.o: %.cpp $(MAKE_CONFIG) endian.h table/strings.h @echo '===> Compiling $<' - @$(CXX) $(CFLAGS) $(CDEFS) -c $< -o $@ + @$(CXX) $(CFLAGS) $(CDEFS) -MD -c $< -o $@ + @mv $(<:%.c=%.d) $(<:%.c=.deps/%.d) + +# Silence stale header dependencies +%.h: + @true info: |