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

Merged the TLemRunHeader-lib into the musrfit tree and extended the Makefiles to work on further platforms - still some tests on non-Linux systems are missing...

Browse Source
This commit is contained in:
Bastian M. Wojek
2009-06-10 14:45:10 +00:00
parent 8a9750155e
commit 4fdedbefad
2 changed files with 115 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Makefile
View File

@ -24,10 +24,13 @@ ARCH = $(shell $(ROOTSYS)/bin/root-config --arch)
ifeq ($(ARCH),linux) ifeq ($(ARCH),linux)
OS = LINUX OS = LINUX
endif endif
ifeq ($(ARCH),linuxx8664gcc)
OS = LINUX
endif
ifeq ($(ARCH),win32gcc) ifeq ($(ARCH),win32gcc)
OS = WIN32GCC OS = WIN32GCC
endif endif
ifeq ($(ARCH),darwin) ifeq ($(ARCH),macosx)
OS = DARWIN OS = DARWIN
endif endif
@ -40,7 +43,7 @@ MNPATH = $(ROOTSYS)/include
INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) INCLUDES = -I$(PMUSRPATH) -I$(MNPATH)
LD = g++ LD = g++
LDFLAGS = -O LDFLAGS = -O
INSTALLPATH = $(HOME)/analysis/bin INSTALLPATH = $(ROOTSYS)/bin
EXEC = musrfit musrview musrparam musrt0 msr2msr EXEC = musrfit musrview musrparam musrt0 msr2msr
SUFFIX = SUFFIX =
endif endif
@ -51,7 +54,7 @@ CXX = g++
CXXFLAGS = -O3 -Wall CXXFLAGS = -O3 -Wall
PMUSRPATH = ./include PMUSRPATH = ./include
MNPATH = $(ROOTSYS)/include MNPATH = $(ROOTSYS)/include
BOOSTPATH = /usr/include/boost BOOSTPATH = /usr/include
INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(BOOSTPATH) INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(BOOSTPATH)
LD = g++ LD = g++
LDFLAGS = -O -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc LDFLAGS = -O -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc
@ -60,14 +63,17 @@ EXEC = musrfit.exe musrview.exe musrparam.exe musrt0.exe msr2msr.exe
SUFFIX = .exe SUFFIX = .exe
endif endif
# -- Darwin # -- MacOSX/Darwin
ifeq ($(OS),DARWIN) ifeq ($(OS),DARWIN)
CXX = g++ CXX = g++
CXXFLAGS = -g -Wall -fPIC CXXFLAGS = -O3 -Wall -fPIC
INCLUDES = -I../include PMUSRPATH = ./include
MNPATH = $(ROOTSYS)/include
BOOSTPATH = /sw/include
INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(BOOSTPATH)
LD = g++ LD = g++
LDFLAGS = -g LDFLAGS = -O
INSTALLPATH = $(HOME)/analysis/bin INSTALLPATH = $(ROOTSYS)/bin
EXEC = musrfit musrview musrparam musrt0 msr2msr EXEC = musrfit musrview musrparam musrt0 msr2msr
SUFFIX = SUFFIX =
endif endif
@ -97,31 +103,31 @@ all: $(EXEC)
musrfit$(SUFFIX): musrfit.o musrfit$(SUFFIX): musrfit.o
@echo "---> Building $@ ..." @echo "---> Building $@ ..."
/bin/rm -f $(SHLIB) /bin/rm -f $@
$(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB) $(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB)
@echo "done" @echo "done"
musrview$(SUFFIX): musrview.o musrview$(SUFFIX): musrview.o
@echo "---> Building $@ ..." @echo "---> Building $@ ..."
/bin/rm -f $(SHLIB) /bin/rm -f $@
$(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB) $(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB)
@echo "done" @echo "done"
musrt0$(SUFFIX): musrt0.o musrt0$(SUFFIX): musrt0.o
@echo "---> Building $@ ..." @echo "---> Building $@ ..."
/bin/rm -f $(SHLIB) /bin/rm -f $@
$(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB) $(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB)
@echo "done" @echo "done"
musrparam$(SUFFIX): musrparam.o musrparam$(SUFFIX): musrparam.o
@echo "---> Building $@ ..." @echo "---> Building $@ ..."
/bin/rm -f $(SHLIB) /bin/rm -f $@
$(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB) $(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB)
@echo "done" @echo "done"
msr2msr$(SUFFIX): msr2msr.o msr2msr$(SUFFIX): msr2msr.o
@echo "---> Building $@ ..." @echo "---> Building $@ ..."
/bin/rm -f $(SHLIB) /bin/rm -f $@
$(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB) $(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB)
@echo "done" @echo "done"

116
src/classes/Makefile.PMusr
View File

@ -32,10 +32,13 @@ ARCH = $(shell $(ROOTSYS)/bin/root-config --arch)
ifeq ($(ARCH),linux) ifeq ($(ARCH),linux)
OS = LINUX OS = LINUX
endif endif
ifeq ($(ARCH),linuxx8664gcc)
OS = LINUX
endif
ifeq ($(ARCH),win32gcc) ifeq ($(ARCH),win32gcc)
OS = WIN32GCC OS = WIN32GCC
endif endif
ifeq ($(ARCH),darwin) ifeq ($(ARCH),macosx)
OS = DARWIN OS = DARWIN
endif endif
@ -46,12 +49,15 @@ CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC
PMUSRPATH = ../include PMUSRPATH = ../include
MNPATH = $(ROOTSYS)/include MNPATH = $(ROOTSYS)/include
GSLPATH = /usr/include/gsl GSLPATH = /usr/include/gsl
PSIBINPATH = ../external/MuSR_software/Class_MuSR_PSI BOOSTPATH = /usr/include
FFTW3PATH = /usr/local/include FFTW3PATH = /usr/local/include
INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(PSIBINPATH) -I$(FFTW3PATH) LEMPATH = ../external/TLemRunHeader
PSIBINPATH = ../external/MuSR_software/Class_MuSR_PSI
INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(BOOSTPATH) -I$(LEMPATH) -I$(PSIBINPATH) -I$(FFTW3PATH)
LD = g++ LD = g++
LDFLAGS = -O LDFLAGS = -O
SOFLAGS = -shared SOFLAGS = -shared
LEMLIB = libTLemRunHeader.so
SHLIB = libPMusr.so SHLIB = libPMusr.so
endif endif
@ -62,25 +68,36 @@ CXXFLAGS = -O3 -Wall -Wno-trigraphs -D_DLL
PMUSRPATH = ../include PMUSRPATH = ../include
MNPATH = $(ROOTSYS)/include MNPATH = $(ROOTSYS)/include
GSLPATH = /usr/include/gsl GSLPATH = /usr/include/gsl
BOOSTPATH = /usr/include/boost BOOSTPATH = /usr/include
PSIBINPATH = ../external/MuSR_software/Class_MuSR_PSI
FFTW3PATH = /usr/include FFTW3PATH = /usr/include
INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(BOOSTPATH) -I$(PSIBINPATH) -I$(FFTW3PATH) LEMPATH = ../external/TLemRunHeader
PSIBINPATH = ../external/MuSR_software/Class_MuSR_PSI
INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(BOOSTPATH) -I$(LEMPATH) -I$(PSIBINPATH) -I$(FFTW3PATH)
LD = g++ LD = g++
LDFLAGS = -O -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc LDFLAGS = -O -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc
SOFLAGS = -shared -Wl,--export-all-symbols SOFLAGS = -shared -Wl,--export-all-symbols
LEMLIB = libTLemRunHeader.dll
SHLIB = libPMusr.dll SHLIB = libPMusr.dll
endif endif
# -- Darwin # -- MacOSX/Darwin
ifeq ($(OS),DARWIN) ifeq ($(OS),DARWIN)
CXX = g++ CXX = g++
CXXFLAGS = -g -Wall -Wno-trigraphs -fPIC CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC
INCLUDES = -I../include PMUSRPATH = ../include
MNPATH = $(ROOTSYS)/include
FINKPATH = /sw/include
GSLPATH = $(FINKPATH)/gsl
BOOSTPATH = $(FINKPATH)
FFTW3PATH = $(FINKPATH)
LEMPATH = ../external/TLemRunHeader
PSIBINPATH = ../external/MuSR_software/Class_MuSR_PSI
INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(BOOSTPATH) -I$(LEMPATH) -I$(PSIBINPATH) -I$(FFTW3PATH)
LD = g++ LD = g++
LDFLAGS = -g LDFLAGS = -O -Xlinker -bind_at_load
SOFLAGS = -dynamic SOFLAGS = -dynamiclib -flat_namespace -undefined suppress -Wl,-x
SHLIB = libPMusr.so LEMLIB = libTLemRunHeader.dylib
SHLIB = libPMusr.dylib
endif endif
# the output from the root-config script: # the output from the root-config script:
@ -91,8 +108,8 @@ LDFLAGS +=
LIBS = $(ROOTLIBS) -lXMLParser LIBS = $(ROOTLIBS) -lXMLParser
GLIBS = $(ROOTGLIBS) -lXMLParser GLIBS = $(ROOTGLIBS) -lXMLParser
# PSI libs # LEM run header
PSILIBS = -L$(ROOTSYS)/lib -lTLemRunHeader PSILIB = -L. -lTLemRunHeader
# Minuit2 lib # Minuit2 lib
MNLIB = -L$(ROOTSYS)/lib -lMinuit2 MNLIB = -L$(ROOTSYS)/lib -lMinuit2
# GSL lib # GSL lib
@ -109,6 +126,14 @@ GSLLIB = -L/usr/lib -lgslcblas -lgsl
FFTW3LIB = -L/usr/lib -lfftw3 FFTW3LIB = -L/usr/lib -lfftw3
endif endif
ifeq ($(OS),DARWIN)
# Minuit2 lib
MNLIB = -L$(ROOTSYS)/lib -lMinuit2 -lMathMore
# GSL lib
GSLLIB = -L/sw/lib -lgslcblas -lgsl
# FFTW lib
FFTW3LIB = -L/sw/lib -lfftw3
endif
# some definitions: headers (used to generate *Dict* stuff), sources, objects,... # some definitions: headers (used to generate *Dict* stuff), sources, objects,...
OBJS = OBJS =
@ -131,32 +156,57 @@ OBJS += PUserFcnBase.o PUserFcnBaseDict.o
OBJS += PFourier.o OBJS += PFourier.o
OBJS += PMusrT0.o PMusrT0Dict.o OBJS += PMusrT0.o PMusrT0Dict.o
LEMOBJS =
LEMOBJS += TLemStats.o TLemStatsDict.o
LEMOBJS += TLemRunHeader.o TLemRunHeaderDict.o
EXTOBJS = EXTOBJS =
EXTOBJS += MuSR_td_PSI_bin.o EXTOBJS += MuSR_td_PSI_bin.o
# make the shared lib: # make the shared libs:
#
all: $(SHLIB) all: lemlib musrlib
lemlib: $(LEMLIB)
musrlib: $(SHLIB)
$(LEMLIB): $(LEMOBJS)
@echo "---> Building shared library $(LEMLIB) ..."
/bin/rm -f $(LEMLIB)
$(LD) $(SOFLAGS) $(LDFLAGS) $(LEMOBJS) -o $(LEMLIB)
@echo "done"
$(SHLIB): $(OBJS) $(EXTOBJS) $(SHLIB): $(OBJS) $(EXTOBJS)
@echo "---> Building shared library $(SHLIB) ..." @echo "---> Building shared library $(SHLIB) ..."
/bin/rm -f $(SHLIB) /bin/rm -f $(SHLIB)
$(LD) $(SOFLAGS) $(LDFLAGS) $(OBJS) $(EXTOBJS) -o $(SHLIB) $(FFTW3LIB) $(GLIBS) $(PSILIBS) $(MNLIB) $(GSLLIB) $(LD) $(SOFLAGS) $(LDFLAGS) $(OBJS) $(EXTOBJS) -o $(SHLIB) $(FFTW3LIB) $(GLIBS) $(PSILIB) $(MNLIB) $(GSLLIB)
@echo "done" @echo "done"
# clean up: remove all object file (and core files) # clean up: remove all object file (and core files)
# semicolon needed to tell make there is no source # semicolon needed to tell make there is no source
# for this target! # for this target!
# #
clean:; @rm -f $(OBJS) *Dict* core* clean:; @rm -f $(OBJS) $(EXTOBJS) $(LEMOBJS) *Dict* core*
@echo "---> removing $(OBJS)" @echo "---> removing $(OBJS) $(EXTOBJS) $(LEMOBJS)"
# #
$(OBJS): %.o: %.cpp $(OBJS): %.o: %.cpp
$(CXX) $(INCLUDES) $(CXXFLAGS) -c $< $(CXX) $(INCLUDES) $(CXXFLAGS) -c $<
$(LEMOBJS): ../external/TLemRunHeader/TLemRunHeader.cxx TLemRunHeaderDict.cxx ../external/TLemRunHeader/TLemStats.cxx TLemStatsDict.cxx
$(CXX) $(INCLUDES) $(CXXFLAGS) -c $^
$(EXTOBJS): ../external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp $(EXTOBJS): ../external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp
$(CXX) $(INCLUDES) $(CXXFLAGS) -c ../external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp $(CXX) $(INCLUDES) $(CXXFLAGS) -c $^
TLemRunHeaderDict.cxx: ../external/TLemRunHeader/TLemRunHeader.h ../external/TLemRunHeader/TLemRunHeaderLinkDef.h
@echo "Generating dictionary $@..."
rootcint -f $@ -c -p $^
TLemStatsDict.cxx: ../external/TLemRunHeader/TLemStats.h ../external/TLemRunHeader/TLemStatsLinkDef.h
@echo "Generating dictionary $@..."
rootcint -f $@ -c -p $^
PStartupHandlerDict.cpp: ../include/PStartupHandler.h ../include/PStartupHandlerLinkDef.h PStartupHandlerDict.cpp: ../include/PStartupHandler.h ../include/PStartupHandlerLinkDef.h
@echo "Generating dictionary $@..." @echo "Generating dictionary $@..."
@ -174,7 +224,25 @@ PUserFcnBaseDict.cpp: ../include/PUserFcnBase.h ../include/PUserFcnBaseLinkDef.h
@echo "Generating dictionary $@..." @echo "Generating dictionary $@..."
rootcint -v -f $@ -c -p $^ rootcint -v -f $@ -c -p $^
install: all install: leminstall musrinstall
leminstall: lemlib
@echo "Installing shared lib: $(LEMLIB) ( you must be root ;-) )"
ifeq ($(OS),LINUX)
cp -pv $(LEMLIB) $(ROOTSYS)/lib
cp -pv $(LEMPATH)/*.h $(ROOTSYS)/include
endif
ifeq ($(OS),WIN32GCC)
cp -pv $(LEMLIB) $(ROOTSYS)/bin
ln -sf $(ROOTSYS)/bin/$(LEMLIB) $(ROOTSYS)/lib/$(LEMLIB)
cp -pv $(LEMPATH)/*.h $(ROOTSYS)/include
endif
ifeq ($(OS),DARWIN)
cp -pv $(LEMLIB) $(ROOTSYS)/lib
cp -pv $(LEMPATH)/*.h $(ROOTSYS)/include
endif
musrinstall: musrlib
@echo "Installing shared lib: $(SHLIB) ( you must be root ;-) )" @echo "Installing shared lib: $(SHLIB) ( you must be root ;-) )"
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
cp -pv $(SHLIB) $(ROOTSYS)/lib cp -pv $(SHLIB) $(ROOTSYS)/lib
@ -185,5 +253,9 @@ ifeq ($(OS),WIN32GCC)
ln -sf $(ROOTSYS)/bin/$(SHLIB) $(ROOTSYS)/lib/$(SHLIB) ln -sf $(ROOTSYS)/bin/$(SHLIB) $(ROOTSYS)/lib/$(SHLIB)
cp -pv $(PMUSRPATH)/*.h $(ROOTSYS)/include cp -pv $(PMUSRPATH)/*.h $(ROOTSYS)/include
endif endif
ifeq ($(OS),DARWIN)
cp -pv $(SHLIB) $(ROOTSYS)/lib
cp -pv $(PMUSRPATH)/*.h $(ROOTSYS)/include
endif
cleaninstall: clean install cleaninstall: clean install