From 596dd570c76b8e22c7a426a4ff7871a7b630e3a4 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 15 Dec 2016 12:26:53 +0000 Subject: [PATCH] Linux linking fix --- extras/Hadrons/Makefile.am | 4 ++-- scripts/filelist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/Hadrons/Makefile.am b/extras/Hadrons/Makefile.am index bdc23efb..9cb23600 100644 --- a/extras/Hadrons/Makefile.am +++ b/extras/Hadrons/Makefile.am @@ -23,7 +23,7 @@ nobase_libHadrons_a_HEADERS = \ ModuleFactory.hpp HadronsXmlRun_SOURCES = HadronsXmlRun.cc -HadronsXmlRun_LDADD = -lGrid libHadrons.a +HadronsXmlRun_LDADD = libHadrons.a -lGrid HadronsXmlSchedule_SOURCES = HadronsXmlSchedule.cc -HadronsXmlSchedule_LDADD = -lGrid libHadrons.a +HadronsXmlSchedule_LDADD = libHadrons.a -lGrid diff --git a/scripts/filelist b/scripts/filelist index ca7425c0..1ab95c7c 100755 --- a/scripts/filelist +++ b/scripts/filelist @@ -24,11 +24,11 @@ for subdir in $dirs; do echo "tests: ${TESTLIST} ${SUB}" > Make.inc echo ${PREF}_PROGRAMS = ${TESTLIST} >> Make.inc echo >> Make.inc - HADLINK=`[ $subdir = './hadrons' ] && echo '-lHadrons'` + HADLINK=`[ $subdir = './hadrons' ] && echo '-lHadrons '` for f in $TESTS; do BNAME=`basename $f .cc` echo ${BNAME}_SOURCES=$f >> Make.inc - echo ${BNAME}_LDADD=-lGrid ${HADLINK} >> Make.inc + echo ${BNAME}_LDADD=${HADLINK}-lGrid >> Make.inc echo >> Make.inc done if [ $subdir != '.' ]; then