diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-19 15:41:20 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-19 15:54:30 -0700 |
| commit | 1aaa302b921816339ed347716916334c48bb9568 (patch) | |
| tree | 52c6490b31eaaec2419618b2c6f13830e7448c88 /crawl-ref/source/makefile | |
| parent | cd3d964fcd3612ea9a1112725fca92e0bd8741d9 (diff) | |
| download | crawl-ref-1aaa302b921816339ed347716916334c48bb9568.tar.gz crawl-ref-1aaa302b921816339ed347716916334c48bb9568.zip | |
makefile: force regeneration of compflag.h and build.h on revision change
The build.h and compflag.h files stayed around regardless of
whether or not they were dependencies of the .INTERMEDIATE
pseudo-target. This led to stale headers.
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 02461f17db..a5b852e83b 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -559,6 +559,8 @@ endif CONTRIB_DEPENDS += $(LIBLUA) $(LIBSQLITE) LIB += $(LIBLUA) $(LIBSQLITE) +EXTRA_OBJECTS += version.o + GAME_DEPENDS := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_DEPENDS) SRC_PKG_BASE := stone_soup SRC_VERSION := $(shell git describe --tags --long) @@ -595,7 +597,7 @@ depend: $(OBJECTS:.o=.cc) else depend: $(DEPENDENCY_MKF) -makefile.dep: .contrib-ok build.h compflag.h +makefile.dep: .contrib-ok %.dep: $(OBJECTS:.o=.cc) $(QUIET_DEPEND)fastdep $(DEFINES) $(INCLUDES) $(OBJECTS:.o=.cc) > $@ @@ -607,6 +609,8 @@ ifneq ($(MAKECMDGOALS),distclean) endif endif +.PHONY: compflag.h build.h version.cc + # This information is included in crash reports, and is printed with # "crawl -version" compflag.h: @@ -615,7 +619,7 @@ compflag.h: build.h: $(QUIET_GEN)util/gen_ver.pl $@ -version.o: build.h compflag.h +version.cc: build.h compflag.h ########################################################################## # The level compiler @@ -684,7 +688,7 @@ endif clean: +$(MAKE) -C $(UTIL) clean - $(RM) *.o *.ixx + $(RM) *.o *.ixx build.h compflag.h clean-contrib: +$(MAKE) -C contrib clean |