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/makefile | |
| 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/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 8 |
1 files changed, 4 insertions, 4 deletions
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 $@ |