Fixed the recursive building of musrfit in case only a subset of optional plug-ins is selected (make dist is not working at the moment)
This commit is contained in:
parent
a270d81853
commit
9c78332387
17
configure.ac
17
configure.ac
@ -478,6 +478,9 @@ dnl -----------------------------------------------
|
|||||||
dnl Specify the files that are going to be created by configure
|
dnl Specify the files that are going to be created by configure
|
||||||
dnl -----------------------------------------------
|
dnl -----------------------------------------------
|
||||||
|
|
||||||
|
AM_CONDITIONAL([BMW_OPT], [test "${BUILD_BMW_LIBS}" -eq 1])
|
||||||
|
AM_CONDITIONAL([AS_OPT], [test "${BUILD_AS_LIBS}" -eq 1])
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile \
|
AC_CONFIG_FILES([Makefile \
|
||||||
src/Makefile \
|
src/Makefile \
|
||||||
src/classes/Makefile \
|
src/classes/Makefile \
|
||||||
@ -490,18 +493,12 @@ AC_CONFIG_FILES([Makefile \
|
|||||||
src/external/MuSR_software/Class_MuSR_PSI/Class_MuSR_PSI.pc \
|
src/external/MuSR_software/Class_MuSR_PSI/Class_MuSR_PSI.pc \
|
||||||
src/external/mud/Makefile \
|
src/external/mud/Makefile \
|
||||||
src/external/mud/src/Makefile \
|
src/external/mud/src/Makefile \
|
||||||
src/external/mud/src/mud.pc])
|
src/external/mud/src/mud.pc \
|
||||||
|
src/external/TFitPofB-lib/Makefile \
|
||||||
if test "${BUILD_BMW_LIBS}" -eq 1; then
|
|
||||||
AC_CONFIG_FILES([src/external/TFitPofB-lib/Makefile \
|
|
||||||
src/external/TFitPofB-lib/classes/Makefile \
|
src/external/TFitPofB-lib/classes/Makefile \
|
||||||
src/external/libLFRelaxation/Makefile \
|
src/external/libLFRelaxation/Makefile \
|
||||||
src/external/libGapIntegrals/Makefile \
|
src/external/libGapIntegrals/Makefile \
|
||||||
src/external/libCalcMeanFieldsLEM/Makefile])
|
src/external/libCalcMeanFieldsLEM/Makefile \
|
||||||
fi
|
src/external/Nonlocal/Makefile])
|
||||||
|
|
||||||
if test "${BUILD_AS_LIBS}" -eq 1; then
|
|
||||||
AC_CONFIG_FILES([src/external/Nonlocal/Makefile])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
17
src/external/Makefile.am
vendored
17
src/external/Makefile.am
vendored
@ -1,5 +1,12 @@
|
|||||||
SUBDIRS = TFitPofB-lib \
|
if AS_OPT
|
||||||
libLFRelaxation \
|
ASDIRS = Nonlocal
|
||||||
libGapIntegrals \
|
endif
|
||||||
libCalcMeanFieldsLEM \
|
|
||||||
Nonlocal
|
if BMW_OPT
|
||||||
|
BMWDIRS = TFitPofB-lib \
|
||||||
|
libLFRelaxation \
|
||||||
|
libGapIntegrals \
|
||||||
|
libCalcMeanFieldsLEM
|
||||||
|
endif
|
||||||
|
|
||||||
|
SUBDIRS = $(ASDIRS) $(BMWDIRS)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user