Index: trunk/MagicSoft/Simulation/Detector/Camera/config.mk.Linux =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/config.mk.Linux (revision 5095) +++ trunk/MagicSoft/Simulation/Detector/Camera/config.mk.Linux (revision 5096) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.Linux,v $ -# $Revision: 1.8 $ +# $Revision: 1.9 $ # $Author: moralejo $ -# $Date: 2004-09-16 15:16:34 $ +# $Date: 2004-09-17 10:32:54 $ ################################################################## # @maintitle @@ -46,15 +46,17 @@ INCLUDE_TRIGGER = ../include-MTrigger INCLUDE_FADC = ../include-MFadc -INCLUDE_EVITA = ../../../include-Classes -INCLUDE_EVITA_MC = ../../../include-Classes/MMcFormat -INCLUDE_EVITA_RAW = ../../../include-Classes/MRawFormat -INCLUDE_EVITA_BASE = ../../../include-Classes/MBase -INCLUDE_MARS_MGEOM = ../../../include-Classes/mgeom -INCLUDE_REFL = ../ReflectorII INCLUDE_STAR = ../StarResponse INCLUDE_ROOT = ${ROOTSYS}/include INCLUDE_CPLUS = /usr/include/g++ +INCLUDE_MARS_MBASE = ../../../Mars/mbase +INCLUDE_MARS_MGEOM = ../../../Mars/mgeom +INCLUDE_MARS_MGUI = ../../../Mars/mgui +INCLUDE_MARS_MC = ../../../Mars/mmc +INCLUDE_MARS_MRAW = ../../../Mars/mraw + + OPTIM = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual -Wno-deprecated + DEBUG = -g @@ -63,22 +65,21 @@ ROOTLIBS = `root-config --libs` -lMinuit -lHistPainter -lThread -# -L/CERN/root/lib -lNew -lCore -lCint -lHist \ -# -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ -# -lMatrix -lPhysics -lm - ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread - -# 0-L/CERN/root/lib -lNew -lCore -lCint -lHist \ -# -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ -# -lMatrix -lPhysics -lGui -lm - -GLIBS = $(ROOTLIBS) $(ROOTGLIBS) ROOTVER = `root-config --version` ROOTCFLAGS= `root-config --cflags` +GLIBS = $(ROOTLIBS) $(ROOTGLIBS) + +# +# AM TEST: to compile statically uncomments lines below (you need root +# to be compiled statically too!): +# Be aware that you have to put -L/your_root_path/lib +#ROOTLIBS = +#ROOTGLIBS = +#GLIBS = -static -L/cern/root/root/lib -lRoot -lpthread -lm -ldl +# RANLIBDIR = ../lib -CERNDIR = /cern # system @@ -93,2 +94,4 @@ ##EOF + + Index: trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux (revision 5095) +++ trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux (revision 5096) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.linux,v $ -# $Revision: 1.5 $ +# $Revision: 1.6 $ # $Author: moralejo $ -# $Date: 2004-09-16 15:16:34 $ +# $Date: 2004-09-17 10:32:54 $ ################################################################## # @maintitle @@ -46,17 +46,15 @@ INCLUDE_TRIGGER = ../include-MTrigger INCLUDE_FADC = ../include-MFadc -INCLUDE_EVITA = ../../../include-Classes -INCLUDE_EVITA_MC = ../../../include-Classes/MMcFormat -INCLUDE_EVITA_RAW = ../../../include-Classes/MRawFormat -INCLUDE_EVITA_BASE = ../../../include-Classes/MBase -INCLUDE_MARS_MGEOM = ../../../include-Classes/mgeom -INCLUDE_REFL = ../ReflectorII INCLUDE_STAR = ../StarResponse INCLUDE_ROOT = ${ROOTSYS}/include INCLUDE_CPLUS = /usr/include/g++ -#OPTIM = -O2 -Wall -fno-rtti -fno-exceptions -fPIC +INCLUDE_MARS_MBASE = ../../../Mars/mbase +INCLUDE_MARS_MGEOM = ../../../Mars/mgeom +INCLUDE_MARS_MGUI = ../../../Mars/mgui +INCLUDE_MARS_MC = ../../../Mars/mmc +INCLUDE_MARS_MRAW = ../../../Mars/mraw + OPTIM = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual -Wno-deprecated - DEBUG = -g @@ -65,19 +63,12 @@ ROOTLIBS = `root-config --libs` -lMinuit -lHistPainter -lThread -# -L/CERN/root/lib -lNew -lCore -lCint -lHist \ -# -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ -# -lMatrix -lPhysics -lm - -ROOTGLIBS = `root-config --glibs` -lThread -lMinuit -lHistPainter -lThread - -# 0-L/CERN/root/lib -lNew -lCore -lCint -lHist \ -# -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ -# -lMatrix -lPhysics -lGui -lm +ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread ROOTVER = `root-config --version` ROOTCFLAGS= `root-config --cflags` +GLIBS = $(ROOTLIBS) $(ROOTGLIBS) -GLIBS = $(ROOTLIBS) $(ROOTGLIBS) +RANLIBDIR = ../lib # @@ -89,7 +80,4 @@ #GLIBS = -static -L/cern/root/root/lib -lRoot -lpthread -lm -ldl # - -RANLIBDIR = ../lib -CERNDIR = /cern # system Index: trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux-gnu =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux-gnu (revision 5095) +++ trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux-gnu (revision 5096) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.linux-gnu,v $ -# $Revision: 1.9 $ +# $Revision: 1.10 $ # $Author: moralejo $ -# $Date: 2004-09-16 15:16:34 $ +# $Date: 2004-09-17 10:32:54 $ ################################################################## # @maintitle @@ -46,13 +46,13 @@ INCLUDE_TRIGGER = ../include-MTrigger INCLUDE_FADC = ../include-MFadc -INCLUDE_EVITA = ../../../include-Classes -INCLUDE_EVITA_MC = ../../../include-Classes/MMcFormat -INCLUDE_EVITA_RAW = ../../../include-Classes/MRawFormat -INCLUDE_EVITA_BASE = ../../../include-Classes/MBase -INCLUDE_MARS_MGEOM = ../../../include-Classes/mgeom -INCLUDE_REFL = ../ReflectorII INCLUDE_STAR = ../StarResponse INCLUDE_ROOT = ${ROOTSYS}/include INCLUDE_CPLUS = /usr/include/g++ + +INCLUDE_MARS_MBASE = ../../../Mars/mbase +INCLUDE_MARS_MGEOM = ../../../Mars/mgeom +INCLUDE_MARS_MGUI = ../../../Mars/mgui +INCLUDE_MARS_MC = ../../../Mars/mmc +INCLUDE_MARS_MRAW = ../../../Mars/mraw OPTIM = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual -Wno-deprecated @@ -63,22 +63,12 @@ ROOTLIBS = `root-config --libs` -lMinuit -lHistPainter -lThread -# -L/CERN/root/lib -lNew -lCore -lCint -lHist \ -# -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ -# -lMatrix -lPhysics -lm - ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread - -# -L/CERN/root/lib -lNew -lCore -lCint -lHist \ -# -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ -# -lMatrix -lPhysics -lGui -lm - -GLIBS = $(ROOTLIBS) $(ROOTGLIBS) ROOTVER = `root-config --version` ROOTCFLAGS= `root-config --cflags` +GLIBS = $(ROOTLIBS) $(ROOTGLIBS) RANLIBDIR = ../lib -CERNDIR = /cern # system Index: trunk/MagicSoft/Simulation/Detector/Camera/config.mk.osf1 =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/config.mk.osf1 (revision 5095) +++ trunk/MagicSoft/Simulation/Detector/Camera/config.mk.osf1 (revision 5096) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.osf1,v $ -# $Revision: 1.10 $ -# $Author: blanch $ -# $Date: 2004-02-06 17:40:41 $ +# $Revision: 1.11 $ +# $Author: moralejo $ +# $Date: 2004-09-17 10:32:54 $ ################################################################## # @maintitle @@ -47,13 +47,13 @@ INCLUDE_TRIGGER = ../include-MTrigger INCLUDE_FADC = ../include-MFadc -INCLUDE_EVITA = ../../../include-Classes -INCLUDE_EVITA_MC = ../../../include-Classes/MMcFormat -INCLUDE_EVITA_RAW = ../../../include-Classes/MRawFormat -INCLUDE_EVITA_BASE = ../../../include-Classes/MBase -INCLUDE_MARS_MGEOM = ../../../include-Classes/mgeom -INCLUDE_REFL = ../ReflectorII INCLUDE_STAR = ../StarResponse INCLUDE_ROOT = ${ROOTSYS}/include INCLUDE_CPLUS = /usr/include/cxx + +INCLUDE_MARS_MBASE = ../../../Mars/mbase +INCLUDE_MARS_MGEOM = ../../../Mars/mgeom +INCLUDE_MARS_MGUI = ../../../Mars/mgui +INCLUDE_MARS_MC = ../../../Mars/mmc +INCLUDE_MARS_MRAW = ../../../Mars/mraw OPTIM = -O2 -ieee -arch host -lpthread @@ -62,12 +62,6 @@ # libraries ROOTLIBS = `root-config --libs` -lMinuit -lHistPainter -lThread -#ROOTLIBS = -L${ROOTSYS}/lib -lNew -lCore -lCint -lHist \ -# -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ -# -lMatrix -lPhysics -lm -ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread -#ROOTGLIBS = -L${ROOTSYS}/lib -lNew -lCore -lCint -lHist \ -# -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ -# -lMatrix -lPhysics -lGui -lm +ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread -lMatrix -lPhysics -lGui -lm ROOTVER = `root-config --version` @@ -76,8 +70,5 @@ GLIBS = $(ROOTLIBS) $(ROOTGLIBS) - - RANLIBDIR = ../lib -CERNDIR = /CERN # system