diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-07-11 16:38:42 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-07-11 16:38:42 +0000 |
| commit | eaf79d60885b04bdf01ad29dabf0be7929fe6ec4 (patch) | |
| tree | 62b7e341f97143d3a9ea173295c1c2eb3277c023 /lib/make/make.configuration | |
| parent | 260b979f161071c273803138789810305a26e775 (diff) | |
Use the new thornlib linklist for the Cactus linker commandline.
You need to also update lib/sbin/CST and then rebuild your configuration
in order to use the new liblist.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@2284 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.configuration')
| -rw-r--r-- | lib/make/make.configuration | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/make/make.configuration b/lib/make/make.configuration index 8ff1a120..1970aedf 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -22,15 +22,13 @@ export SCRATCH_BUILD=$(TOP)/scratch DATESTAMP = $(CCTK_HOME)/src/datestamp.c +export MAKE_DIR = $(CCTK_HOME)/lib/make + FLESHLIB = Cactus BINDINGSLIB= CactusBindings CACTUSLIBS = $(FLESHLIB) $(BINDINGSLIB) -export MAKE_DIR = $(CCTK_HOME)/lib/make - -ALLCACTUSLIBS = $(notdir $(CACTUSLIBS) $(THORNS) $(THORNS) $(CACTUSLIBS)) - # Dividers to make the screen output slightly nicer DIVEL = __________________ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL) @@ -74,6 +72,14 @@ endif UTIL_DIR=$(EXEDIR)$(DIRSEP)$(CONFIG_NAME) +# REMOVE IN BETA 12 +ifeq ($(strip $(THORN_LINKLIST)),) +THORN_LINKLIST = $(THORNS) $(THORNS) +endif + +# Build the list of all libraries +ALLCACTUSLIBS = $(notdir $(CACTUSLIBS) $(THORN_LINKLIST) $(CACTUSLIBS)) + # Use a phony main target to make sure we print a nice ending message 8-) .PHONY: main |