diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2006-03-09 15:31:49 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2006-03-09 15:31:49 +0000 |
| commit | 5d9fdee3ddc6d3759744d0efb83577627efdd73c (patch) | |
| tree | 498976fd6302a8bc0908b81137008c5f078db772 /lib/make/make.configuration | |
| parent | 5f94cae865ed98a36e31b05677dbf3f32c5a2608 (diff) | |
Move the inclusion of bindings/Configuration/make.link from make.configuration
up into make.config.defn so that the latter file has a chance of appending
necessary system libs to the linker command line.
This applies patch http://www.cactuscode.org/old/pipermail/patches/2006-March/000156.html with a slight modification: the make.link file is included directly
in make.config.defn, not in make.extra.defn (as proposed in the original patch).
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4268 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.configuration')
| -rw-r--r-- | lib/make/make.configuration | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/make/make.configuration b/lib/make/make.configuration index 2d7c21c0..c71dab46 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -117,9 +117,6 @@ ALLCACTUSLIBS_BASE = $(notdir $(CACTUSLIBS) $(THORN_LINKLIST) $(CACTUSLIBS)) ALLCACTUSLIBS = $(ALLCACTUSLIBS_BASE:%=$(CCTK_LIBNAME_PREFIX)%) -# Include all required external libraries from configuration --include $(TOP)/bindings/Configuration/make.link - # Build the executable $(EXEDIR)$(DIRSEP)$(EXE): $(CONFIG)/make.thornlist $(CONFIG)/cctki_version.h $(patsubst %,$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX),$(notdir $(THORNS) $(CACTUSLIBS))) @echo Creating $(EXE) in $(EXEDIR) from $(THORNS) |