Restructured the interdependencies within the BMWlibs (maybe other commits will follow)
This commit is contained in:
26
configure.ac
26
configure.ac
@ -490,17 +490,17 @@ AC_SUBST(PMUSR_LIBS)
|
||||
AC_SUBST(PMUSR_CFLAGS)
|
||||
|
||||
if test "${BUILD_BMW_LIBS}" = "1"; then
|
||||
BMWSTARTUP_SRCDIR="${SRCDIR}/external/BMWStartupHandler"
|
||||
BMWSTARTUP_LIBS="${BMWSTARTUP_SRCDIR}/libBMWstartup.la"
|
||||
BMWSTARTUP_CFLAGS="-I${BMWSTARTUP_SRCDIR}"
|
||||
AC_SUBST(BMWSTARTUP_LIBS)
|
||||
AC_SUBST(BMWSTARTUP_CFLAGS)
|
||||
BMWTOOLS_SRCDIR="${SRCDIR}/external/BMWtools"
|
||||
BMWTOOLS_LIBS="${BMWTOOLS_SRCDIR}/libBMWtools.la"
|
||||
BMWTOOLS_CFLAGS="-I${BMWTOOLS_SRCDIR}"
|
||||
AC_SUBST(BMWTOOLS_LIBS)
|
||||
AC_SUBST(BMWTOOLS_CFLAGS)
|
||||
|
||||
TFITPOFB_SRCDIR="${SRCDIR}/external/TFitPofB-lib"
|
||||
TFITPOFB_LIBS="${TFITPOFB_SRCDIR}/classes/libTFitPofB.la"
|
||||
TFITPOFB_CFLAGS="-I${TFITPOFB_SRCDIR}/include"
|
||||
AC_SUBST(TFITPOFB_LIBS)
|
||||
AC_SUBST(TFITPOFB_CFLAGS)
|
||||
FITPOFB_SRCDIR="${SRCDIR}/external/libFitPofB"
|
||||
FITPOFB_LIBS="${FITPOFB_SRCDIR}/classes/libFitPofB.la"
|
||||
FITPOFB_CFLAGS="-I${FITPOFB_SRCDIR}/include"
|
||||
AC_SUBST(FITPOFB_LIBS)
|
||||
AC_SUBST(FITPOFB_CFLAGS)
|
||||
|
||||
# Check for fftw3_threads-library. If available musrfit is also linked against it (used in libTFitPofB).
|
||||
SAVED_CFLAGS="$CFLAGS"
|
||||
@ -633,9 +633,9 @@ AC_CONFIG_FILES([Makefile \
|
||||
src/external/libCuba/Makefile \
|
||||
src/external/libCuba/src/Makefile \
|
||||
src/external/libCuba/src/cuba.pc \
|
||||
src/external/BMWStartupHandler/Makefile \
|
||||
src/external/TFitPofB-lib/Makefile \
|
||||
src/external/TFitPofB-lib/classes/Makefile \
|
||||
src/external/BMWtools/Makefile \
|
||||
src/external/libFitPofB/Makefile \
|
||||
src/external/libFitPofB/classes/Makefile \
|
||||
src/external/libLFRelaxation/Makefile \
|
||||
src/external/libGapIntegrals/Makefile \
|
||||
src/external/libCalcMeanFieldsLEM/Makefile \
|
||||
|
Reference in New Issue
Block a user