From 8b13487a9fd164c836d151bdbfa847659a9f285a Mon Sep 17 00:00:00 2001 From: fca Date: Wed, 7 Oct 2009 19:54:20 +0000 Subject: [PATCH] Some cleanup in the makefiles --- ACORDE/libACORDEbase.pkg | 2 +- ACORDE/libACORDEsim.pkg | 2 +- ANALYSIS/binaliengui.pkg | 1 - ANALYSIS/libANALYSISRL.pkg | 3 +-- ANALYSIS/libANALYSISalice.pkg | 4 +--- ANALYSIS/libAliengui.pkg | 3 +-- BCM/libBCM.pkg | 2 +- CORRFW/libCORRFW.pkg | 4 +--- EMCAL/libEMCALUtils.pkg | 2 +- EMCAL/libEMCALbase.pkg | 2 +- EMCAL/libEMCALrec.pkg | 2 +- EMCAL/libEMCALsim.pkg | 2 +- EPOS/libEPOS.pkg | 2 +- ESDCheck/libAnalysisCheck.pkg | 2 +- EVE/libEveBase.pkg | 2 +- EVE/libEveDet.pkg | 2 +- EVE/libEveHLT.pkg | 2 +- EVGEN/libEVGEN.pkg | 2 +- FASTSIM/libFASTSIM.pkg | 2 +- FMD/libFMDbase.pkg | 2 +- FMD/libFMDsim.pkg | 2 +- FMD/libFMDutil.pkg | 2 +- HLT/libAliHLTFMD.pkg | 2 +- HLT/libAliHLTGlobal.pkg | 2 +- HLT/libAliHLTITS.pkg | 2 +- HLT/libAliHLTJET.pkg | 2 +- HLT/libAliHLTMUON.pkg | 2 +- HLT/libAliHLTTPC.pkg | 2 +- HMPID/libHMPIDbase.pkg | 2 +- HMPID/libHMPIDrec.pkg | 2 +- HMPID/libHMPIDsim.pkg | 2 +- ITS/libITSbase.pkg | 2 +- ITS/libITSrec.pkg | 2 +- ITS/libITSsim.pkg | 2 +- JETAN/libFASTJETAN.pkg | 2 +- JETAN/libJETAN.pkg | 2 +- MONITOR/binalionlinemonitor.pkg | 2 +- MONITOR/binalitestproc.pkg | 2 +- MONITOR/binmonitorCheck.pkg | 2 +- MONITOR/binmonitorGDC.pkg | 2 +- MONITOR/libMONITOR.pkg | 2 +- MUON/libMUONevaluation.pkg | 2 +- MUON/libMUONgeometry.pkg | 2 +- MUON/libMUONgraphics.pkg | 2 +- MUON/libMUONmapping.pkg | 2 +- MUON/libMUONmpgraphics.pkg | 2 +- MUON/libMUONrec.pkg | 2 +- MUON/libMUONsim.pkg | 2 +- Makefile | 8 ++++++-- PHOS/libPHOSUtils.pkg | 2 +- PHOS/libPHOSbase.pkg | 2 +- PHOS/libPHOSpi0Calib.pkg | 2 +- PHOS/libPHOSrec.pkg | 2 +- PHOS/libPHOSsim.pkg | 2 +- PMD/libPMDsim.pkg | 2 +- PWG0/libPWG0base.pkg | 2 +- PWG0/libPWG0selectors.pkg | 2 +- PWG1/libPWG1.pkg | 2 +- PWG2/libPWG2flowCommon.pkg | 2 +- PWG2/libPWG2flowTasks.pkg | 2 +- PWG2/libPWG2resonances.pkg | 2 +- PWG3/libPWG3vertexingHF.pkg | 2 +- PWG3/libPWG3vertexingOld.pkg | 2 +- PWG4/libPWG4CaloCalib.pkg | 2 +- PWG4/libPWG4GammaConv.pkg | 2 +- PWG4/libPWG4JetTasks.pkg | 2 +- PWG4/libPWG4PartCorrBase.pkg | 2 +- PWG4/libPWG4PartCorrDep.pkg | 2 +- PWG4/libPWG4omega3pi.pkg | 2 +- PYTHIA6/libAliPythia6.pkg | 2 +- RALICE/libRALICE.pkg | 2 +- RAW/libMDC.pkg | 2 +- RAW/libMDCFilter.pkg | 2 +- RAW/libRAWDatabase.pkg | 2 +- RAW/libRAWDatarec.pkg | 2 +- RAW/libRAWDatarecOnline.pkg | 2 +- RAW/libRAWDatasim.pkg | 2 +- STAT/libSTAT.pkg | 2 +- STEER/libAOD.pkg | 2 +- STEER/libESD.pkg | 2 +- STEER/libSTEER.pkg | 2 +- STEER/libSTEERBase.pkg | 2 +- STRUCT/libSTRUCT.pkg | 2 +- T0/libT0base.pkg | 2 +- T0/libT0rec.pkg | 2 +- T0/libT0sim.pkg | 2 +- TDPMjet/libTDPMjet.pkg | 2 +- TEPEMGEN/libTEPEMGEN.pkg | 2 +- THbtp/libTHbtp.pkg | 2 +- THerwig/libTHerwig.pkg | 2 +- THijing/libTHijing.pkg | 2 +- TOF/libTOFbase.pkg | 2 +- TOF/libTOFrec.pkg | 2 +- TOF/libTOFsim.pkg | 2 +- TPC/libTPCbase.pkg | 2 +- TPC/libTPCcalib.pkg | 2 +- TPC/libTPCfast.pkg | 2 +- TPC/libTPCmon.pkg | 4 ++-- TPC/libTPCrec.pkg | 2 +- TPC/libTPCsim.pkg | 2 +- TPHIC/libTPHIC.pkg | 2 +- TRD/libTRDbase.pkg | 2 +- TRD/libTRDgui.pkg | 2 +- TRD/libTRDqaAnalysis.pkg | 2 +- TRD/libTRDqaRec.pkg | 2 +- TRD/libTRDrec.pkg | 2 +- TRD/libTRDsim.pkg | 2 +- TTherminator/libTTherminator.pkg | 2 +- VZERO/libVZEROrec.pkg | 2 +- VZERO/libVZEROsim.pkg | 2 +- ZDC/libZDCsim.pkg | 2 +- 111 files changed, 116 insertions(+), 119 deletions(-) diff --git a/ACORDE/libACORDEbase.pkg b/ACORDE/libACORDEbase.pkg index 16b42140dd2..b5248604754 100644 --- 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 9f9da529867..2bb5c639490 100644 --- 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 b48799dd7c6..eca1df85e3c 100644 --- 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 9654eee4785..2ed75850207 100644 --- 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 24780b866d3..4ee3db432ad 100644 --- 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 f25b2aa1457..9e82d97f8e4 100644 --- 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 a45471bd608..01dd2e99139 100644 --- 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 7be68e355f9..74b6cb64e92 100644 --- 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 7bbe290f7c2..d8b4170d511 100644 --- 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 c3cbc4bff28..49a9befb794 100644 --- 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 3403da2a4eb..35ae766be65 100644 --- 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 ae0beca346c..14ebe15503a 100644 --- 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 8bc6c5be619..d7b1aa01527 100644 --- 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 e3918f45a06..6408d99f56b 100644 --- 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 c18f5513762..fab8081116a 100644 --- 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 2f6e7406645..9e8f89d9ca7 100644 --- 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 2847a987f60..f97f5007eca 100644 --- 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 f2777d95d90..3737588bdc9 100644 --- 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 ccd1239cd16..193cddb2ac2 100644 --- 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 9c7063a260b..87f02e79b94 100644 --- 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 629d5030753..893822599e5 100644 --- 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 e7046190d78..bcccc199b37 100644 --- 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 6bedb1a14c9..7fb8cbae028 100644 --- 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 dde793e463a..7f316a22b56 100644 --- 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 154819c2ed3..74a85d5ab6f 100644 --- 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 8a72b9f1bca..bdaa9b11467 100644 --- 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 91a33bc894a..dce687175b2 100644 --- 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 6bb056f4edd..3791c17b978 100644 --- 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 c99a6f9e783..76fb96e40f8 100644 --- 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 425db5ebb8e..93fda77214d 100644 --- 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 12b4de077e7..02894eaf3a2 100644 --- 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 78b534d9902..76f1311dbc9 100644 --- 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 9b8ab5b5096..707d87e6236 100644 --- 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 7e9498dd896..30f35787444 100644 --- 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 940a0f78e05..67d6b680cce 100644 --- 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 55c08d4e2c9..fce27128edc 100644 --- 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 2e50bf5377b..ca1910abcad 100644 --- 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 64deace4398..2904c8a7090 100644 --- 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 5feda7a6746..37a35ee25f3 100644 --- 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 a6a0761d067..15fbbd1c4b9 100644 --- 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 12544206973..902696982a8 100644 --- 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 c3ef0abee5b..4c9fe9897c8 100644 --- 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 52a58fd6a50..ac916d1a3f6 100644 --- 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 a7b347a29b5..b49b089a3b2 100644 --- 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 b31ee29bb6f..edfdf45b173 100644 --- 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 d1c11fad222..e5fd20048e4 100644 --- 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 cbd78510f15..37649b62331 100644 --- 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 9ff4cea39bf..3a9e89ac6a2 100644 --- 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 755e8205000..2ee4e52df93 100644 --- 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 dbd86bbf756..e6cf4b9f693 100644 --- 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 0936c11591b..e9732b8f651 100644 --- 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 d8b92ec6ff0..f7797deabc3 100644 --- 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 bcfb9629c63..f185dda745d 100644 --- 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 abb93d8a192..03f8764142e 100644 --- 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 855d7e7f677..55f8a360f3d 100644 --- 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 7a17ec14e17..719d6b422d6 100644 --- 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 5254a34d81b..9e66b668d8c 100644 --- 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 8acd3ff01e3..d5daf72ad45 100644 --- 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 985068900e9..5b11af17e56 100644 --- 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 8e8f88f85f7..d2134c82a53 100644 --- 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 ed65bbf591b..f934cb63860 100644 --- 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 ba648bfdd3a..25548b45867 100644 --- 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 27ae675b8a4..7e893f48c1c 100644 --- 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 11fec564a6e..8d186bedb34 100644 --- 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 0acc66932c6..4dfaef03ab9 100644 --- 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 5fb5da32e13..580c651512f 100644 --- 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 06f5e3827cb..b6362e4d5e1 100755 --- 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 615b984982b..9a34ebc85e8 100755 --- 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 91083a1ac49..de534f7ef68 100644 --- 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 ba819ff71a2..c4d9e2f417f 100644 --- 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 592a5d9cf06..d4f5411c556 100644 --- 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 64a143d5626..328d337b5ed 100644 --- 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 d94b5989636..31205817a3e 100644 --- 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 fbc536bb2da..dcbd4f92f4b 100644 --- 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 7c5a7e8855f..133abad6ad0 100644 --- 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 d9f57648617..1d3247eff88 100644 --- 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 5bcfdd58e85..83a8545c280 100644 --- 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 859ee717227..87bf4dc4725 100644 --- 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 9203fe2d974..e5481b109d3 100644 --- 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 4dab3e80ed0..12a6875daf0 100644 --- 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 9004267e67e..93402b88d18 100644 --- 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 d91e574cf96..0a595dfa03a 100644 --- 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 85006dfdf84..a540461edfc 100644 --- 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 2af0325802a..e274ead0369 100644 --- 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 380202bffbf..600d396d2c5 100644 --- 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 101fcf54781..07e89810667 100644 --- 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 85e8d7e0912..7fc642b7dfe 100644 --- 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 fedea621042..69f552069df 100644 --- 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 009bbe0829c..a08b6bbf3f8 100644 --- 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 1b8025e33b0..69e21de09cb 100644 --- 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 04e48b2659d..a635cc1dc6c 100644 --- 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 d5484660eef..2ea2f0f8dc6 100644 --- 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 ea5ec46579a..a516758d181 100644 --- 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 5bcc8fcb93f..140d2bb7c7b 100644 --- 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 9e9040157da..a329c4a1b42 100644 --- 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 b2837a21419..c39accce9cf 100644 --- 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 58e0e16f89e..11eca56db77 100644 --- 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 9228dfa3c61..2db59813d9e 100755 --- 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 ea63b7471d7..3d5113dfe83 100644 --- 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 f7c3a9f2f73..bb91b9424cd 100644 --- 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 62da9f3c09b..c7a17825465 100644 --- 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 38d41931e0c..ee2759f85c2 100644 --- 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 6b9ad261de8..83e1dc3fa90 100644 --- 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 d6d2f124e52..6764387e436 100644 --- 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 9a44fe84222..9975fb7e43c 100644 --- 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 acd1f67fe9e..1ff46bb7c48 100644 --- 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 75f21c98486..b44fae9132c 100644 --- 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 0f636f6185d..0de2e1af1c1 100644 --- 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 87a01588c6e..eb794b29491 100644 --- 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 8bb9a2f82a2..c9c58a8f3f8 100644 --- 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 78fa8e816a2..9af811e61aa 100644 --- 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 -- 2.39.3