From 6c57d5cac7b8f928c9ccf6ba916b23d85f1156e1 Mon Sep 17 00:00:00 2001
From: rhaas <rhaas@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Sat, 11 Aug 2012 21:10:45 +0000
Subject: reintroduce dependency fixup to avoid full compile when thornlist
 changes

this fixes an issue introduced in r4839 where the original patch removed
special treatment for three (or so) files, assuming that these files are not
generated any more. This was wrong, and this patch reverts special treatment
for one of these files.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@4862 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 lib/make/make.config.defn.in  | 2 +-
 lib/make/make.config.rules.in | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/make')

diff --git a/lib/make/make.config.defn.in b/lib/make/make.config.defn.in
index 9b8e13c6..3a21ad52 100644
--- a/lib/make/make.config.defn.in
+++ b/lib/make/make.config.defn.in
@@ -179,7 +179,7 @@ export F90_POSTPROCESSING  = @F90_POSTPROCESSING@
 export USE_RANLIB = @USE_RANLIB@
 
 # Exclude some files from the dependency lists
-#export DEP_EXCLUDE_FILES = cctk_Functions\.h|CParameterStructNames\.h|cctk_Arguments\.h|cctk_ScheduleFunctions\.h|definethisthorn\.h|FParameters.h|CParameters\.h|cctk_Capabilities\.h
+export DEP_EXCLUDE_FILES = CParameterStructNames\.h
 #export DEP_EXCLUDE_FILES =
 
 # Command used to get the working directory
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in
index 6afb23c0..5c146a68 100644
--- a/lib/make/make.config.rules.in
+++ b/lib/make/make.config.rules.in
@@ -67,11 +67,13 @@ endif
 # object file.
 ifeq ($(strip $(PERL_BACKUP_NECESSARY)),)
 define DEPENDENCY_FIXER
-	$(PERL) -pi -e 's{^\s*\Q$(basename $(basename $@)).o\E\s*:}{$(basename $@).o $(basename $@).d:}' $@
+	$(PERL) -pi -e 's{^\s*\Q$(basename $(basename $@)).o\E\s*:}{$(basename $@).o $(basename $@).d:};\
+                        s{\s+\S*[/\\]($(DEP_EXCLUDE_FILES))\b}{}g' $@
 endef
 else
 define DEPENDENCY_FIXER
-	$(PERL) -pi.bak -e 's{^\Q$(basename $(basename $@)).o:\E}{$(basename $@).o $(basename $@).d:}' $@
+	$(PERL) -pi.bak -e 's{^\Q$(basename $(basename $@)).o:\E}{$(basename $@).o $(basename $@).d:}\
+                            s{\s+\S*[/\\]($(DEP_EXCLUDE_FILES))\b}{}g' $@
 	rm $@.bak
 endef
 endif
-- 
cgit v1.2.3