From a3d33d748cf5d5af11da58d2df95f84a4234cb9f Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Fri, 6 Nov 2009 20:54:07 -0800
Subject: makefile: rebuild .d files and contribs if CFLAGS change

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
---
 crawl-ref/source/contrib/freetype  | 2 +-
 crawl-ref/source/contrib/libpng    | 2 +-
 crawl-ref/source/contrib/lua       | 2 +-
 crawl-ref/source/contrib/pcre      | 2 +-
 crawl-ref/source/contrib/sdl       | 2 +-
 crawl-ref/source/contrib/sdl-image | 2 +-
 crawl-ref/source/contrib/sqlite    | 2 +-
 crawl-ref/source/contrib/zlib      | 2 +-
 crawl-ref/source/makefile          | 8 ++++----
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/crawl-ref/source/contrib/freetype b/crawl-ref/source/contrib/freetype
index 7874a109a6..cac99cb9f7 160000
--- a/crawl-ref/source/contrib/freetype
+++ b/crawl-ref/source/contrib/freetype
@@ -1 +1 @@
-Subproject commit 7874a109a69e517de726d9bea18d2b4b75ded3eb
+Subproject commit cac99cb9f73d905573139003985dd61b9dc905f3
diff --git a/crawl-ref/source/contrib/libpng b/crawl-ref/source/contrib/libpng
index c87ba54002..daa25f2e08 160000
--- a/crawl-ref/source/contrib/libpng
+++ b/crawl-ref/source/contrib/libpng
@@ -1 +1 @@
-Subproject commit c87ba54002fd115b42de3689d1a68c2b22fe6c76
+Subproject commit daa25f2e089469710a365571b91e1e4567553173
diff --git a/crawl-ref/source/contrib/lua b/crawl-ref/source/contrib/lua
index ba3b6a4968..208b225864 160000
--- a/crawl-ref/source/contrib/lua
+++ b/crawl-ref/source/contrib/lua
@@ -1 +1 @@
-Subproject commit ba3b6a4968195c29f7f0023b8106843fd2458e47
+Subproject commit 208b2258646674905fccada43a06219b4ebd1f8c
diff --git a/crawl-ref/source/contrib/pcre b/crawl-ref/source/contrib/pcre
index 0ac94b7dbb..43b2adca20 160000
--- a/crawl-ref/source/contrib/pcre
+++ b/crawl-ref/source/contrib/pcre
@@ -1 +1 @@
-Subproject commit 0ac94b7dbb2835a3cf668799e56247e3fcc500f8
+Subproject commit 43b2adca20b1cab6039f502366d72ddfca411afc
diff --git a/crawl-ref/source/contrib/sdl b/crawl-ref/source/contrib/sdl
index 2c4409bf28..e8c8283f8d 160000
--- a/crawl-ref/source/contrib/sdl
+++ b/crawl-ref/source/contrib/sdl
@@ -1 +1 @@
-Subproject commit 2c4409bf2818e4da2ceb90cfe5c7551155db9828
+Subproject commit e8c8283f8d94f559f84c5a4d0c3d3afe534bbea9
diff --git a/crawl-ref/source/contrib/sdl-image b/crawl-ref/source/contrib/sdl-image
index 8c30f0d79a..975a9df40a 160000
--- a/crawl-ref/source/contrib/sdl-image
+++ b/crawl-ref/source/contrib/sdl-image
@@ -1 +1 @@
-Subproject commit 8c30f0d79add3b6ef586c8207bec7dc237598563
+Subproject commit 975a9df40a0d82c211bcc743e75ca814c614bcc3
diff --git a/crawl-ref/source/contrib/sqlite b/crawl-ref/source/contrib/sqlite
index 582655fc04..afbc5cafcd 160000
--- a/crawl-ref/source/contrib/sqlite
+++ b/crawl-ref/source/contrib/sqlite
@@ -1 +1 @@
-Subproject commit 582655fc04ad78968de280b9d928dc9ab16eec7d
+Subproject commit afbc5cafcd3c23fc9f446e6cda0408bd968bec80
diff --git a/crawl-ref/source/contrib/zlib b/crawl-ref/source/contrib/zlib
index 1b3a504bdd..25eeb98fc4 160000
--- a/crawl-ref/source/contrib/zlib
+++ b/crawl-ref/source/contrib/zlib
@@ -1 +1 @@
-Subproject commit 1b3a504bdd9e158ce234f731fdf8e80b3c8a8d6d
+Subproject commit 25eeb98fc4448d4c556521beda2e0ddfdc9f5133
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 $@
 
-- 
cgit v1.2.3-54-g00ecf