diff options
author | Steven Noonan <steven@uplinklabs.net> | 2009-11-06 20:54:07 -0800 |
---|---|---|
committer | Steven Noonan <steven@uplinklabs.net> | 2009-11-06 21:02:22 -0800 |
commit | a3d33d748cf5d5af11da58d2df95f84a4234cb9f (patch) | |
tree | a584eed1ccd36f81adefa1f7f3f8f8c8a7a409df /crawl-ref/source | |
parent | 31558c55c97a5ae21db0397a002d41bc77ef9abb (diff) | |
download | crawl-ref-a3d33d748cf5d5af11da58d2df95f84a4234cb9f.tar.gz crawl-ref-a3d33d748cf5d5af11da58d2df95f84a4234cb9f.zip |
makefile: rebuild .d files and contribs if CFLAGS change
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source')
m--------- | crawl-ref/source/contrib/freetype | 0 | ||||
m--------- | crawl-ref/source/contrib/libpng | 0 | ||||
m--------- | crawl-ref/source/contrib/lua | 0 | ||||
m--------- | crawl-ref/source/contrib/pcre | 0 | ||||
m--------- | crawl-ref/source/contrib/sdl | 0 | ||||
m--------- | crawl-ref/source/contrib/sdl-image | 0 | ||||
m--------- | crawl-ref/source/contrib/sqlite | 0 | ||||
m--------- | crawl-ref/source/contrib/zlib | 0 | ||||
-rw-r--r-- | crawl-ref/source/makefile | 8 |
9 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/contrib/freetype b/crawl-ref/source/contrib/freetype -Subproject 7874a109a69e517de726d9bea18d2b4b75ded3e +Subproject cac99cb9f73d905573139003985dd61b9dc905f diff --git a/crawl-ref/source/contrib/libpng b/crawl-ref/source/contrib/libpng -Subproject c87ba54002fd115b42de3689d1a68c2b22fe6c7 +Subproject daa25f2e089469710a365571b91e1e456755317 diff --git a/crawl-ref/source/contrib/lua b/crawl-ref/source/contrib/lua -Subproject ba3b6a4968195c29f7f0023b8106843fd2458e4 +Subproject 208b2258646674905fccada43a06219b4ebd1f8 diff --git a/crawl-ref/source/contrib/pcre b/crawl-ref/source/contrib/pcre -Subproject 0ac94b7dbb2835a3cf668799e56247e3fcc500f +Subproject 43b2adca20b1cab6039f502366d72ddfca411af diff --git a/crawl-ref/source/contrib/sdl b/crawl-ref/source/contrib/sdl -Subproject 2c4409bf2818e4da2ceb90cfe5c7551155db982 +Subproject e8c8283f8d94f559f84c5a4d0c3d3afe534bbea diff --git a/crawl-ref/source/contrib/sdl-image b/crawl-ref/source/contrib/sdl-image -Subproject 8c30f0d79add3b6ef586c8207bec7dc23759856 +Subproject 975a9df40a0d82c211bcc743e75ca814c614bcc diff --git a/crawl-ref/source/contrib/sqlite b/crawl-ref/source/contrib/sqlite -Subproject 582655fc04ad78968de280b9d928dc9ab16eec7 +Subproject afbc5cafcd3c23fc9f446e6cda0408bd968bec8 diff --git a/crawl-ref/source/contrib/zlib b/crawl-ref/source/contrib/zlib -Subproject 1b3a504bdd9e158ce234f731fdf8e80b3c8a8d6 +Subproject 25eeb98fc4448d4c556521beda2e0ddfdc9f513 diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 72922be698..935ef4a926 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -609,12 +609,12 @@ test: # This should eliminate an annoying need to use 'make clean' every time. # -TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)) +TRACK_CFLAGS = $(subst ','\'',$(CC) $(CXX) $(ALL_CFLAGS)) .cflags: .force-cflags @FLAGS='$(TRACK_CFLAGS)'; \ if test x"$$FLAGS" != x"`cat .cflags 2>/dev/null`" ; then \ - echo " * new build flags or prefix"; \ + echo " * rebuilding crawl: new build flags or prefix"; \ echo "$$FLAGS" > .cflags; \ fi @@ -625,7 +625,7 @@ TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)) ifeq ($(shell which fastdep 2> /dev/null),) -%.d: %.cc +%.d: %.cc .cflags $(QUIET_DEPEND)$(CXX) -MM $(ALL_CFLAGS) $< > $@ depend: $(OBJECTS:.o=.d) @@ -781,7 +781,7 @@ $(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) $(CONTRIB_LIBS) $(CONTRIB_LIBS): .contrib-libs @: -.contrib-libs: +.contrib-libs: .cflags +@$(MAKE) -C contrib $(CONTRIBS) @touch $@ |