LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

libBNMR is now fully integrated into automake

Browse Source
This commit is contained in:
salman 2015-02-04 09:34:05 +01:00
parent b7bd3c286e
commit 1f44fe33c1
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -786,6 +786,14 @@ if test "${PNEXUS_ENABLED}" = "1"; then
AC_SUBST(PNEXUS_CXXFLAGS) AC_SUBST(PNEXUS_CXXFLAGS)
fi fi
if test "${BUILD_BNMR_LIBS}" = "1"; then
BNMRLIBS_SRCDIR="${SRCDIR}/external/libBNMR"
BNMRLIBS_LIBS="${BNMRLIBS_SRCDIR}/libBNMR.la"
BNMRLIBS_CFLAGS="-I${BNMRLIBS_SRCDIR}"
AC_SUBST(BNMRLIBS_LIBS)
AC_SUBST(BNMRLIBS_CFLAGS)
fi
if test "${BUILD_BMW_LIBS}" = "1"; then if test "${BUILD_BMW_LIBS}" = "1"; then
BMWTOOLS_SRCDIR="${SRCDIR}/external/BMWtools" BMWTOOLS_SRCDIR="${SRCDIR}/external/BMWtools"
BMWTOOLS_LIBS="${BMWTOOLS_SRCDIR}/libBMWtools.la" BMWTOOLS_LIBS="${BMWTOOLS_SRCDIR}/libBMWtools.la"
@ -1158,6 +1166,7 @@ AC_CONFIG_FILES([Makefile \
src/external/libSpinValve/classes/Makefile \ src/external/libSpinValve/classes/Makefile \
src/external/libPhotoMeissner/Makefile \ src/external/libPhotoMeissner/Makefile \
src/external/libPhotoMeissner/classes/Makefile \ src/external/libPhotoMeissner/classes/Makefile \
src/external/libBNMR/Makefile \
src/musredit/musredit_startup.xml \ src/musredit/musredit_startup.xml \
src/musrgui/musrgui_startup.xml]) src/musrgui/musrgui_startup.xml])

6
src/external/Makefile.am vendored
View File

@ -19,4 +19,8 @@ if BUILD_BMWLIBS
libCalcMeanFieldsLEM libCalcMeanFieldsLEM
endif endif
SUBDIRS = $(ASDIRS) $(CUBADIRS) $(BMWDIRS) if BUILD_BNMRLIBS
BNMRDIRS = libBNMR
endif
SUBDIRS = $(ASDIRS) $(CUBADIRS) $(BMWDIRS) $(BNMRDIRS)

4
src/external/libBNMR/Makefile.am vendored
View File

@ -18,7 +18,7 @@ dict_cpp_sources = \
include_HEADERS = $(h_sources) include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LEM_CFLAGS) $(PMUSR_CFLAGS) $(CUBA_CFLAGS) -I$(ROOTINCDIR) AM_CPPFLAGS = -I$(top_srcdir)/src/include -I../include $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) -I$(ROOTINCDIR)
AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
@ -26,7 +26,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core CLEANFILES = *Dict.cpp *Dict.h *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h %Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libBNMR.la lib_LTLIBRARIES = libBNMR.la