diff --git a/NPAnalysis/10He_Riken/src/GNUmakefile b/NPAnalysis/10He_Riken/src/GNUmakefile index e8c4c055f7d610289791d62f09dba65c9eda1398..28c404622cec4d40b2e93aa0009fc4fc4fa97d26 100644 --- a/NPAnalysis/10He_Riken/src/GNUmakefile +++ b/NPAnalysis/10He_Riken/src/GNUmakefile @@ -16,13 +16,7 @@ CXXFLAGS += -I$(NPAINCLUDES) CXXFLAGS += -I$(NPLIB)/include LDFLAGS = `root-config --libs` -lMathMore -LDFLAGS+= -L$(NPLIB)/lib -lVDetector -lDetectorManager -lCalibrationManager -lIORoot -lReaction -lEnergyLoss \ - -lMust2Data -lMust2Physics \ - -lSSSDData -lSSSDPhysics \ - -lPlasticData -lPlasticPhysics \ - -lAnnularS1Data \ - -lGaspardData -lGaspardPhysics \ - -lInitialConditions -lInteractionCoordinates +LDFLAGS+= `$(NPLIB)/liblist` LDFLAGS+= -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB) SRC= $(wildcard *.cc) diff --git a/NPAnalysis/Gaspard/src/GNUmakefile b/NPAnalysis/Gaspard/src/GNUmakefile index e8c4c055f7d610289791d62f09dba65c9eda1398..28c404622cec4d40b2e93aa0009fc4fc4fa97d26 100644 --- a/NPAnalysis/Gaspard/src/GNUmakefile +++ b/NPAnalysis/Gaspard/src/GNUmakefile @@ -16,13 +16,7 @@ CXXFLAGS += -I$(NPAINCLUDES) CXXFLAGS += -I$(NPLIB)/include LDFLAGS = `root-config --libs` -lMathMore -LDFLAGS+= -L$(NPLIB)/lib -lVDetector -lDetectorManager -lCalibrationManager -lIORoot -lReaction -lEnergyLoss \ - -lMust2Data -lMust2Physics \ - -lSSSDData -lSSSDPhysics \ - -lPlasticData -lPlasticPhysics \ - -lAnnularS1Data \ - -lGaspardData -lGaspardPhysics \ - -lInitialConditions -lInteractionCoordinates +LDFLAGS+= `$(NPLIB)/liblist` LDFLAGS+= -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB) SRC= $(wildcard *.cc) diff --git a/NPAnalysis/Template/src/GNUmakefile b/NPAnalysis/Template/src/GNUmakefile index e8c4c055f7d610289791d62f09dba65c9eda1398..28c404622cec4d40b2e93aa0009fc4fc4fa97d26 100644 --- a/NPAnalysis/Template/src/GNUmakefile +++ b/NPAnalysis/Template/src/GNUmakefile @@ -16,13 +16,7 @@ CXXFLAGS += -I$(NPAINCLUDES) CXXFLAGS += -I$(NPLIB)/include LDFLAGS = `root-config --libs` -lMathMore -LDFLAGS+= -L$(NPLIB)/lib -lVDetector -lDetectorManager -lCalibrationManager -lIORoot -lReaction -lEnergyLoss \ - -lMust2Data -lMust2Physics \ - -lSSSDData -lSSSDPhysics \ - -lPlasticData -lPlasticPhysics \ - -lAnnularS1Data \ - -lGaspardData -lGaspardPhysics \ - -lInitialConditions -lInteractionCoordinates +LDFLAGS+= `$(NPLIB)/liblist` LDFLAGS+= -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB) SRC= $(wildcard *.cc) diff --git a/NPEnvironment.bash b/NPEnvironment.bash index cf4896c979f7f48e16239de60a7f73b7f1c54d52..7e7d5183cfe65ec7f8b4ea15a44bf4993eb59419 100644 --- a/NPEnvironment.bash +++ b/NPEnvironment.bash @@ -16,3 +16,4 @@ alias NPT='cd $NPTOOL' alias NPL='cd $NPLIB' alias NPS='cd $NPSIM' alias NPA='cd $NPANA' + diff --git a/NPEnvironment.tchrc b/NPEnvironment.tchrc index 43f970f282a2c91c5e084885418bc38d3b21683c..61ebdb79c3e740adf51dd1aa66ae63f57e87eab6 100644 --- a/NPEnvironment.tchrc +++ b/NPEnvironment.tchrc @@ -7,6 +7,7 @@ setenv NPLIB $NPTOOL/NPLib setenv NPSIM $NPTOOL/NPSimulation setenv NPANA $NPTOOL/NPAnalysis setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH:$NPLIB/lib +source $NPLIB/lib/liblist # alias alias Simulation '$NPSIM/bin/$G4SYSTEM/Simulation' diff --git a/NPLib/liblist b/NPLib/liblist new file mode 100755 index 0000000000000000000000000000000000000000..3dc5f8fea482700adef2d4bfef6447a0e0dd1df5 --- /dev/null +++ b/NPLib/liblist @@ -0,0 +1,7 @@ +echo -L$NPLIB/lib -lVDetector -lDetectorManager -lCalibrationManager -lIORoot -lReaction -lEnergyLoss \ + -lMust2Data -lMust2Physics \ + -lSSSDData -lSSSDPhysics \ + -lPlasticData -lPlasticPhysics \ + -lAnnularS1Data \ + -lGaspardData -lGaspardPhysics \ + -lInitialConditions -lInteractionCoordinates