diff options
| author | sbrandt <sbrandt@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-06-18 17:48:27 +0000 |
|---|---|---|
| committer | sbrandt <sbrandt@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-06-18 17:48:27 +0000 |
| commit | 0d07ac21bf7db6765b83ea1bc88f9f4f05d63af7 (patch) | |
| tree | 4a411cf054e16707d91836e64c7cb666085689b3 /lib/make | |
| parent | 47a6b6f908ad8f4607cb8e7830d8159522ce0947 (diff) | |
Changes for ticket #768
Change per thorn -DTHORN_IS_xxx to a per thorn -I bindings/include/xxx
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4839 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make')
| -rw-r--r-- | lib/make/force-rebuild | 1 | ||||
| -rw-r--r-- | lib/make/make.config.defn.in | 3 | ||||
| -rw-r--r-- | lib/make/make.config.rules.in | 4 | ||||
| -rw-r--r-- | lib/make/make.subdir | 4 | ||||
| -rw-r--r-- | lib/make/make.thornlib | 4 |
5 files changed, 7 insertions, 9 deletions
diff --git a/lib/make/force-rebuild b/lib/make/force-rebuild index aebdb9fb..b4aece37 100644 --- a/lib/make/force-rebuild +++ b/lib/make/force-rebuild @@ -38,3 +38,4 @@ 20 Jan 2011: Generate prototypes for scheduled functions 27 Oct 2011: Optimize CCTK_ARGUMENTS for grid functions in Fortran 17 Jun 2012: Correct error in handling optional dependencies +18 Jun 2012: Ticket 768, switch from per thorn define to per thorn include diff --git a/lib/make/make.config.defn.in b/lib/make/make.config.defn.in index b8739498..083f1827 100644 --- a/lib/make/make.config.defn.in +++ b/lib/make/make.config.defn.in @@ -179,7 +179,8 @@ export CU_POSTPROCESSING = @CU_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 = cctk_Functions\.h|CParameterStructNames\.h|cctk_Arguments\.h|cctk_ScheduleFunctions\.h|definethisthorn\.h|FParameters.h|CParameters\.h|cctk_Capabilities\.h +#export DEP_EXCLUDE_FILES = # Command used to get the working directory export GET_WD = @GET_WD@ diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in index caef245d..0d8d2db6 100644 --- a/lib/make/make.config.rules.in +++ b/lib/make/make.config.rules.in @@ -62,12 +62,12 @@ endif # Define how to do dependencies ifeq ($(strip $(PERL_BACKUP_NECESSARY)),) define DEPENDENCY_FIXER - $(PERL) -pi -e "s,([^:]*),$(basename $@).o $(basename $@).d, if(m/: /);\ + #$(PERL) -pi -e "s,([^:]*),$(basename $@).o $(basename $@).d, if(m/: /);\ s:\s+\S*[/\\\]($(DEP_EXCLUDE_FILES))\b::g" $@ endef else define DEPENDENCY_FIXER - $(PERL) -pi.bak -e "s,([^:]*),$(basename $@).o $(basename $@).d, if(m/: /);\ + #$(PERL) -pi.bak -e "s,([^:]*),$(basename $@).o $(basename $@).d, if(m/: /);\ s:\s+\S*[/\\\]($(DEP_EXCLUDE_FILES))\b::g" $@ rm $@.bak endef diff --git a/lib/make/make.subdir b/lib/make/make.subdir index 8fc8bff6..51867b90 100644 --- a/lib/make/make.subdir +++ b/lib/make/make.subdir @@ -25,9 +25,7 @@ endif endif # Add appropriate include lines -INC_DIRS += $(SRCDIR) $(SRCDIR)/include - -EXTRA_DEFINES += THORN_IS_$(THORN) +INC_DIRS += $(SRCDIR) $(SRCDIR)/include $(BINDINGS_DIR)/include/$(THORN) # Include the subdirectory's local include data -include $(SRCDIR)/make.code.defn diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib index cedba537..2a174598 100644 --- a/lib/make/make.thornlib +++ b/lib/make/make.thornlib @@ -35,13 +35,11 @@ endif endif # Add appropriate include lines -INC_DIRS += $(SYS_INC_DIRS) $(SRCDIR) $(SRCDIR)/include $(CONFIG) $(BINDINGS_DIR)/include $(CCTK_HOME)/src/include $(CCTK_HOME)/arrangements $(BINDINGS_DIR)/Configuration/Thorns +INC_DIRS += $(SYS_INC_DIRS) $(SRCDIR) $(SRCDIR)/include $(CONFIG) $(BINDINGS_DIR)/include $(CCTK_HOME)/src/include $(CCTK_HOME)/arrangements $(BINDINGS_DIR)/Configuration/Thorns $(BINDINGS_DIR)/include/$(THORN) # Allow subdirectories to inherit these include directories export INC_DIRS -EXTRA_DEFINES += THORN_IS_$(THORN) - # Define some make variables PRE_WRAPPER = make.pre POST_WRAPPER = make.post |