From 0219948ca628902e32bef05569a52e119f544362 Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Fri, 6 Nov 2009 03:38:36 +0000
Subject: [PATCH] * Adding a liblist file in NPL and using this little script
 in NPA makefile 	- Now everytime a library is added to NPLib there is
 no need to edit NPA nake file 	- compatibility with tcsh and MacOs should be
 performed

---
 NPAnalysis/10He_Riken/src/GNUmakefile | 8 +-------
 NPAnalysis/Gaspard/src/GNUmakefile    | 8 +-------
 NPAnalysis/Template/src/GNUmakefile   | 8 +-------
 NPEnvironment.bash                    | 1 +
 NPEnvironment.tchrc                   | 1 +
 NPLib/liblist                         | 7 +++++++
 6 files changed, 12 insertions(+), 21 deletions(-)
 create mode 100755 NPLib/liblist

diff --git a/NPAnalysis/10He_Riken/src/GNUmakefile b/NPAnalysis/10He_Riken/src/GNUmakefile
index e8c4c055f..28c404622 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 e8c4c055f..28c404622 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 e8c4c055f..28c404622 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 cf4896c97..7e7d5183c 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 43f970f28..61ebdb79c 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 000000000..3dc5f8fea
--- /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
-- 
GitLab