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

Added ROOTAUXLIBS and ROOTAUXCFLAGS to the Makefiles

Browse Source
This commit is contained in:
Bastian M. Wojek
2009-06-22 13:54:55 +00:00
parent a983753912
commit bcebaacfd9
5 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -14,10 +14,6 @@ xml_DATA = musrfit_startup.xml
LIBADD = $(PMUSR_LIBS) $(LEM_LIBS)
# The ROOT flags and libs have to be specified here... different automake-versions do not expand the @...@ in the variable of configure.ac
ROOT_CFLAGS = -I@ROOTINCDIR@ @ROOTCFLAGS@
ROOT_LIBS = -L@ROOTLIBDIR@ @ROOTGLIBS@ -lMinuit2 -lMathMore -lXMLParser
AM_CXXFLAGS = $(LOCAL_BIN_CXXFLAGS)
AM_LDFLAGS = $(LOCAL_BIN_LDFLAGS)
INCLUDES = $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)

4
src/classes/Makefile.am
View File

@ -67,10 +67,6 @@ ext_cpp_sources = $(ext_source_dir)/MuSR_td_PSI_bin.cpp
include_HEADERS = $(h_sources) $(ext_source_dir)/MuSR_td_PSI_bin.h
noinst_HEADERS = $(h_linkdef) $(dict_h_sources) $(ext_source_dir)/tydefs.h
# The ROOT flags and libs have to be specified here... different automake-versions do not expand the @...@ in the variable of configure.ac
ROOT_CFLAGS = -I@ROOTINCDIR@ @ROOTCFLAGS@
ROOT_LIBS = -L@ROOTLIBDIR@ @ROOTGLIBS@ -lMinuit2 -lMathMore -lXMLParser
INCLUDES = -I$(top_srcdir)/src/include -I$(ext_source_dir) $(LEM_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)

3
src/external/TLemRunHeader/Makefile.am vendored
View File

@ -23,9 +23,6 @@ dict_cpp_sources = \
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
ROOT_CFLAGS = -I@ROOTINCDIR@ @ROOTCFLAGS@
ROOT_LIBS = -L@ROOTLIBDIR@ @ROOTGLIBS@
INCLUDES = -I. $(ROOT_CFLAGS)
AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)