Few minor script and flag changes

This commit is contained in:
Bastian M. Wojek
2009-06-20 05:50:09 +00:00
parent 52ae98ef9c
commit 117ccbf38a
6 changed files with 39 additions and 31 deletions

View File

@ -14,7 +14,7 @@ xml_DATA = musrfit_startup.xml
LIBADD = $(LEM_LIBS) $(PMUSR_LIBS)
AM_CFLAGS = -g -O3 -Wall -Wno-trigraphs
AM_CXXFLAGS = -Wall -Wno-trigraphs
INCLUDES = $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
LIBS = $(LEM_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS)

View File

@ -64,10 +64,10 @@ ext_source_dir = $(top_srcdir)/src/external/MuSR_software/Class_MuSR_PSI
ext_h_sources = $(ext_source_dir)/MuSR_td_PSI_bin.h $(ext_source_dir)/tydefs.h
ext_cpp_sources = $(ext_source_dir)/MuSR_td_PSI_bin.cpp
include_HEADERS = $(h_sources) $(ext_h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
include_HEADERS = $(h_sources) $(ext_source_dir)/MuSR_td_PSI_bin.h
noinst_HEADERS = $(h_linkdef) $(dict_h_sources) $(ext_source_dir)/tydefs.h
INCLUDES = -I$(top_srcdir)/src/include -I$(ext_source_dir) $(LEM_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
AM_CXXFLAGS = -g -O3 -Wall -Wno-trigraphs
AM_CXXFLAGS = -Wall -Wno-trigraphs
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
AM_CPPFLAGS = -I@ROOTINCDIR@

View File

@ -23,6 +23,7 @@ dict_cpp_sources = \
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
INCLUDES = -I. $(ROOT_CFLAGS)
AM_CXXFLAGS = -Wall -Wno-trigraphs
BUILT_SOURCES = $(dict_cpp_sources) $(dist_h_sources)
AM_CPPFLAGS = -I@ROOTINCDIR@