Some cleanup in the makefiles

diff --git a/ACORDE/libACORDEbase.pkg b/ACORDE/libACORDEbase.pkg
index 16b42140dd2fba5e8084f41a774d743c5c04934b..b52486047545a80221d0dd163168bedf914e33e4 100644 (file)
--- a/ACORDE/libACORDEbase.pkg
+++ b/ACORDE/libACORDEbase.pkg
@@ -12,5 +12,5 @@ EINCLUDE := RAW
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lCDB -lSTEERBase  -lRAWDatarec  -lRAWDatabase \
-#                         -L$(shell root-config --libdir) -lGeom 
+#                         -L$(ROOTLIBDIR) -lGeom 
 endif

diff --git a/ACORDE/libACORDEsim.pkg b/ACORDE/libACORDEsim.pkg
index 9f9da52986761044e1305ada262d7bbb35d8603f..2bb5c63949037fc48ed6b6147bdf6cbf962198d3 100644 (file)
--- a/ACORDE/libACORDEsim.pkg
+++ b/ACORDE/libACORDEsim.pkg
@@ -15,5 +15,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lACORDEbase -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom
+                         -L$(ROOTLIBDIR) -lVMC -lGeom
 endif

diff --git a/ANALYSIS/binaliengui.pkg b/ANALYSIS/binaliengui.pkg
index b48799dd7c6522ff037e1fb57745b37a45fae79b..eca1df85e3caadee76fc3e26b5b9e3fecb19352a 100644 (file)
--- a/ANALYSIS/binaliengui.pkg
+++ b/ANALYSIS/binaliengui.pkg
@@ -21,7 +21,6 @@ ELIBS    := Aliengui \
   HLTbase \
   ANALYSIS ANALYSISalice
 
-CHECKXML = $(shell root-config --has-xml)
 ifeq (yes,$(CHECKXML))
 PACKCXXFLAGS += $(CXXFLAGS) -DWITHXML
 endif

diff --git a/ANALYSIS/libANALYSISRL.pkg b/ANALYSIS/libANALYSISRL.pkg
index 9654eee47853e8b1b537e8c6bc2c5c6e804b4246..2ed75850207f7ce6c4cc94ac250050be4ac3f551 100644 (file)
--- a/ANALYSIS/libANALYSISRL.pkg
+++ b/ANALYSIS/libANALYSISRL.pkg
@@ -6,7 +6,6 @@ HDRS:= $(SRCS:.cxx=.h)
 
 DHDR= ANALYSISRLLinkDef.h
 
-CHECKALIEN = $(shell root-config --has-alien)
 ifeq (yes,$(CHECKALIEN))
 PACKCXXFLAGS := $(CXXFLAGS) -DWITHALIEN
 endif
@@ -15,6 +14,6 @@ EXPORT:=$(SRCS:.cxx=.h)
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lANALYSIS -lSTEER \
-#                         -L$(shell root-config --libdir) -lGui
+#                         -L$(ROOTLIBDIR) -lGui
 endif
 

diff --git a/ANALYSIS/libANALYSISalice.pkg b/ANALYSIS/libANALYSISalice.pkg
index 24780b866d3677cb39f085c83aacb5bca35591ff..4ee3db432ad8d76374acbe8a469df99a1476b7f0 100644 (file)
--- a/ANALYSIS/libANALYSISalice.pkg
+++ b/ANALYSIS/libANALYSISalice.pkg
@@ -7,12 +7,10 @@ SRCS =        AliAnalysisTaskSE.cxx AliAnalysisTaskME.cxx \
        AliAnalysisTaskTagCreator.cxx \
         AliMultiEventInputHandler.cxx
 
-CHECKALIEN = $(shell root-config --has-alien)
 ifeq (yes,$(CHECKALIEN))
 PACKCXXFLAGS := $(CXXFLAGS) -DWITHALIEN
 endif
 
-CHECKXML = $(shell root-config --has-xml)
 ifeq (yes,$(CHECKXML))
 PACKCXXFLAGS += $(CXXFLAGS) -DWITHXML
 CINTFLAGS += -DWITHXML
@@ -29,7 +27,7 @@ EXPORT:=$(SRCS:.cxx=.h)
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lANALYSIS -lSTEERBase -lAOD -lESD \
-                         -L$(shell root-config --libdir) -lTreePlayer -lXMLIO
+                         -L$(ROOTLIBDIR) -lTreePlayer -lXMLIO
 endif
 
 

diff --git a/ANALYSIS/libAliengui.pkg b/ANALYSIS/libAliengui.pkg
index f25b2aa1457b5a2a2505d35a1612c49c65f253b1..9e82d97f8e496d2af792aad281bb6d973b54e9d8 100644 (file)
--- a/ANALYSIS/libAliengui.pkg
+++ b/ANALYSIS/libAliengui.pkg
@@ -1,6 +1,5 @@
 #-*- Mode: Makefile -*-
 
-CHECKXML = $(shell root-config --has-xml)
 ifeq (yes,$(CHECKXML))
 PACKCXXFLAGS += $(CXXFLAGS) -DWITHXML
 CINTFLAGS += -DWITHXML
@@ -25,5 +24,5 @@ EINCLUDE:= STEER
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lANALYSISalice -lSTEERBase \
-                         -L$(shell root-config --libdir) -lGui
+                         -L$(ROOTLIBDIR) -lGui
 endif

diff --git a/BCM/libBCM.pkg b/BCM/libBCM.pkg
index a45471bd608489fdf88d36b83d401f185157e097..01dd2e991398ad8d5acab640e549f37f715ce6cd 100644 (file)
--- a/BCM/libBCM.pkg
+++ b/BCM/libBCM.pkg
@@ -9,6 +9,6 @@ DHDR:=BCMLinkDef.h
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lSTEERBase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom 
+                         -L$(ROOTLIBDIR) -lVMC -lGeom 
 endif
 

diff --git a/CORRFW/libCORRFW.pkg b/CORRFW/libCORRFW.pkg
index 7be68e355f9c5175b4e1938374a0b1166a479738..74b6cb64e92b5bb711c2d2f2f805eabe13454471 100644 (file)
--- a/CORRFW/libCORRFW.pkg
+++ b/CORRFW/libCORRFW.pkg
@@ -24,12 +24,10 @@ SRCS = AliCFFrame.cxx \
        AliCFV0TopoCuts.cxx \
        AliCFUnfolding.cxx
 
-CHECKALIEN = $(shell root-config --has-alien)
 ifeq (yes,$(CHECKALIEN))
 PACKCXXFLAGS := $(CXXFLAGS) -DWITHALIEN
 endif
 
-CHECKXML = $(shell root-config --has-xml)
 ifeq (yes,$(CHECKXML))
 PACKCXXFLAGS += $(CXXFLAGS) -DWITHXML
 CINTFLAGS += -DWITHXML
@@ -44,7 +42,7 @@ EXPORT:=$(SRCS:.cxx=.h)
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEERBase -lANALYSIS -lESD -lAOD \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif
 
 

diff --git a/EMCAL/libEMCALUtils.pkg b/EMCAL/libEMCALUtils.pkg
index 7bbe290f7c26a8fcaeafc62f7ffafecbf3340bbe..d8b4170d511b14171b74e63d3baa0bebaa9e65e9 100644 (file)
--- a/EMCAL/libEMCALUtils.pkg
+++ b/EMCAL/libEMCALUtils.pkg
@@ -13,5 +13,5 @@ CXXFLAGS+=-D__EMCALUTIL__
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -L$(shell root-config --libdir) -lGeom 
+                         -L$(ROOTLIBDIR) -lGeom 
 endif

diff --git a/EMCAL/libEMCALbase.pkg b/EMCAL/libEMCALbase.pkg
index c3cbc4bff28dca467de6aeb8ab36af342326a5dd..49a9befb7940372fb04e441fdbfc8ec133e5a5e8 100644 (file)
--- a/EMCAL/libEMCALbase.pkg
+++ b/EMCAL/libEMCALbase.pkg
@@ -43,5 +43,5 @@ PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                         -lEMCALUtils \
                          -lSTEERBase -lCDB -lSTEER \
                          -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom -lMinuit
+                         -L$(ROOTLIBDIR) -lVMC -lGeom -lMinuit
 endif

diff --git a/EMCAL/libEMCALrec.pkg b/EMCAL/libEMCALrec.pkg
index 3403da2a4eb0f6abfce8d962dc05502cdabb6716..35ae766be6553c98eb44f5d6ad32730c139e1d2e 100644 (file)
--- a/EMCAL/libEMCALrec.pkg
+++ b/EMCAL/libEMCALrec.pkg
@@ -20,5 +20,5 @@ EINCLUDE:=PYTHIA6 RAW EVGEN THijing
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lEMCALUtils -lEMCALbase -lEMCALsim -lSTEER -lESD -lCDB -lSTEERBase \
-                         -L$(shell root-config --libdir) -lMinuit
+                         -L$(ROOTLIBDIR) -lMinuit
 endif

diff --git a/EMCAL/libEMCALsim.pkg b/EMCAL/libEMCALsim.pkg
index ae0beca346cab4f3e63adfd1c126680f008bda08..14ebe15503af58b3bdedc728073f7ada34a16d9b 100644 (file)
--- a/EMCAL/libEMCALsim.pkg
+++ b/EMCAL/libEMCALsim.pkg
@@ -23,5 +23,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lEMCALUtils -lEMCALbase -lSTEER -lSTEERBase \
                          -lRAWDatarec -lRAWDatasim  -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom
+                         -L$(ROOTLIBDIR) -lVMC -lGeom
 endif

diff --git a/EPOS/libEPOS.pkg b/EPOS/libEPOS.pkg
index 8bc6c5be6191c80571ee6b17d19949cba9ca40a2..d7b1aa0152702599f543ea4ec67a125701308ca1 100644 (file)
--- a/EPOS/libEPOS.pkg
+++ b/EPOS/libEPOS.pkg
@@ -78,5 +78,5 @@ endif
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lEVGEN -lSTEER -lSTEERBase \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/ESDCheck/libAnalysisCheck.pkg b/ESDCheck/libAnalysisCheck.pkg
index e3918f45a065edcd0a219b40a136c3a62c56184a..6408d99f56b39b4ec31a61ec09add4470b746e73 100644 (file)
--- a/ESDCheck/libAnalysisCheck.pkg
+++ b/ESDCheck/libAnalysisCheck.pkg
@@ -24,6 +24,6 @@ EINCLUDE:=PMD
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEERBase -lESD -lANALYSIS \
-                         -L$(shell root-config --libdir) -lSpectrum
+                         -L$(ROOTLIBDIR) -lSpectrum
 endif
 

diff --git a/EVE/libEveBase.pkg b/EVE/libEveBase.pkg
index c18f551376286873dc92318c3643582f0cd212f4..fab8081116a79de36846a2e1845d62a5ed5a9ab2 100644 (file)
--- a/EVE/libEveBase.pkg
+++ b/EVE/libEveBase.pkg
@@ -14,7 +14,7 @@ PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEERBase -lCDB -lESD -lAOD -lSTEER \
                          -lTPCbase -lTPCsim -lTPCrec -lITSbase \
                          -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lEve -lGeom \
+                         -L$(ROOTLIBDIR) -lEve -lGeom \
                          -lGui -lGed -lRGL -lEG -lMinuit
 ELIBSDIR:= /usr/X11R6/lib
 ELIBS:= GL

diff --git a/EVE/libEveDet.pkg b/EVE/libEveDet.pkg
index 2f6e74066459efeb056c9ce06ad3cb9a9701ef49..9e8f89d9ca7630eca9bf9a62a387952609a67909 100644 (file)
--- a/EVE/libEveDet.pkg
+++ b/EVE/libEveDet.pkg
@@ -18,7 +18,7 @@ PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lFMDbase -lFMDrec -lEMCALbase -lEMCALUtils \
                         -lVZERObase -lVZEROrec \
                          -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lEve -lRGL -lGed -lGui -lGeom -lEG
+                         -L$(ROOTLIBDIR) -lEve -lRGL -lGed -lGui -lGeom -lEG
 
 ELIBSDIR:= /usr/X11R6/lib
 ELIBS:= GL GLU

diff --git a/EVE/libEveHLT.pkg b/EVE/libEveHLT.pkg
index 2847a987f60efef345cbe8f81efa9643d2ee3688..f97f5007ecaf42335ca40bbf05e866b387e377a5 100644 (file)
--- a/EVE/libEveHLT.pkg
+++ b/EVE/libEveHLT.pkg
@@ -14,5 +14,5 @@ ELIBSDIR:= /usr/X11R6/lib
 ELIBS:= GL
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lTPCbase -lHLTbase \
-                         -L$(shell root-config --libdir) -lEve -lXMLParser -lGed -lGui
+                         -L$(ROOTLIBDIR) -lEve -lXMLParser -lGed -lGui
 endif

diff --git a/EVGEN/libEVGEN.pkg b/EVGEN/libEVGEN.pkg
index f2777d95d90b57b10fb205c00900f4a54a5438e3..3737588bdc91f56bdabd834ac6fbdfcc4ae32550 100644 (file)
--- a/EVGEN/libEVGEN.pkg
+++ b/EVGEN/libEVGEN.pkg
@@ -36,5 +36,5 @@ EINCLUDE:=FASTSIM THijing PYTHIA6
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lESD -lSTEERbase -lFASTSIM \
-                         -L$(shell root-config --libdir) -lVMC -lEG
+                         -L$(ROOTLIBDIR) -lVMC -lEG
 endif

diff --git a/FASTSIM/libFASTSIM.pkg b/FASTSIM/libFASTSIM.pkg
index ccd1239cd1630fe8debd6be7b134bf9ee872cf66..193cddb2ac255c4720cfde3f19e353642ec496d9 100644 (file)
--- a/FASTSIM/libFASTSIM.pkg
+++ b/FASTSIM/libFASTSIM.pkg
@@ -20,5 +20,5 @@ HDRS:= $(SRCS:.cxx=.h)
 DHDR= FASTSIMLinkDef.h
 
 ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(shell root-config --libdir) -lEG
+PACKSOFLAGS:= $(SOFLAGS) -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/FMD/libFMDbase.pkg b/FMD/libFMDbase.pkg
index 9c7063a260b008b8536f2b718da88c2eaafa1a96..87f02e79b944c2ad676e31621cacb4e9903b1368 100644 (file)
--- a/FMD/libFMDbase.pkg
+++ b/FMD/libFMDbase.pkg
@@ -36,7 +36,7 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lCDB -lESD -lSTEERBase \
                          -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lGeom 
+                         -L$(ROOTLIBDIR) -lGeom 
 endif
 #
 # EOF

diff --git a/FMD/libFMDsim.pkg b/FMD/libFMDsim.pkg
index 629d5030753b4e100b97be34fe088b55c7973c7f..893822599e5f80fa1537ec1de0deba0e40c159fc 100644 (file)
--- a/FMD/libFMDsim.pkg
+++ b/FMD/libFMDsim.pkg
@@ -24,7 +24,7 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lFMDbase -lSTEER -lCDB -lESD -lSTEERBase \
                          -lRAWDatasim -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lEG -lGeom
+                         -L$(ROOTLIBDIR) -lVMC -lEG -lGeom
 endif
 
 #

diff --git a/FMD/libFMDutil.pkg b/FMD/libFMDutil.pkg
index e7046190d78ef8ac020786b56c10d4f996c714d3..bcccc199b375f3e098da58990c4d52bd1d66179e 100644 (file)
--- a/FMD/libFMDutil.pkg
+++ b/FMD/libFMDutil.pkg
@@ -27,7 +27,7 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lFMDrec -lFMDbase -lSTEER -lCDB -lESD -lSTEERBase \
                          -lRAWDatarec \
-                         -L$(shell root-config --libdir) -lGeom
+                         -L$(ROOTLIBDIR) -lGeom
 endif
 
 #

diff --git a/HLT/libAliHLTFMD.pkg b/HLT/libAliHLTFMD.pkg
index 6bedb1a14c97559d0b61d76c7c4e375673917c6a..7fb8cbae02881ce70355cf5097993a7c02d4e83c 100644 (file)
--- a/HLT/libAliHLTFMD.pkg
+++ b/HLT/libAliHLTFMD.pkg
@@ -12,7 +12,7 @@ EINCLUDE := HLT/BASE HLT/FMD STEER RAW FMD
 
 LIBRARY_DEP :=  -lHLTbase -lAliHLTUtil -lRAWDatarec -lRAWDatabase \
                 -lESD -lSTEER -lSTEERBase -lFMDbase -lFMDrec \
-                -L$(shell root-config --libdir)
+                -L$(ROOTLIBDIR)
 
 ###############################################################################
 #

diff --git a/HLT/libAliHLTGlobal.pkg b/HLT/libAliHLTGlobal.pkg
index dde793e463a11e81f41ef6b6eef732c8f57da61e..7f316a22b56eb46e3d07d01547a4e684b1db5c8c 100644 (file)
--- a/HLT/libAliHLTGlobal.pkg
+++ b/HLT/libAliHLTGlobal.pkg
@@ -25,7 +25,7 @@ EINCLUDE      := HLT/global \
 LIBRARY_DEP := -lHLTbase -lAliHLTUtil \
                -lCDB -lESD -lSTEER -lSTEERBase -lTPCrec -lTPCcalib -lTPCbase \
                -lRAWDatarec -lRAWDatabase -lTRDbase \
-               -L$(shell root-config --libdir) -lEG
+               -L$(ROOTLIBDIR) -lEG
 
 ###############################################################################
 #

diff --git a/HLT/libAliHLTITS.pkg b/HLT/libAliHLTITS.pkg
index 154819c2ed3c2add0c0dbdd856bea700d46707eb..74a85d5ab6fdfb5409944e8a0015693922c3f1c6 100644 (file)
--- a/HLT/libAliHLTITS.pkg
+++ b/HLT/libAliHLTITS.pkg
@@ -27,7 +27,7 @@ MODULE_DHDR:=
 
 EINCLUDE := HLT/BASE HLT/BASE/util HLT/ITS HLT/TPCLib HLT/ITS/tracking ITS STEER RAW
 
-LIBRARY_DEP := -lHLTbase -lAliHLTUtil -lRAWDatarec -lRAWDatabase -lITSrec -lITSbase -lESD -lSTEER -lSTEERBase -L$(shell root-config --libdir) -lEG
+LIBRARY_DEP := -lHLTbase -lAliHLTUtil -lRAWDatarec -lRAWDatabase -lITSrec -lITSbase -lESD -lSTEER -lSTEERBase -L$(ROOTLIBDIR) -lEG
 
 ###############################################################################
 #

diff --git a/HLT/libAliHLTJET.pkg b/HLT/libAliHLTJET.pkg
index 8a72b9f1bca890839412158d4a516fe4acb3858b..bdaa9b1146795aeaec64d2866894090638703eec 100644 (file)
--- a/HLT/libAliHLTJET.pkg
+++ b/HLT/libAliHLTJET.pkg
@@ -46,7 +46,7 @@ LIBRARY_DEP               :=  -lHLTbase -lAliHLTUtil \
                                -lESD -lSTEER -lSTEERBase -lAOD -lESD \
                                -lANALYSIS -lANALYSISalice \
                                -lJETAN -lJETANMC \
-                               -L$(shell root-config --libdir) -lEG 
+                               -L$(ROOTLIBDIR) -lEG 
 
 ###############################################################################
 include $(MODDIR)/hlt.conf

diff --git a/HLT/libAliHLTMUON.pkg b/HLT/libAliHLTMUON.pkg
index 91a33bc894a7df8e5c111bd85835061a3285d1b6..dce687175b222f6ba8bb0c8cfe7c215c56459794 100644 (file)
--- a/HLT/libAliHLTMUON.pkg
+++ b/HLT/libAliHLTMUON.pkg
@@ -59,7 +59,7 @@ EINCLUDE :=   HLT/BASE HLT/MUON HLT/MUON/utils HLT/MUON/OnlineAnalysis \
 LIBRARY_DEP := -lHLTbase -lMUONmapping -lMUONbase -lMUONevaluation \
                -lMUONsim -lMUONcore -lMUONcalib -lMUONgeometry -lMUONraw -lMUONtrigger -lMUONrec \
                -lCDB -lESD -lSTEER -lSTEERBase -lRAWDatarec -lRAWDatasim \
-               -L$(shell root-config --libdir) -lMinuit
+               -L$(ROOTLIBDIR) -lMinuit
 
 ###############################################################################
 

diff --git a/HLT/libAliHLTTPC.pkg b/HLT/libAliHLTTPC.pkg
index 6bb056f4eddbf442d244b6beb8f503592fede8dc..3791c17b978c3e4b3c6c652d3b6b0dc5718763ae 100644 (file)
--- a/HLT/libAliHLTTPC.pkg
+++ b/HLT/libAliHLTTPC.pkg
@@ -157,7 +157,7 @@ EINCLUDE    := HLT/TPCLib \
 LIBRARY_DEP := -lHLTbase -lAliHLTRCU -lAliHLTUtil \
                -lCDB -lESD -lSTEER -lSTEERBase -lTPCrec -lTPCcalib -lTPCbase \
                -lRAWDatarec -lRAWDatabase \
-               -L$(shell root-config --libdir) -lEG
+               -L$(ROOTLIBDIR) -lEG
 
 ###############################################################################
 #

diff --git a/HMPID/libHMPIDbase.pkg b/HMPID/libHMPIDbase.pkg
index c99a6f9e783f79c28a199ff8ca5bf5acf8194166..76fb96e40f8dc9afa6b45851eb3880bdabd0b5bb 100644 (file)
--- a/HMPID/libHMPIDbase.pkg
+++ b/HMPID/libHMPIDbase.pkg
@@ -9,5 +9,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatasim -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lGeom 
+                         -L$(ROOTLIBDIR) -lGeom 
 endif

diff --git a/HMPID/libHMPIDrec.pkg b/HMPID/libHMPIDrec.pkg
index 425db5ebb8e3030c1f7730156fabdfc4af2cf882..93fda77214d585f55a106fdbde8bc164fd4cdb55 100644 (file)
--- a/HMPID/libHMPIDrec.pkg
+++ b/HMPID/libHMPIDrec.pkg
@@ -11,5 +11,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lHMPIDbase -lSTEER -lCDB -lESD -lSTEERBase \
                          -lRAWDatarec -lRAWDatasim \
-                         -L$(shell root-config --libdir) -lMinuit
+                         -L$(ROOTLIBDIR) -lMinuit
 endif

diff --git a/HMPID/libHMPIDsim.pkg b/HMPID/libHMPIDsim.pkg
index 12b4de077e72cc9523b98f40f13646da51777b94..02894eaf3a25fa960a44f2668ba5fd4c21d813eb 100644 (file)
--- a/HMPID/libHMPIDsim.pkg
+++ b/HMPID/libHMPIDsim.pkg
@@ -8,5 +8,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lHMPIDbase -lSTEER -lSTEERBase \
                          -lRAWDatasim -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom 
+                         -L$(ROOTLIBDIR) -lVMC -lGeom 
 endif

diff --git a/ITS/libITSbase.pkg b/ITS/libITSbase.pkg
index 78b534d9902bc2a6d1ec5b3f7d05a857635a5203..76f1311dbc946693458b7abb8d3f716186816ef1 100644 (file)
--- a/ITS/libITSbase.pkg
+++ b/ITS/libITSbase.pkg
@@ -86,5 +86,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatasim -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lGui -lGeom
+                         -L$(ROOTLIBDIR) -lGui -lGeom
 endif

diff --git a/ITS/libITSrec.pkg b/ITS/libITSrec.pkg
index 9b8ab5b5096bee2a8d9e82ab9872df84e55448cf..707d87e62368c85ffc940f9c9716a556cdf2b42e 100644 (file)
--- a/ITS/libITSrec.pkg
+++ b/ITS/libITSrec.pkg
@@ -114,5 +114,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lITSbase -lSTEER -lESD -lCDB -lSTEERBase \
                          -lRAWDatarec \
-                         -L$(shell root-config --libdir) -lEG -lGeom
+                         -L$(ROOTLIBDIR) -lEG -lGeom
 endif

diff --git a/ITS/libITSsim.pkg b/ITS/libITSsim.pkg
index 7e9498dd8968b22723e65657ab6ac99485233fc0..30f3578744446a8ca3863ea2b40e88fe1b467f31 100644 (file)
--- a/ITS/libITSsim.pkg
+++ b/ITS/libITSsim.pkg
@@ -58,7 +58,7 @@ EINCLUDE:=TPC RAW
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lITSbase -lSTEER -lCDB -lSTEERBase \
-                         -L$(shell root-config --libdir) -lVMC -lEG -lGeom
+                         -L$(ROOTLIBDIR) -lVMC -lEG -lGeom
 endif
 
 

diff --git a/JETAN/libFASTJETAN.pkg b/JETAN/libFASTJETAN.pkg
index 940a0f78e05118c602c9935039e5e7c6926e9686..67d6b680cce23438585bea25b92bc94c8fbb88b1 100644 (file)
--- a/JETAN/libFASTJETAN.pkg
+++ b/JETAN/libFASTJETAN.pkg
@@ -17,6 +17,6 @@ DHDR= FASTJETANLinkDef.h
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEERBase -lESD -lAOD -lANALYSIS -lANALYSISalice -lJETAN \
-                         -L$(shell root-config --libdir) -lEG -lGeom
+                         -L$(ROOTLIBDIR) -lEG -lGeom
 endif
 

diff --git a/JETAN/libJETAN.pkg b/JETAN/libJETAN.pkg
index 55c08d4e2c99fe2c8064d585844c9f6e73c4acf1..fce27128edca49c661be51ad10fc15443236d5ad 100644 (file)
--- a/JETAN/libJETAN.pkg
+++ b/JETAN/libJETAN.pkg
@@ -34,6 +34,6 @@ DHDR= JETANLinkDef.h
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEERBase -lESD -lAOD -lANALYSIS -lANALYSISalice \
-                         -L$(shell root-config --libdir) -lEG -lGeom
+                         -L$(ROOTLIBDIR) -lEG -lGeom
 endif
 

diff --git a/MONITOR/binalionlinemonitor.pkg b/MONITOR/binalionlinemonitor.pkg
index 2e50bf5377b714de1292ea0b33353c699d2c85d4..ca1910abcad6c1061c1771f23d461e3347275db9 100644 (file)
--- a/MONITOR/binalionlinemonitor.pkg
+++ b/MONITOR/binalionlinemonitor.pkg
@@ -10,7 +10,7 @@ ELIBS:= MONITOR STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TP
 
 ifdef DATE_ROOT
 
-PACKBLIBS += $(shell date-config --monitorlibs)
+PACKBLIBS += $(DMONLIBS)
 ELIBSDIR:=
 
 EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR}

diff --git a/MONITOR/binalitestproc.pkg b/MONITOR/binalitestproc.pkg
index 64deace4398bc74f58283608ad2e75ab43989bc7..2904c8a7090c6d92bc94c4c416624cc7a2c368c0 100644 (file)
--- a/MONITOR/binalitestproc.pkg
+++ b/MONITOR/binalitestproc.pkg
@@ -10,7 +10,7 @@ ELIBS:= MONITOR STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TP
 
 ifdef DATE_ROOT
 
-PACKBLIBS += $(shell date-config --monitorlibs)
+PACKBLIBS += $(DMONLIBS)
 ELIBSDIR:=
 
 EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR}

diff --git a/MONITOR/binmonitorCheck.pkg b/MONITOR/binmonitorCheck.pkg
index 5feda7a6746aa23268dab4973008dca86512fd99..37a35ee25f3b2f3afebb35f6635d1c54abe74f13 100644 (file)
--- a/MONITOR/binmonitorCheck.pkg
+++ b/MONITOR/binmonitorCheck.pkg
@@ -11,7 +11,7 @@ ELIBS:= MONITOR STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TP
 
 ifdef DATE_ROOT
 
-PACKBLIBS += $(shell date-config --monitorlibs)
+PACKBLIBS += $(DMONLIBS)
 ELIBSDIR:=
 
 EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR}

diff --git a/MONITOR/binmonitorGDC.pkg b/MONITOR/binmonitorGDC.pkg
index a6a0761d06727b2b9284bfc431819a7c0856e538..15fbbd1c4b9a568009d97e7f9e5740bc6a9a5113 100644 (file)
--- a/MONITOR/binmonitorGDC.pkg
+++ b/MONITOR/binmonitorGDC.pkg
@@ -11,7 +11,7 @@ ELIBS:= MONITOR STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TP
 
 ifdef DATE_ROOT
 
-PACKBLIBS += $(shell date-config --monitorlibs)
+PACKBLIBS += $(DMONLIBS)
 ELIBSDIR:=
 
 EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR}

diff --git a/MONITOR/libMONITOR.pkg b/MONITOR/libMONITOR.pkg
index 12544206973c6481a1e3ff90366093cc39d70fdb..902696982a8cb76ffed4c3fd14063590a5631152 100644 (file)
--- a/MONITOR/libMONITOR.pkg
+++ b/MONITOR/libMONITOR.pkg
@@ -35,5 +35,5 @@ PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lSTEERBase -lESD \
                          -lTPCbase -lTPCrec -lTPCsim \
                          -lITSbase -lITSrec -lRAWDatarec \
-                         -L$(shell root-config --libdir) -lGui
+                         -L$(ROOTLIBDIR) -lGui
 endif

diff --git a/MUON/libMUONevaluation.pkg b/MUON/libMUONevaluation.pkg
index c3ef0abee5b3b5db9533b727c1fc6bef67d63d1e..4c9fe9897c805607af8295c12cc822a19311c5a5 100644 (file)
--- a/MUON/libMUONevaluation.pkg
+++ b/MUON/libMUONevaluation.pkg
@@ -22,6 +22,6 @@ PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lMUONmapping -lMUONtrigger \
                          -lMUONgeometry -lMUONbase -lMUONsim -lMUONrec -lMUONcore -lMUONcalib \
                          -lSTEER -lCDB -lESD -lSTEERBase \
-                         -L$(shell root-config --libdir) -lEG -lGui
+                         -L$(ROOTLIBDIR) -lEG -lGui
 endif
 

diff --git a/MUON/libMUONgeometry.pkg b/MUON/libMUONgeometry.pkg
index 52a58fd6a5003eeb3399c3a6299d55be7f2e46ea..ac916d1a3f6a571de9a03d7374031e26cba983b3 100644 (file)
--- a/MUON/libMUONgeometry.pkg
+++ b/MUON/libMUONgeometry.pkg
@@ -30,5 +30,5 @@ DHDR:= MUONgeometryLinkDef.h
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lMUONmapping  -lMUONcore -lSTEERBase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom -lMinuit
+                         -L$(ROOTLIBDIR) -lVMC -lGeom -lMinuit
 endif

diff --git a/MUON/libMUONgraphics.pkg b/MUON/libMUONgraphics.pkg
index a7b347a29b5a8d1cd11475ef21a4532b31be3377..b49b089a3b228a8b4fca1a457c858770da7a8ea9 100644 (file)
--- a/MUON/libMUONgraphics.pkg
+++ b/MUON/libMUONgraphics.pkg
@@ -52,6 +52,6 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lMUONbase -lMUONrec -lMUONmapping -lMUONgeometry -lMUONcalib -lMUONraw -lMUONcore \
                          -lCDB -lRAWDatarec -lSTEERBase \
-                         -L$(shell root-config --libdir) -lThread -lGeom -lGui
+                         -L$(ROOTLIBDIR) -lThread -lGeom -lGui
 endif
 

diff --git a/MUON/libMUONmapping.pkg b/MUON/libMUONmapping.pkg
index b31ee29bb6f1fd62461ce348c412ce4e8978f2a9..edfdf45b17324d4e0d6fcdaa7f306c0dd093c8f9 100644 (file)
--- a/MUON/libMUONmapping.pkg
+++ b/MUON/libMUONmapping.pkg
@@ -113,5 +113,5 @@ EINCLUDE:= RAW MUON/mapping
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lCDB -lSTEERBase -lMUONcore -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lGui
+                         -L$(ROOTLIBDIR) -lGui
 endif

diff --git a/MUON/libMUONmpgraphics.pkg b/MUON/libMUONmpgraphics.pkg
index d1c11fad2224e884a2445067c4ad159313c77422..e5fd20048e40b56ac916a178fe87593b90c41cae 100644 (file)
--- a/MUON/libMUONmpgraphics.pkg
+++ b/MUON/libMUONmpgraphics.pkg
@@ -30,5 +30,5 @@ EINCLUDE:= RAW MUON/mapping
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lCDB -lSTEERBase -lMUONcore -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lGui
+                         -L$(ROOTLIBDIR) -lGui
 endif

diff --git a/MUON/libMUONrec.pkg b/MUON/libMUONrec.pkg
index cbd78510f15bf5185b69540c9a1053c1fba2c7ae..37649b62331f284ce29d8ac469b25b216f2a52a5 100644 (file)
--- a/MUON/libMUONrec.pkg
+++ b/MUON/libMUONrec.pkg
@@ -59,5 +59,5 @@ PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lMUONgeometry -lMUONraw -lMUONcore \
                          -lSTEER -lCDB -lESD -lSTEERBase \
                          -lRAWDatasim -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lMinuit -lVMC -lEG -lGeom 
+                         -L$(ROOTLIBDIR) -lMinuit -lVMC -lEG -lGeom 
 endif

diff --git a/MUON/libMUONsim.pkg b/MUON/libMUONsim.pkg
index 9ff4cea39bff8bf510e963e49a91336ce3f21fc1..3a9e89ac6a2d8cf9624ce8088ccd64e3fb9ed4df 100644 (file)
--- a/MUON/libMUONsim.pkg
+++ b/MUON/libMUONsim.pkg
@@ -48,5 +48,5 @@ PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lMUONgeometry -lMUONraw -lMUONcore \
                          -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatasim -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lEG -lGeom 
+                         -L$(ROOTLIBDIR) -lVMC -lEG -lGeom 
 endif

diff --git a/Makefile b/Makefile
index 755e8205000f25cb4991d3dd1807e04b68abd67e..2ee4e52df93db295f4b4089409364943d95d5de1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,18 +64,20 @@ endif
 # Check if DATE is installed
 
 ifneq ($(shell date-config 2>&1 | grep -i usage),)
-DATEFLAGS  = -DALI_DATE $(shell date-config --cflags | tr \" \')
+DATEFLAGS := -DALI_DATE $(shell date-config --cflags | tr \" \')
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
 DEPINC    += $(DATEFLAGS)
+DMONLIBS  := $(shell date-config --monitorlibs)
 else
-DATEFLAGS  = -D`uname` -DDATE_SYS=`uname` -Dlong32='int' \
+DATEFLAGS := -D`uname` -DDATE_SYS=`uname` -Dlong32='int' \
              -Dlong64='long long' -DdatePointer='long'
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
 DEPINC    += $(DATEFLAGS)
+DMONLIBS  :=
 endif
 
 #-------------------------------------------------------------------------------
@@ -98,6 +100,8 @@ ROOTCLIBS     := $(shell $(ROOTCONFIG) --glibs) \
                        -lMLP                   \
                        -lSpectrum              \
                        -L$(ROOTPLUGDIR)
+CHECKALIEN    := $(shell root-config --has-alien)
+CHECKXML      := $(shell root-config --has-xml)
 
 #-------------------------------------------------------------------------------
 # Location where to install libraries and binaries and common header files

diff --git a/PHOS/libPHOSUtils.pkg b/PHOS/libPHOSUtils.pkg
index dbd86bbf7567113a26b8ce5f149bb0a2528d1b50..e6cf4b9f693c4f9daf24bf25c5fadc3a5fffaebf 100644 (file)
--- a/PHOS/libPHOSUtils.pkg
+++ b/PHOS/libPHOSUtils.pkg
@@ -14,5 +14,5 @@ CXXFLAGS+=-D__PHOSUTIL__
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -L$(shell root-config --libdir) -lGeom 
+                         -L$(ROOTLIBDIR) -lGeom 
 endif

diff --git a/PHOS/libPHOSbase.pkg b/PHOS/libPHOSbase.pkg
index 0936c11591b3e43993ea28246760749688c7e822..e9732b8f651f143f726ab9b87720c81cf8fd2531 100644 (file)
--- a/PHOS/libPHOSbase.pkg
+++ b/PHOS/libPHOSbase.pkg
@@ -39,7 +39,7 @@ PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lPHOSUtils \
                          -lSTEER -lCDB -lESD -lSTEERBase \
                          -lRAWDatasim -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lEG -lGeom -lMinuit
+                         -L$(ROOTLIBDIR) -lVMC -lEG -lGeom -lMinuit
 endif
 
 

diff --git a/PHOS/libPHOSpi0Calib.pkg b/PHOS/libPHOSpi0Calib.pkg
index d8b92ec6ff03ed0ea81d56643a88b79151283dfb..f7797deabc32ae21328bcb24bf083b191cab73a1 100644 (file)
--- a/PHOS/libPHOSpi0Calib.pkg
+++ b/PHOS/libPHOSpi0Calib.pkg
@@ -8,5 +8,5 @@ DHDR= PHOSpi0CalibLinkDef.h
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -L$(shell root-config --libdir) -lGeom 
+                         -L$(ROOTLIBDIR) -lGeom 
 endif

diff --git a/PHOS/libPHOSrec.pkg b/PHOS/libPHOSrec.pkg
index bcfb9629c6345dbebf39f24101e85b98d4847c17..f185dda745d78512c15945994a8ed7d1ac782bbe 100644 (file)
--- a/PHOS/libPHOSrec.pkg
+++ b/PHOS/libPHOSrec.pkg
@@ -28,7 +28,7 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lPHOSbase -lSTEER -lCDB -lESD -lSTEERBase \
                          -lRAWDatarec \
-                         -L$(shell root-config --libdir) -lMinuit -lVMC -lEG -lGeom
+                         -L$(ROOTLIBDIR) -lMinuit -lVMC -lEG -lGeom
 endif
 
 

diff --git a/PHOS/libPHOSsim.pkg b/PHOS/libPHOSsim.pkg
index abb93d8a1928a372525c0335f190ff741f041b74..03f8764142e27a18203da42e95980e51980958c5 100644 (file)
--- a/PHOS/libPHOSsim.pkg
+++ b/PHOS/libPHOSsim.pkg
@@ -18,5 +18,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lPHOSbase -lSTEER -lSTEERBase \
                          -lRAWDatarec -lRAWDatasim -lRAWDatabase\
-                         -L$(shell root-config --libdir) -lVMC -lEG -lGeom -lPhysics
+                         -L$(ROOTLIBDIR) -lVMC -lEG -lGeom -lPhysics
 endif

diff --git a/PMD/libPMDsim.pkg b/PMD/libPMDsim.pkg
index 855d7e7f677fab4e3951876ca7b88343662e41f4..55f8a360f3de7937889937b798211c25dee5e156 100644 (file)
--- a/PMD/libPMDsim.pkg
+++ b/PMD/libPMDsim.pkg
@@ -13,5 +13,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lPMDbase -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatasim -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom 
+                         -L$(ROOTLIBDIR) -lVMC -lGeom 
 endif

diff --git a/PWG0/libPWG0base.pkg b/PWG0/libPWG0base.pkg
index 7a17ec14e17d3f2f68b231174b4222d42125cc76..719d6b422d691628176c82ecf4d922ba567d5e53 100644 (file)
--- a/PWG0/libPWG0base.pkg
+++ b/PWG0/libPWG0base.pkg
@@ -21,5 +21,5 @@ EINCLUDE=
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lANALYSIS \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG0/libPWG0selectors.pkg b/PWG0/libPWG0selectors.pkg
index 5254a34d81bc01ad34ef64b175b212177b347a21..9e66b668d8cdfdfadb53ecb11724e2b71fb4a13e 100644 (file)
--- a/PWG0/libPWG0selectors.pkg
+++ b/PWG0/libPWG0selectors.pkg
@@ -24,5 +24,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lSTEER -lANALYSIS -lANALYSISalice -lPWG0base -lPWG0dep \
                          -lRAWDatabase -lRAWDatarec -lTPCbase -lTPCrec \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG1/libPWG1.pkg b/PWG1/libPWG1.pkg
index 8acd3ff01e3de8099942315afd1f00a9e07a3ec7..d5daf72ad45182feb8b2db88b0de61ef3e35924a 100644 (file)
--- a/PWG1/libPWG1.pkg
+++ b/PWG1/libPWG1.pkg
@@ -45,5 +45,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lSTEER -lTPCbase \
                          -lANALYSISalice -lANALYSIS \
-                         -L$(shell root-config --libdir) -lMinuit -lEG -lGeom
+                         -L$(ROOTLIBDIR) -lMinuit -lEG -lGeom
 endif

diff --git a/PWG2/libPWG2flowCommon.pkg b/PWG2/libPWG2flowCommon.pkg
index 985068900e9b67527803771d115729ab14285f36..5b11af17e561a54e90e3c56a33781c4ffe8c78e6 100644 (file)
--- a/PWG2/libPWG2flowCommon.pkg
+++ b/PWG2/libPWG2flowCommon.pkg
@@ -31,5 +31,5 @@ EXPORT:=
 EINCLUDE:= 
 
 ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(shell root-config --libdir) -lEG
+PACKSOFLAGS:= $(SOFLAGS) -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG2/libPWG2flowTasks.pkg b/PWG2/libPWG2flowTasks.pkg
index 8e8f88f85f7a53a7b8b486712c776fda2952e1b5..d2134c82a5335765751ca192af8a4ab5e056e5e7 100644 (file)
--- a/PWG2/libPWG2flowTasks.pkg
+++ b/PWG2/libPWG2flowTasks.pkg
@@ -23,5 +23,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lAOD -lPWG2AOD -lANALYSIS -lANALYSISalice \
                          -lCORRFW \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG2/libPWG2resonances.pkg b/PWG2/libPWG2resonances.pkg
index ed65bbf591b6fa7fe7f56f80eb49523300fa4ffa..f934cb63860266d49ceff5547f29f666d214be20 100644 (file)
--- a/PWG2/libPWG2resonances.pkg
+++ b/PWG2/libPWG2resonances.pkg
@@ -40,5 +40,5 @@ EINCLUDE:= PYTHIA6
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lANALYSIS -lANALYSISalice \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG3/libPWG3vertexingHF.pkg b/PWG3/libPWG3vertexingHF.pkg
index ba648bfdd3a03a198ad91f204b369c2ff3f29b3e..25548b458676e2a526ce10f416dbdfa9a97d52bd 100644 (file)
--- a/PWG3/libPWG3vertexingHF.pkg
+++ b/PWG3/libPWG3vertexingHF.pkg
@@ -30,5 +30,5 @@ EINCLUDE:=  PWG3/base CORRFW
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lAOD -lANALYSIS -lANALYSISalice \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG3/libPWG3vertexingOld.pkg b/PWG3/libPWG3vertexingOld.pkg
index 27ae675b8a4962ee927fdd1a87c89adddcb6eb24..7e893f48c1c25d71c27755fde3cf6453a5df21ce 100644 (file)
--- a/PWG3/libPWG3vertexingOld.pkg
+++ b/PWG3/libPWG3vertexingOld.pkg
@@ -12,5 +12,5 @@ EINCLUDE:=
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lESD -lSTEER \
-#                         -L$(shell root-config --libdir) -lEG
+#                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG4/libPWG4CaloCalib.pkg b/PWG4/libPWG4CaloCalib.pkg
index 11fec564a6e11f7f9cfc8e40902d8a41920713c0..8d186bedb347ce69c0fd8a326be008437fb19309 100644 (file)
--- a/PWG4/libPWG4CaloCalib.pkg
+++ b/PWG4/libPWG4CaloCalib.pkg
@@ -13,5 +13,5 @@ EINCLUDE= PHOS EMCAL
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lAOD -lANALYSIS -lANALYSISalice -lPHOSbase -lEMCALbase \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG4/libPWG4GammaConv.pkg b/PWG4/libPWG4GammaConv.pkg
index 0acc66932c69ca51d27cc06f304fc654ef8c53e8..4dfaef03ab9e29072e90f4ee08e37798359759ea 100644 (file)
--- a/PWG4/libPWG4GammaConv.pkg
+++ b/PWG4/libPWG4GammaConv.pkg
@@ -11,5 +11,5 @@ EXPORT:=$(SRCS:.cxx=.h)
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lAOD -lANALYSIS -lANALYSISalice \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG4/libPWG4JetTasks.pkg b/PWG4/libPWG4JetTasks.pkg
index 5fb5da32e13b68b23b22d753ef065afa84585dd3..580c651512f71c1c7892caffd76398897af698fc 100644 (file)
--- a/PWG4/libPWG4JetTasks.pkg
+++ b/PWG4/libPWG4JetTasks.pkg
@@ -13,5 +13,5 @@ EINCLUDE=JETAN
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lAOD -lANALYSIS -lANALYSISalice -lJETAN \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG4/libPWG4PartCorrBase.pkg b/PWG4/libPWG4PartCorrBase.pkg
index 06f5e3827cb223c4a8eecd56c50d890bdda437b8..b6362e4d5e165b8888b4454a373efb2741a5a57e 100755 (executable)
--- a/PWG4/libPWG4PartCorrBase.pkg
+++ b/PWG4/libPWG4PartCorrBase.pkg
@@ -18,5 +18,5 @@ EXPORT:=$(SRCS:.cxx=.h)
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lAOD -lANALYSIS -lANALYSISalice \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG4/libPWG4PartCorrDep.pkg b/PWG4/libPWG4PartCorrDep.pkg
index 615b984982b14d83ae7387dbf38ac645bb3630b7..9a34ebc85e89dec3c7b6e57711b5b92814821b8d 100755 (executable)
--- a/PWG4/libPWG4PartCorrDep.pkg
+++ b/PWG4/libPWG4PartCorrDep.pkg
@@ -23,5 +23,5 @@ EINCLUDE= PWG4/PartCorrBase PWG4PartCorrBase/PartCorrBase
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lAOD -lANALYSIS -lANALYSISalice -lPWG4PartCorrBase \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PWG4/libPWG4omega3pi.pkg b/PWG4/libPWG4omega3pi.pkg
index 91083a1ac4946a3f3e0815280b49efe86123ebdb..de534f7ef6849a7d63f98a183f508e83282c820c 100644 (file)
--- a/PWG4/libPWG4omega3pi.pkg
+++ b/PWG4/libPWG4omega3pi.pkg
@@ -11,5 +11,5 @@ EXPORT:=$(SRCS:.cxx=.h)
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lESD -lAOD -lANALYSIS -lANALYSISalice \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/PYTHIA6/libAliPythia6.pkg b/PYTHIA6/libAliPythia6.pkg
index ba819ff71a24fd9a556a276b5c08f991ebbb3950..c4d9e2f417faee1598c08de69ced1e5d21e76538 100644 (file)
--- a/PYTHIA6/libAliPythia6.pkg
+++ b/PYTHIA6/libAliPythia6.pkg
@@ -17,5 +17,5 @@ EINCLUDE:=FASTSIM
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEERBase -lSTEER -lEVGEN -lpythia6 -lFASTSIM -llhapdf \
-                         -L$(shell root-config --libdir) -lEG -lEGPythia6
+                         -L$(ROOTLIBDIR) -lEG -lEGPythia6
 endif

diff --git a/RALICE/libRALICE.pkg b/RALICE/libRALICE.pkg
index 592a5d9cf06da2d7e2c37d71d692412f377165fd..d4f5411c556d6f9a0a5738c17251b6ab2ecc23d1 100644 (file)
--- a/RALICE/libRALICE.pkg
+++ b/RALICE/libRALICE.pkg
@@ -17,5 +17,5 @@ PACKDCXXFLAGS:=$(filter-out -Weffc++,$(CXXFLAGSNO))
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) \
-                         -L$(shell root-config --libdir) -lEG -lEGPythia6
+                         -L$(ROOTLIBDIR) -lEG -lEGPythia6
 endif

diff --git a/RAW/libMDC.pkg b/RAW/libMDC.pkg
index 64a143d5626674a4fbfa04419d334f88d746ea05..328d337b5ed9d3d872e5b42145c35cc41e36c7e9 100644 (file)
--- a/RAW/libMDC.pkg
+++ b/RAW/libMDC.pkg
@@ -7,7 +7,7 @@ SRCS:=  AliMDC.cxx AliRawDB.cxx \
 
 HDRS:= $(SRCS:.cxx=.h)
 
-EHDRS:=$(shell root-config --incdir)/TH1F.h
+EHDRS:=$(ROOTINCDIR)/TH1F.h
 
 #EDEFINE+= -DUSE_EB
 

diff --git a/RAW/libMDCFilter.pkg b/RAW/libMDCFilter.pkg
index d94b5989636d0f9aa1673dbc4c897532e4e3ad45..31205817a3e746eab3556bdd3d5d0e7a7e38b505 100644 (file)
--- a/RAW/libMDCFilter.pkg
+++ b/RAW/libMDCFilter.pkg
@@ -6,7 +6,7 @@ SRCS:=
 
 HDRS:= $(SRCS:.cxx=.h)
 
-#EHDRS:=$(shell root-config --incdir)/TH1F.h
+#EHDRS:=$(ROOTINCDIR)/TH1F.h
 
 #EDEFINE+= -DUSE_EB
 

diff --git a/RAW/libRAWDatabase.pkg b/RAW/libRAWDatabase.pkg
index fbc536bb2da9820b3fa123153d5d39c6d3cc8060..dcbd4f92f4b6cb988fa668cedb2abd3ff16b4d1a 100644 (file)
--- a/RAW/libRAWDatabase.pkg
+++ b/RAW/libRAWDatabase.pkg
@@ -12,7 +12,7 @@ HDRS:= $(SRCS:.cxx=.h)
 
 HDRS += AliRawEventHeaderVersions.h
 
-EHDRS:=$(shell root-config --incdir)/TH1F.h
+EHDRS:=$(ROOTINCDIR)/TH1F.h
 
 EINCLUDE+=
 

diff --git a/RAW/libRAWDatarec.pkg b/RAW/libRAWDatarec.pkg
index 7c5a7e8855fbd1b23e6ca8b36cd76d5eef7bc266..133abad6ad0aa97421043f8e732d27e94a8b6c75 100644 (file)
--- a/RAW/libRAWDatarec.pkg
+++ b/RAW/libRAWDatarec.pkg
@@ -18,7 +18,7 @@ HDRS:= $(SRCS:.cxx=.h)
 
 HDRS +=
 
-EHDRS:=$(shell root-config --incdir)/TH1F.h
+EHDRS:=$(ROOTINCDIR)/TH1F.h
 
 EINCLUDE+= HLT/rec
 

diff --git a/RAW/libRAWDatarecOnline.pkg b/RAW/libRAWDatarecOnline.pkg
index d9f5764861756b2d6058915795eca67bbee13697..1d3247eff8804580cd39972f7ef0aa172a6befa5 100644 (file)
--- a/RAW/libRAWDatarecOnline.pkg
+++ b/RAW/libRAWDatarecOnline.pkg
@@ -10,7 +10,7 @@ DHDR:= RAWDatarecOnlineLinkDef.h
 
 ifdef DATE_ROOT
 EINCLUDE+= ${DATE_COMMON_DEFS}
-TEMPDATELIBS:=$(shell date-config --monitorlibs)
+TEMPDATELIBS:=$(DMONLIBS)
 ELIBS+=$(patsubst lib%,%,$(basename $(notdir $(filter %.a,$(TEMPDATELIBS)))))
 ELIBSDIR+=$(dir $(filter %.a,$(TEMPDATELIBS)))
 ELIBS+=$(patsubst -l%,%,$(filter -l%,$(TEMPDATELIBS)))

diff --git a/RAW/libRAWDatasim.pkg b/RAW/libRAWDatasim.pkg
index 5bcfdd58e85d29ea34effbf9036d1cb26843ca62..83a8545c28022f7f6c2d00c59563e8f49af2dcb8 100644 (file)
--- a/RAW/libRAWDatasim.pkg
+++ b/RAW/libRAWDatasim.pkg
@@ -6,7 +6,7 @@ HDRS:= $(SRCS:.cxx=.h)
 
 HDRS +=
 
-EHDRS:=$(shell root-config --incdir)/TH1F.h
+EHDRS:=$(ROOTINCDIR)/TH1F.h
 
 EINCLUDE+=
 

diff --git a/STAT/libSTAT.pkg b/STAT/libSTAT.pkg
index 859ee717227b446587cfd4575e6e659af68abff6..87bf4dc472552dd152e7706f00eee5b7945bab4e 100644 (file)
--- a/STAT/libSTAT.pkg
+++ b/STAT/libSTAT.pkg
@@ -16,5 +16,5 @@ DHDR:=STATLinkDef.h
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lCDB \
-                         -L$(shell root-config --libdir) -lMinuit
+                         -L$(ROOTLIBDIR) -lMinuit
 endif

diff --git a/STEER/libAOD.pkg b/STEER/libAOD.pkg
index 9203fe2d9747a56de6534ba83084fde647f281c4..e5481b109d3dc60d8bbee6ecaaf2c17957b1bde7 100644 (file)
--- a/STEER/libAOD.pkg
+++ b/STEER/libAOD.pkg
@@ -16,5 +16,5 @@ EXPORT:=$(SRCS:.cxx=.h)
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/STEER/libESD.pkg b/STEER/libESD.pkg
index 4dab3e80ed01d4f265e5d9ba610a6210f0ba347e..12a6875daf04c04aa037e028f61dcb0132486a56 100644 (file)
--- a/STEER/libESD.pkg
+++ b/STEER/libESD.pkg
@@ -43,5 +43,5 @@ EXPORT:=$(SRCS:.cxx=.h)
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/STEER/libSTEER.pkg b/STEER/libSTEER.pkg
index 9004267e67e0513e6baef119b22938f97c4f0c8c..93402b88d18267e3c1affab6f04ff1ae03bd1fb6 100644 (file)
--- a/STEER/libSTEER.pkg
+++ b/STEER/libSTEER.pkg
@@ -88,5 +88,5 @@ EXPORT:=$(SRCS:.cxx=.h) AliConst.h AliCallf77.h AliRawDataHeaderSim.h
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEERBase -lESD -lAOD -lCDB -lRAWDatabase -lRAWDatarec \
-                         -L$(shell root-config --libdir) -lMinuit -lVMC -lEG -lGeom -lProofPlayer -lProof
+                         -L$(ROOTLIBDIR) -lMinuit -lVMC -lEG -lGeom -lProofPlayer -lProof
 endif

diff --git a/STEER/libSTEERBase.pkg b/STEER/libSTEERBase.pkg
index d91e574cf963cd3c05f483d238609e4d35cf2eec..0a595dfa03ae2fa65f55529997e588751f643f58 100644 (file)
--- a/STEER/libSTEERBase.pkg
+++ b/STEER/libSTEERBase.pkg
@@ -36,5 +36,5 @@ DHDR= STEERBaseLinkDef.h
 EXPORT:=$(SRCS:.cxx=.h)
 
 ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(shell root-config --libdir) -lVMC -lEG
+PACKSOFLAGS:= $(SOFLAGS) -L$(ROOTLIBDIR) -lVMC -lEG
 endif

diff --git a/STRUCT/libSTRUCT.pkg b/STRUCT/libSTRUCT.pkg
index 85006dfdf844b0426f997edcf97682017632585b..a540461edfced0e3550d857dcb8e57ab3c1d1148 100644 (file)
--- a/STRUCT/libSTRUCT.pkg
+++ b/STRUCT/libSTRUCT.pkg
@@ -16,6 +16,6 @@ DHDR:=STRUCTLinkDef.h
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lSTEERBase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom
+                         -L$(ROOTLIBDIR) -lVMC -lGeom
 endif
 

diff --git a/T0/libT0base.pkg b/T0/libT0base.pkg
index 2af0325802a05a7778511d8576925ec7356ae3c8..e274ead03694d59ecddbbb717007787b0548b4f5 100644 (file)
--- a/T0/libT0base.pkg
+++ b/T0/libT0base.pkg
@@ -17,6 +17,6 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatasim -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lGeom -lSpectrum
+                         -L$(ROOTLIBDIR) -lGeom -lSpectrum
 endif
 

diff --git a/T0/libT0rec.pkg b/T0/libT0rec.pkg
index 380202bffbff73c451ff16a9efc51b827bb143bd..600d396d2c55ed06ded574266c74b6ec7eb32175 100644 (file)
--- a/T0/libT0rec.pkg
+++ b/T0/libT0rec.pkg
@@ -14,5 +14,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lT0base -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatarec \
-                         -L$(shell root-config --libdir) -lGui
+                         -L$(ROOTLIBDIR) -lGui
 endif

diff --git a/T0/libT0sim.pkg b/T0/libT0sim.pkg
index 101fcf54781054c1ddd975c7d7a2c70e45fc4152..07e89810667784b9bb60a7cb41743b11fddf729c 100644 (file)
--- a/T0/libT0sim.pkg
+++ b/T0/libT0sim.pkg
@@ -12,6 +12,6 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lT0base -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom 
+                         -L$(ROOTLIBDIR) -lVMC -lGeom 
 endif
 

diff --git a/TDPMjet/libTDPMjet.pkg b/TDPMjet/libTDPMjet.pkg
index 85e8d7e09123e987690b6c1f971362ecefb43496..7fc642b7dfe05ca4dc02e95efb9c3670c0e078fe 100644 (file)
--- a/TDPMjet/libTDPMjet.pkg
+++ b/TDPMjet/libTDPMjet.pkg
@@ -13,5 +13,5 @@ EINCLUDE:=DPMJET
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEERBase -lEVGEN -lSTEER -ldpmjet \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/TEPEMGEN/libTEPEMGEN.pkg b/TEPEMGEN/libTEPEMGEN.pkg
index fedea6210424e6d93830b2f13822f96b863448fb..69f552069dfa4b592ce18ab4729c6b849b12f0fd 100644 (file)
--- a/TEPEMGEN/libTEPEMGEN.pkg
+++ b/TEPEMGEN/libTEPEMGEN.pkg
@@ -16,5 +16,5 @@ EXPORT:=TEpEmGen.h
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lSTEERBase -lEVGEN -lmicrocern \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/THbtp/libTHbtp.pkg b/THbtp/libTHbtp.pkg
index 009bbe0829c0cba97bf49f0ac2195e943a71b878..a08b6bbf3f8e3b59dc2d16381487c7bcaf34e7bf 100644 (file)
--- a/THbtp/libTHbtp.pkg
+++ b/THbtp/libTHbtp.pkg
@@ -11,6 +11,6 @@ EXPORT:=HBTprocCOMMON.h THBTprocessor.h
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lEVGEN -lSTEERBase -lmicrocern \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif
 

diff --git a/THerwig/libTHerwig.pkg b/THerwig/libTHerwig.pkg
index 1b8025e33b0a3e7f425fcb0b98dd3f5adfd6ddb0..69e21de09cbb25802b32db75be80a41ec32d53d0 100644 (file)
--- a/THerwig/libTHerwig.pkg
+++ b/THerwig/libTHerwig.pkg
@@ -13,5 +13,5 @@ EINCLUDE:=HERWIG
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lEVGEN -lSTEER -lherwig \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/THijing/libTHijing.pkg b/THijing/libTHijing.pkg
index 04e48b2659d088e22bbfe7c60b4a5e0b972f2743..a635cc1dc6cd65879a89f17791123a2831b179b7 100644 (file)
--- a/THijing/libTHijing.pkg
+++ b/THijing/libTHijing.pkg
@@ -13,5 +13,5 @@ EINCLUDE:=HIJING EVGEN
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lEVGEN -lSTEER -lSTEERBase -lhijing \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/TOF/libTOFbase.pkg b/TOF/libTOFbase.pkg
index d5484660eef9fb74bb82d7041650329d1ecead5d..2ea2f0f8dc67216a8f383bfb0f47be1bd700cf4c 100644 (file)
--- a/TOF/libTOFbase.pkg
+++ b/TOF/libTOFbase.pkg
@@ -39,5 +39,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lGeom
+                         -L$(ROOTLIBDIR) -lGeom
 endif

diff --git a/TOF/libTOFrec.pkg b/TOF/libTOFrec.pkg
index ea5ec46579a01d89f0a73d286c49ff22f1a89cfa..a516758d1819f9b330b46042ae2ee045e5882434 100644 (file)
--- a/TOF/libTOFrec.pkg
+++ b/TOF/libTOFrec.pkg
@@ -16,5 +16,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lTOFbase -lSTEER -lCDB -lESD -lSTEERBase \
                          -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lGeom
+                         -L$(ROOTLIBDIR) -lGeom
 endif

diff --git a/TOF/libTOFsim.pkg b/TOF/libTOFsim.pkg
index 5bcc8fcb93f209295fcf55a8b4b3af7afb41a62e..140d2bb7c7b9d4b22cff75084a8da387bf010464 100644 (file)
--- a/TOF/libTOFsim.pkg
+++ b/TOF/libTOFsim.pkg
@@ -19,5 +19,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lTOFbase -lSTEER -lSTEERBase \
                          -lRAWDatasim -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom
+                         -L$(ROOTLIBDIR) -lVMC -lGeom
 endif

diff --git a/TPC/libTPCbase.pkg b/TPC/libTPCbase.pkg
index 9e9040157daa3a74fcd41aa030d269d13e41e701..a329c4a1b424711891e52d2479153cc304c1e760 100644 (file)
--- a/TPC/libTPCbase.pkg
+++ b/TPC/libTPCbase.pkg
@@ -34,5 +34,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatasim -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lMinuit -lVMC -lEG -lGeom -lGui
+                         -L$(ROOTLIBDIR) -lMinuit -lVMC -lEG -lGeom -lGui
 endif

diff --git a/TPC/libTPCcalib.pkg b/TPC/libTPCcalib.pkg
index b2837a21419157513754bb84ac4e3dd0b1289429..c39accce9cf6db8adcaf41e5f793285b8be45fec 100644 (file)
--- a/TPC/libTPCcalib.pkg
+++ b/TPC/libTPCcalib.pkg
@@ -20,7 +20,7 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
                          -lCDB -lESD -lTPCbase -lTPCrec -lSTEER -lANALYSIS  \
                          -lSTAT \
-                         -L$(shell root-config --libdir) -lMinuit -lProof -lEG
+                         -L$(ROOTLIBDIR) -lMinuit -lProof -lEG
 endif
 
 

diff --git a/TPC/libTPCfast.pkg b/TPC/libTPCfast.pkg
index 58e0e16f89e24146f2503d0e1ca69b65a7634268..11eca56db772f9b1d78cd48256bc3f813a0789d2 100644 (file)
--- a/TPC/libTPCfast.pkg
+++ b/TPC/libTPCfast.pkg
@@ -14,6 +14,6 @@ EINCLUDE:= RAW
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lTPCrec -lTPCsim -lTPCbase -lESD -lSTEER -lSTEERBase \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif
 

diff --git a/TPC/libTPCmon.pkg b/TPC/libTPCmon.pkg
index 9228dfa3c612e28ad0edf78b3616f790b8ebaa84..2db59813d9e10b0d4b968ef10525856c6f2f79a7 100755 (executable)
--- a/TPC/libTPCmon.pkg
+++ b/TPC/libTPCmon.pkg
@@ -20,13 +20,13 @@ EINCLUDE:= RAW STEER
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEERBase -lRAWDatarec \
-                         -L$(shell root-config --libdir) -lGui
+                         -L$(ROOTLIBDIR) -lGui
 endif
 
 
 ifdef DATE_ROOT
 SRCS +=  AliTPCMonitorDateMonitor.cxx  
-PACKBLIBS += $(shell date-config --monitorlibs)
+PACKBLIBS += $(DMONLIBS)
 ELIBSDIR:=
 ELIBS:=
 HDRS +=  AliTPCMonitorDateMonitor.h 

diff --git a/TPC/libTPCrec.pkg b/TPC/libTPCrec.pkg
index ea63b7471d74568b0869bad1c9cb0f8f015bf412..3d5113dfe83acb915e328d5f48acaf0fdb1779bd 100644 (file)
--- a/TPC/libTPCrec.pkg
+++ b/TPC/libTPCrec.pkg
@@ -24,5 +24,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lTPCbase -lSTEER -lESD -lCDB -lSTEERBase \
                          -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lMinuit
+                         -L$(ROOTLIBDIR) -lMinuit
 endif

diff --git a/TPC/libTPCsim.pkg b/TPC/libTPCsim.pkg
index f7c3a9f2f73fe64d38663064760fb2384fd4550d..bb91b9424cd3720ade5f6e2a5ac03c4c8cca0880 100644 (file)
--- a/TPC/libTPCsim.pkg
+++ b/TPC/libTPCsim.pkg
@@ -19,6 +19,6 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lTPCbase -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatasim -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom
+                         -L$(ROOTLIBDIR) -lVMC -lGeom
 endif
 

diff --git a/TPHIC/libTPHIC.pkg b/TPHIC/libTPHIC.pkg
index 62da9f3c09bfa75bbff0a2c4c7c4b90d8b155bba..c7a17825465a2cac5ec046b65735fdff10cfc3d6 100644 (file)
--- a/TPHIC/libTPHIC.pkg
+++ b/TPHIC/libTPHIC.pkg
@@ -17,5 +17,5 @@ EINCLUDE = $(ALICE_ROOT)/PYTHIA6
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lEVGEN -lpythia6 -lAliPythia6 \
-                         -L$(shell root-config --libdir) -lEG -lEGPythia6
+                         -L$(ROOTLIBDIR) -lEG -lEGPythia6
 endif

diff --git a/TRD/libTRDbase.pkg b/TRD/libTRDbase.pkg
index 38d41931e0c86182380ef3c5584a49ec5ef7e6b4..ee2759f85c2c9ca15d45e8e122dfa84a7b7cb535 100644 (file)
--- a/TRD/libTRDbase.pkg
+++ b/TRD/libTRDbase.pkg
@@ -78,5 +78,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lCDB -lESD -lSTEERBase \
                          -lRAWDatasim -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lMinuit -lGeom -lVMC -lMLP -lXMLParser
+                         -L$(ROOTLIBDIR) -lMinuit -lGeom -lVMC -lMLP -lXMLParser
 endif

diff --git a/TRD/libTRDgui.pkg b/TRD/libTRDgui.pkg
index 6b9ad261de8dfebf409f8e86035953c024942fb0..83e1dc3fa90245bdf13843d5361a60ac29864080 100644 (file)
--- a/TRD/libTRDgui.pkg
+++ b/TRD/libTRDgui.pkg
@@ -21,5 +21,5 @@ DHDR= TRDguiLinkDef.h
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -L$(shell root-config --libdir) -lGui
+                         -L$(ROOTLIBDIR) -lGui
 endif

diff --git a/TRD/libTRDqaAnalysis.pkg b/TRD/libTRDqaAnalysis.pkg
index d6d2f124e5209ce6117bde38b3803d88ada0c28b..6764387e436d0cc2f10117ab6a1fd7609fdb3fdc 100644 (file)
--- a/TRD/libTRDqaAnalysis.pkg
+++ b/TRD/libTRDqaAnalysis.pkg
@@ -15,5 +15,5 @@ DHDR= TRDqaAnalysisLinkDef.h
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lANALYSIS -lANALYSISalice -lESD \
-#                         -L$(shell root-config --libdir) -lGui
+#                         -L$(ROOTLIBDIR) -lGui
 endif

diff --git a/TRD/libTRDqaRec.pkg b/TRD/libTRDqaRec.pkg
index 9a44fe84222eb1747579fe514dc121afa1e215db..9975fb7e43c7c8c012b2cfbe344eadbdc6749890 100644 (file)
--- a/TRD/libTRDqaRec.pkg
+++ b/TRD/libTRDqaRec.pkg
@@ -12,5 +12,5 @@ DHDR= TRDqaRecLinkDef.h
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lANALYSIS -lANALYSISalice -lESD \
-#                         -L$(shell root-config --libdir) -lGui
+#                         -L$(ROOTLIBDIR) -lGui
 endif

diff --git a/TRD/libTRDrec.pkg b/TRD/libTRDrec.pkg
index acd1f67fe9ee121850dae3d31c1b8da8fb329264..1ff46bb7c482b761f00afbd629b15ed4ef4fa782 100644 (file)
--- a/TRD/libTRDrec.pkg
+++ b/TRD/libTRDrec.pkg
@@ -34,5 +34,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lTRDbase -lSTEER -lESD -lCDB -lSTEERBase \
                          -lRAWDatarec -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lMinuit -lGeom
+                         -L$(ROOTLIBDIR) -lMinuit -lGeom
 endif

diff --git a/TRD/libTRDsim.pkg b/TRD/libTRDsim.pkg
index 75f21c9848671e147568193a90488a0ea7d6bfce..b44fae9132c7c3acbd725ed89353b82e7663747a 100644 (file)
--- a/TRD/libTRDsim.pkg
+++ b/TRD/libTRDsim.pkg
@@ -18,5 +18,5 @@ EINCLUDE= RAW
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lTRDbase -lSTEER -lSTEERBase \
-                         -L$(shell root-config --libdir) -lGeom -lVMC
+                         -L$(ROOTLIBDIR) -lGeom -lVMC
 endif

diff --git a/TTherminator/libTTherminator.pkg b/TTherminator/libTTherminator.pkg
index 0f636f6185d064de504fc4038d28ebe6ccd759bf..0de2e1af1c11f12773381d7ae5bc36e57f20810a 100644 (file)
--- a/TTherminator/libTTherminator.pkg
+++ b/TTherminator/libTTherminator.pkg
@@ -28,5 +28,5 @@ PACKDCXXFLAGS:=$(filter-out -Weffc++,$(CXXFLAGSNO))
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lSTEERBase -lEVGEN \
-                         -L$(shell root-config --libdir) -lEG
+                         -L$(ROOTLIBDIR) -lEG
 endif

diff --git a/VZERO/libVZEROrec.pkg b/VZERO/libVZEROrec.pkg
index 87a01588c6e7417e719ab0e41ae434f78b0409d8..eb794b29491a196430a8f6d9e2aa062cbd98da6e 100644 (file)
--- a/VZERO/libVZEROrec.pkg
+++ b/VZERO/libVZEROrec.pkg
@@ -17,5 +17,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lVZERObase -lSTEER -lCDB -lESD -lSTEERBase \
                          -lRAWDatarec -lRAWDatabase   \
-                         -L$(shell root-config --libdir) -lGeom   
+                         -L$(ROOTLIBDIR) -lGeom   
 endif 

diff --git a/VZERO/libVZEROsim.pkg b/VZERO/libVZEROsim.pkg
index 8bb9a2f82a2ad8e145146eac45988fc29e484f0f..c9c58a8f3f88738a7c580f8eaf98479c035adeaa 100644 (file)
--- a/VZERO/libVZEROsim.pkg
+++ b/VZERO/libVZEROsim.pkg
@@ -24,5 +24,5 @@ ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lVZERObase -lVZEROrec -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lGeom   
+                         -L$(ROOTLIBDIR) -lVMC -lGeom   
 endif 

diff --git a/ZDC/libZDCsim.pkg b/ZDC/libZDCsim.pkg
index 78fa8e816a2e5ba7ee9304f380d928d6f6094a18..9af811e61aa0f0e7af81d976ada8a1b3a4f53d93 100644 (file)
--- a/ZDC/libZDCsim.pkg
+++ b/ZDC/libZDCsim.pkg
@@ -14,5 +14,5 @@ EINCLUDE:=RAW
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEER -lCDB -lSTEERBase -lZDCbase -lRAWDatabase \
-                         -L$(shell root-config --libdir) -lVMC -lEG -lGeom
+                         -L$(ROOTLIBDIR) -lVMC -lEG -lGeom
 endif