Some cleanup in the makefiles
authorfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 7 Oct 2009 19:54:20 +0000 (19:54 +0000)
committerfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 7 Oct 2009 19:54:20 +0000 (19:54 +0000)
111 files changed:
ACORDE/libACORDEbase.pkg
ACORDE/libACORDEsim.pkg
ANALYSIS/binaliengui.pkg
ANALYSIS/libANALYSISRL.pkg
ANALYSIS/libANALYSISalice.pkg
ANALYSIS/libAliengui.pkg
BCM/libBCM.pkg
CORRFW/libCORRFW.pkg
EMCAL/libEMCALUtils.pkg
EMCAL/libEMCALbase.pkg
EMCAL/libEMCALrec.pkg
EMCAL/libEMCALsim.pkg
EPOS/libEPOS.pkg
ESDCheck/libAnalysisCheck.pkg
EVE/libEveBase.pkg
EVE/libEveDet.pkg
EVE/libEveHLT.pkg
EVGEN/libEVGEN.pkg
FASTSIM/libFASTSIM.pkg
FMD/libFMDbase.pkg
FMD/libFMDsim.pkg
FMD/libFMDutil.pkg
HLT/libAliHLTFMD.pkg
HLT/libAliHLTGlobal.pkg
HLT/libAliHLTITS.pkg
HLT/libAliHLTJET.pkg
HLT/libAliHLTMUON.pkg
HLT/libAliHLTTPC.pkg
HMPID/libHMPIDbase.pkg
HMPID/libHMPIDrec.pkg
HMPID/libHMPIDsim.pkg
ITS/libITSbase.pkg
ITS/libITSrec.pkg
ITS/libITSsim.pkg
JETAN/libFASTJETAN.pkg
JETAN/libJETAN.pkg
MONITOR/binalionlinemonitor.pkg
MONITOR/binalitestproc.pkg
MONITOR/binmonitorCheck.pkg
MONITOR/binmonitorGDC.pkg
MONITOR/libMONITOR.pkg
MUON/libMUONevaluation.pkg
MUON/libMUONgeometry.pkg
MUON/libMUONgraphics.pkg
MUON/libMUONmapping.pkg
MUON/libMUONmpgraphics.pkg
MUON/libMUONrec.pkg
MUON/libMUONsim.pkg
Makefile
PHOS/libPHOSUtils.pkg
PHOS/libPHOSbase.pkg
PHOS/libPHOSpi0Calib.pkg
PHOS/libPHOSrec.pkg
PHOS/libPHOSsim.pkg
PMD/libPMDsim.pkg
PWG0/libPWG0base.pkg
PWG0/libPWG0selectors.pkg
PWG1/libPWG1.pkg
PWG2/libPWG2flowCommon.pkg
PWG2/libPWG2flowTasks.pkg
PWG2/libPWG2resonances.pkg
PWG3/libPWG3vertexingHF.pkg
PWG3/libPWG3vertexingOld.pkg
PWG4/libPWG4CaloCalib.pkg
PWG4/libPWG4GammaConv.pkg
PWG4/libPWG4JetTasks.pkg
PWG4/libPWG4PartCorrBase.pkg
PWG4/libPWG4PartCorrDep.pkg
PWG4/libPWG4omega3pi.pkg
PYTHIA6/libAliPythia6.pkg
RALICE/libRALICE.pkg
RAW/libMDC.pkg
RAW/libMDCFilter.pkg
RAW/libRAWDatabase.pkg
RAW/libRAWDatarec.pkg
RAW/libRAWDatarecOnline.pkg
RAW/libRAWDatasim.pkg
STAT/libSTAT.pkg
STEER/libAOD.pkg
STEER/libESD.pkg
STEER/libSTEER.pkg
STEER/libSTEERBase.pkg
STRUCT/libSTRUCT.pkg
T0/libT0base.pkg
T0/libT0rec.pkg
T0/libT0sim.pkg
TDPMjet/libTDPMjet.pkg
TEPEMGEN/libTEPEMGEN.pkg
THbtp/libTHbtp.pkg
THerwig/libTHerwig.pkg
THijing/libTHijing.pkg
TOF/libTOFbase.pkg
TOF/libTOFrec.pkg
TOF/libTOFsim.pkg
TPC/libTPCbase.pkg
TPC/libTPCcalib.pkg
TPC/libTPCfast.pkg
TPC/libTPCmon.pkg
TPC/libTPCrec.pkg
TPC/libTPCsim.pkg
TPHIC/libTPHIC.pkg
TRD/libTRDbase.pkg
TRD/libTRDgui.pkg
TRD/libTRDqaAnalysis.pkg
TRD/libTRDqaRec.pkg
TRD/libTRDrec.pkg
TRD/libTRDsim.pkg
TTherminator/libTTherminator.pkg
VZERO/libVZEROrec.pkg
VZERO/libVZEROsim.pkg
ZDC/libZDCsim.pkg

index 16b4214..b524860 100644 (file)
@@ -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
index 9f9da52..2bb5c63 100644 (file)
@@ -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
index b48799d..eca1df8 100644 (file)
@@ -21,7 +21,6 @@ ELIBS    := Aliengui \
   HLTbase \
   ANALYSIS ANALYSISalice
 
-CHECKXML = $(shell root-config --has-xml)
 ifeq (yes,$(CHECKXML))
 PACKCXXFLAGS += $(CXXFLAGS) -DWITHXML
 endif
index 9654eee..2ed7585 100644 (file)
@@ -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
 
index 24780b8..4ee3db4 100644 (file)
@@ -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
 
 
index f25b2aa..9e82d97 100644 (file)
@@ -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
index a45471b..01dd2e9 100644 (file)
@@ -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
 
index 7be68e3..74b6cb6 100644 (file)
@@ -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
 
 
index 7bbe290..d8b4170 100644 (file)
@@ -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
index c3cbc4b..49a9bef 100644 (file)
@@ -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
index 3403da2..35ae766 100644 (file)
@@ -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
index ae0beca..14ebe15 100644 (file)
@@ -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
index 8bc6c5b..d7b1aa0 100644 (file)
@@ -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
index e3918f4..6408d99 100644 (file)
@@ -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
 
index c18f551..fab8081 100644 (file)
@@ -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
index 2f6e740..9e8f89d 100644 (file)
@@ -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
index 2847a98..f97f500 100644 (file)
@@ -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
index f2777d9..3737588 100644 (file)
@@ -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
index ccd1239..193cddb 100644 (file)
@@ -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
index 9c7063a..87f02e7 100644 (file)
@@ -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
index 629d503..8938225 100644 (file)
@@ -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
 
 #
index e704619..bcccc19 100644 (file)
@@ -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
 
 #
index 6bedb1a..7fb8cba 100644 (file)
@@ -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)
 
 ###############################################################################
 #
index dde793e..7f316a2 100644 (file)
@@ -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
 
 ###############################################################################
 #
index 154819c..74a85d5 100644 (file)
@@ -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
 
 ###############################################################################
 #
index 8a72b9f..bdaa9b1 100644 (file)
@@ -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
index 91a33bc..dce6871 100644 (file)
@@ -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
 
 ###############################################################################
 
index 6bb056f..3791c17 100644 (file)
@@ -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
 
 ###############################################################################
 #
index c99a6f9..76fb96e 100644 (file)
@@ -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
index 425db5e..93fda77 100644 (file)
@@ -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
index 12b4de0..02894ea 100644 (file)
@@ -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
index 78b534d..76f1311 100644 (file)
@@ -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
index 9b8ab5b..707d87e 100644 (file)
@@ -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
index 7e9498d..30f3578 100644 (file)
@@ -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
 
 
index 940a0f7..67d6b68 100644 (file)
@@ -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
 
index 55c08d4..fce2712 100644 (file)
@@ -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
 
index 2e50bf5..ca1910a 100644 (file)
@@ -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}
index 64deace..2904c8a 100644 (file)
@@ -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}
index 5feda7a..37a35ee 100644 (file)
@@ -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}
index a6a0761..15fbbd1 100644 (file)
@@ -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}
index 1254420..9026969 100644 (file)
@@ -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
index c3ef0ab..4c9fe98 100644 (file)
@@ -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
 
index 52a58fd..ac916d1 100644 (file)
@@ -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
index a7b347a..b49b089 100644 (file)
@@ -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
 
index b31ee29..edfdf45 100644 (file)
@@ -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
index d1c11fa..e5fd200 100644 (file)
@@ -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
index cbd7851..37649b6 100644 (file)
@@ -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
index 9ff4cea..3a9e89a 100644 (file)
@@ -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
index 755e820..2ee4e52 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
index dbd86bb..e6cf4b9 100644 (file)
@@ -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
index 0936c11..e9732b8 100644 (file)
@@ -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
 
 
index d8b92ec..f7797de 100644 (file)
@@ -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
index bcfb962..f185dda 100644 (file)
@@ -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
 
 
index abb93d8..03f8764 100644 (file)
@@ -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
index 855d7e7..55f8a36 100644 (file)
@@ -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
index 7a17ec1..719d6b4 100644 (file)
@@ -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
index 5254a34..9e66b66 100644 (file)
@@ -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
index 8acd3ff..d5daf72 100644 (file)
@@ -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
index 9850689..5b11af1 100644 (file)
@@ -31,5 +31,5 @@ EXPORT:=
 EINCLUDE:= 
 
 ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(shell root-config --libdir) -lEG
+PACKSOFLAGS:= $(SOFLAGS) -L$(ROOTLIBDIR) -lEG
 endif
index 8e8f88f..d2134c8 100644 (file)
@@ -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
index ed65bbf..f934cb6 100644 (file)
@@ -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
index ba648bf..25548b4 100644 (file)
@@ -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
index 27ae675..7e893f4 100644 (file)
@@ -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
index 11fec56..8d186be 100644 (file)
@@ -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
index 0acc669..4dfaef0 100644 (file)
@@ -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
index 5fb5da3..580c651 100644 (file)
@@ -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
index 06f5e38..b6362e4 100755 (executable)
@@ -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
index 615b984..9a34ebc 100755 (executable)
@@ -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
index 91083a1..de534f7 100644 (file)
@@ -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
index ba819ff..c4d9e2f 100644 (file)
@@ -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
index 592a5d9..d4f5411 100644 (file)
@@ -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
index 64a143d..328d337 100644 (file)
@@ -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
 
index d94b598..3120581 100644 (file)
@@ -6,7 +6,7 @@ SRCS:=
 
 HDRS:= $(SRCS:.cxx=.h)
 
-#EHDRS:=$(shell root-config --incdir)/TH1F.h
+#EHDRS:=$(ROOTINCDIR)/TH1F.h
 
 #EDEFINE+= -DUSE_EB
 
index fbc536b..dcbd4f9 100644 (file)
@@ -12,7 +12,7 @@ HDRS:= $(SRCS:.cxx=.h)
 
 HDRS += AliRawEventHeaderVersions.h
 
-EHDRS:=$(shell root-config --incdir)/TH1F.h
+EHDRS:=$(ROOTINCDIR)/TH1F.h
 
 EINCLUDE+=
 
index 7c5a7e8..133abad 100644 (file)
@@ -18,7 +18,7 @@ HDRS:= $(SRCS:.cxx=.h)
 
 HDRS +=
 
-EHDRS:=$(shell root-config --incdir)/TH1F.h
+EHDRS:=$(ROOTINCDIR)/TH1F.h
 
 EINCLUDE+= HLT/rec
 
index d9f5764..1d3247e 100644 (file)
@@ -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)))
index 5bcfdd5..83a8545 100644 (file)
@@ -6,7 +6,7 @@ HDRS:= $(SRCS:.cxx=.h)
 
 HDRS +=
 
-EHDRS:=$(shell root-config --incdir)/TH1F.h
+EHDRS:=$(ROOTINCDIR)/TH1F.h
 
 EINCLUDE+=
 
index 859ee71..87bf4dc 100644 (file)
@@ -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
index 9203fe2..e5481b1 100644 (file)
@@ -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
index 4dab3e8..12a6875 100644 (file)
@@ -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
index 9004267..93402b8 100644 (file)
@@ -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
index d91e574..0a595df 100644 (file)
@@ -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
index 85006df..a540461 100644 (file)
@@ -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
 
index 2af0325..e274ead 100644 (file)
@@ -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
 
index 380202b..600d396 100644 (file)
@@ -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
index 101fcf5..07e8981 100644 (file)
@@ -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
 
index 85e8d7e..7fc642b 100644 (file)
@@ -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
index fedea62..69f5520 100644 (file)
@@ -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
index 009bbe0..a08b6bb 100644 (file)
@@ -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
 
index 1b8025e..69e21de 100644 (file)
@@ -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
index 04e48b2..a635cc1 100644 (file)
@@ -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
index d548466..2ea2f0f 100644 (file)
@@ -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
index ea5ec46..a516758 100644 (file)
@@ -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
index 5bcc8fc..140d2bb 100644 (file)
@@ -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
index 9e90401..a329c4a 100644 (file)
@@ -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
index b2837a2..c39accc 100644 (file)
@@ -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
 
 
index 58e0e16..11eca56 100644 (file)
@@ -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
 
index 9228dfa..2db5981 100755 (executable)
@@ -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 
index ea63b74..3d5113d 100644 (file)
@@ -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
index f7c3a9f..bb91b94 100644 (file)
@@ -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
 
index 62da9f3..c7a1782 100644 (file)
@@ -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
index 38d4193..ee2759f 100644 (file)
@@ -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
index 6b9ad26..83e1dc3 100644 (file)
@@ -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
index d6d2f12..6764387 100644 (file)
@@ -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
index 9a44fe8..9975fb7 100644 (file)
@@ -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
index acd1f67..1ff46bb 100644 (file)
@@ -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
index 75f21c9..b44fae9 100644 (file)
@@ -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
index 0f636f6..0de2e1a 100644 (file)
@@ -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
index 87a0158..eb794b2 100644 (file)
@@ -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 
index 8bb9a2f..c9c58a8 100644 (file)
@@ -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 
index 78fa8e8..9af811e 100644 (file)
@@ -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