diff options
| author | rhaas <rhaas@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-08-11 21:10:45 +0000 |
|---|---|---|
| committer | rhaas <rhaas@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-08-11 21:10:45 +0000 |
| commit | 6c57d5cac7b8f928c9ccf6ba916b23d85f1156e1 (patch) | |
| tree | 6ec27ccd9a52f8d9a3a903f3ef8d290e61a9d800 /lib | |
| parent | 871cb3851fa1ac81f4db5054761a1ffb6dd1b0c3 (diff) | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/make/make.config.defn.in | 2 | ||||
| -rw-r--r-- | lib/make/make.config.rules.in | 6 |
2 files changed, 5 insertions, 3 deletions
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 |