summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/Makefile
diff options
context:
space:
mode:
authorSamuel Bronson <naesten@gmail.com>2013-05-24 18:42:25 -0400
committerSamuel Bronson <naesten@gmail.com>2013-05-24 18:42:25 -0400
commit4fad727a0773f9fb312902350fcf054e3e307d51 (patch)
tree509085dba6aee05325bb05c02f41d89427b24700 /crawl-ref/source/Makefile
parent097fc10deed31e0fb79ab467885264b653519cb3 (diff)
downloadcrawl-ref-4fad727a0773f9fb312902350fcf054e3e307d51.tar.gz
crawl-ref-4fad727a0773f9fb312902350fcf054e3e307d51.zip
Revert "Don't rebuild everything when PCH is rebuilt due to external code."
This reverts commit 097fc10deed31e0fb79ab467885264b653519cb3.
Diffstat (limited to 'crawl-ref/source/Makefile')
-rw-r--r--crawl-ref/source/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
index 883b653f47..a95a055c2e 100644
--- a/crawl-ref/source/Makefile
+++ b/crawl-ref/source/Makefile
@@ -1397,10 +1397,7 @@ doxygen-all:
#
ifndef NO_INLINE_DEPGEN
# See info node: (gcc) Preprocessor Options
-INLINE_DEPGEN_CFLAGS += -MMD
-ifndef PCH
-INLINE_DEPGEN_CFLAGS += -fpch-deps
-endif
+INLINE_DEPGEN_CFLAGS = -MMD
endif
$(DEPS): %.d: %.cc
@@ -1420,7 +1417,7 @@ endif
# Plain old compilation
#
-$(OBJECTS:%.o=%.cc): $(CONTRIB_LIBS) | $(CC_DEP)
+$(OBJECTS:%.o=%.cc): $(CC_DEP) $(CONTRIB_LIBS)
$(UTIL)%.o: ALL_CFLAGS=$(YACC_CFLAGS)