X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=ALIROOT%2Fbinaliroot.pkg;h=1c993ec9e5a6f4dd751d0b11145c4c09098bed47;hp=ecd3f4962199e921f6eae372fcc3d201fab907b9;hb=96c0c85603eba05064784139723787825bf1c300;hpb=31d94b145092dc24f6c2c4fed82a5a324be08e03

diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg
index ecd3f496219..1c993ec9e5a 100644
--- a/ALIROOT/binaliroot.pkg
+++ b/ALIROOT/binaliroot.pkg
@@ -1,17 +1,38 @@
+#-*- Mode: Makefile -*-
+
 SRCS:=aliroot.cxx
 CSRCS:=fpu.c
 
 ELIBSDIR:=
 
-ELIBS:= MUONrec MUONsim MUONbase MUONmapping TPCbase TPCsim TPCrec TPCfast \
-	ITS PMDbase PMDsim PMDrec TRDbase TRDsim TRDrec TRDfast \
-	FMDbase FMDsim FMDrec TOFbase TOFrec TOFsim PHOS CRT RICH \
-        ZDCbase ZDC ZDCsim ZDCrec VZERObase VZEROsim VZEROrec EMCAL \
-        STRUCT STARTbase STARTsim STARTrec EVGEN ESD STEER CONTAINERS \
-        pythia6 AliPythia6 pdf THijing \
-        hijing TMEVSIM mevsim THbtp HBTP THerwig herwig TEPEMGEN EPEMGEN \
-        TPHIC FASTSIM microcern RAW AliL3Src AliL3Comp AliL3Misc AliL3Hough
-# g2c_sh
+
+
+ELIBS:= MUONcore MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONcalib MUONmapping \
+        TPCbase TPCsim TPCrec TPCfast \
+	ITSbase ITSsim ITSrec PMDbase PMDsim PMDrec TRDbase \
+        TRDsim TRDrec TRDfast \
+	FMDbase FMDsim FMDrec TOFbase TOFrec TOFsim PHOSUtils PHOSbase PHOSsim PHOSrec \
+	ACORDEbase ACORDEsim ACORDErec \
+        HMPIDbase HMPIDrec HMPIDsim \
+        ZDCbase ZDCsim ZDCrec VZERObase VZEROsim VZEROrec \
+        EMCALUtils EMCALbase EMCALsim EMCALrec BCM \
+        STRUCT T0base T0sim T0rec EVGEN STEERBase ESD AOD CDB STEER \
+        THijing hijing \
+        FASTSIM microcern \
+	RAWDatabase RAWDatarec RAWDatasim \
+	HLTbase MUONevaluation TRIGGERbase 
+#       THbtp TEPEMGEN \
+#	THerwig herwig TPHIC
+
+ifeq (macosx,$(ALICE_TARGET))
+
+ELIBSCPP:=$(filter-out microcern,$(ELIBS))
+ELIBSCPP:=$(filter-out lhapdf,$(ELIBSCPP))
+ELIBSCPP:=$(filter-out herwig,$(ELIBSCPP))
+PACKLDFLAGS:=$(LDFLAGS) $(ELIBSCPP:%=-Wl,-u,_G__cpp_setupG__%)
+# On Mac OS X gcc we add the fink libraries
+ELIBSDIR+=$(FINK_ROOT)/lib
+endif
 
 # The two variables below are used for the creation of profile target.
 # ARLIBS stands for ARchive LIBrarieS and for each module one wants to profile
@@ -20,26 +41,31 @@ ELIBS:= MUONrec MUONsim MUONbase MUONmapping TPCbase TPCsim TPCrec TPCfast \
 # variable SHLIBS (SHared LIBrarieS).
 # Please note that the order of static libraries is important, the ones
 # which provide code for the others have to be placed after their "clients".
-# For example ITS uses TPC code, TPC uses CONTAINERS code, so the order has
-# to be ITS TPC CONTAINERS 
+# For example if ITS uses TPC code, the order has to be ITS TPC 
 
 ARLIBS:= \
    FMD/tgt_$(ALICE_TARGET)/G__FMDbase.o $(LIBPATH)/libFMDbase.a \
    FMD/tgt_$(ALICE_TARGET)/G__FMDsim.o $(LIBPATH)/libFMDsim.a \
    FMD/tgt_$(ALICE_TARGET)/G__FMDrec.o $(LIBPATH)/libFMDrec.a \
-   CRT/tgt_$(ALICE_TARGET)/G__CRT.o $(LIBPATH)/libCRT.a \
-   RICH/tgt_$(ALICE_TARGET)/G__RICH.o $(LIBPATH)/libRICH.a \
-   ZDC/tgt_$(ALICE_TARGET)/G__ZDC.o $(LIBPATH)/libZDC.a \
+   ACORDE/tgt_$(ALICE_TARGET)/G__ACORDEbase.o $(LIBPATH)/libACORDEbase.a \
+   ACORDE/tgt_$(ALICE_TARGET)/G__ACORDEsim.o $(LIBPATH)/libACORDEsim.a \
+   ACORDE/tgt_$(ALICE_TARGET)/G__ACORDErec.o $(LIBPATH)/libACORDErec.a \
+   HMPID/tgt_$(ALICE_TARGET)/G__HMPIDbase.o $(LIBPATH)/libHMPIDbase.a \
+   HMPID/tgt_$(ALICE_TARGET)/G__HMPIDsim.o $(LIBPATH)/libHMPIDsim.a \
+   HMPID/tgt_$(ALICE_TARGET)/G__HMPIDrec.o $(LIBPATH)/libHMPIDrec.a \
    ZDC/tgt_$(ALICE_TARGET)/G__ZDCbase.o $(LIBPATH)/libZDCbase.a \
    ZDC/tgt_$(ALICE_TARGET)/G__ZDCsim.o $(LIBPATH)/libZDCsim.a \
    ZDC/tgt_$(ALICE_TARGET)/G__ZDCrec.o $(LIBPATH)/libZDCrec.a \
    VZERO/tgt_$(ALICE_TARGET)/G__VZERObase.o $(LIBPATH)/libVZERObase.a \
    VZERO/tgt_$(ALICE_TARGET)/G__VZEROsim.o $(LIBPATH)/libVZEROsim.a \
    VZERO/tgt_$(ALICE_TARGET)/G__VZEROrec.o $(LIBPATH)/libVZEROrec.a \
-   EMCAL/tgt_$(ALICE_TARGET)/G__EMCAL.o $(LIBPATH)/libEMCAL.a \
-   START/tgt_$(ALICE_TARGET)/G__STARTbase.o $(LIBPATH)/libSTARTbase.a \
-   START/tgt_$(ALICE_TARGET)/G__STARTsim.o $(LIBPATH)/libSTARTsim.a \
-   START/tgt_$(ALICE_TARGET)/G__STARTrec.o $(LIBPATH)/libSTARTrec.a \
+   EMCAL/tgt_$(ALICE_TARGET)/G__EMCALUtils.o $(LIBPATH)/libEMCALUtils.a \
+   EMCAL/tgt_$(ALICE_TARGET)/G__EMCALbase.o $(LIBPATH)/libEMCALbase.a \
+   EMCAL/tgt_$(ALICE_TARGET)/G__EMCALsim.o $(LIBPATH)/libEMCALsim.a \
+   EMCAL/tgt_$(ALICE_TARGET)/G__EMCALrec.o $(LIBPATH)/libEMCALrec.a \
+   T0/tgt_$(ALICE_TARGET)/G__T0base.o $(LIBPATH)/libT0base.a \
+   T0/tgt_$(ALICE_TARGET)/G__T0sim.o $(LIBPATH)/libT0sim.a \
+   T0/tgt_$(ALICE_TARGET)/G__T0rec.o $(LIBPATH)/libT0rec.a \
    TOF/tgt_$(ALICE_TARGET)/G__TOFbase.o $(LIBPATH)/libTOFbase.a \
    TOF/tgt_$(ALICE_TARGET)/G__TOFsim.o $(LIBPATH)/libTOFsim.a \
    TOF/tgt_$(ALICE_TARGET)/G__TOFrec.o $(LIBPATH)/libTOFrec.a \
@@ -51,11 +77,20 @@ ARLIBS:= \
    PMD/tgt_$(ALICE_TARGET)/G__PMDsim.o $(LIBPATH)/libPMDsim.a \
    PMD/tgt_$(ALICE_TARGET)/G__PMDrec.o $(LIBPATH)/libPMDrec.a \
    MUON/tgt_$(ALICE_TARGET)/G__MUONmapping.o $(LIBPATH)/libMUONmapping.a \
+   MUON/tgt_$(ALICE_TARGET)/G__MUONmapping.o $(LIBPATH)/libMUONcalib.a \
+   MUON/tgt_$(ALICE_TARGET)/G__MUONgeometry.o $(LIBPATH)/libMUONgeometry.a \
    MUON/tgt_$(ALICE_TARGET)/G__MUONbase.o $(LIBPATH)/libMUONbase.a \
    MUON/tgt_$(ALICE_TARGET)/G__MUONsim.o $(LIBPATH)/libMUONsim.a \
    MUON/tgt_$(ALICE_TARGET)/G__MUONrec.o $(LIBPATH)/libMUONrec.a \
-   PHOS/tgt_$(ALICE_TARGET)/G__PHOS.o $(LIBPATH)/libPHOS.a \
-   ITS/tgt_$(ALICE_TARGET)/G__ITS.o $(LIBPATH)/libITS.a \
+   MUON/tgt_$(ALICE_TARGET)/G__MUONraw.o $(LIBPATH)/libMUONraw.a \
+   PHOS/tgt_$(ALICE_TARGET)/G__PHOSUtils.o $(LIBPATH)/libPHOSUtils.a \
+   PHOS/tgt_$(ALICE_TARGET)/G__PHOSbase.o $(LIBPATH)/libPHOSbase.a \
+   PHOS/tgt_$(ALICE_TARGET)/G__PHOSsim.o $(LIBPATH)/libPHOSsim.a \
+   PHOS/tgt_$(ALICE_TARGET)/G__PHOSrec.o $(LIBPATH)/libPHOSrec.a \
+   HLT/tgt_$(ALICE_TARGET)/G__HLTbase.o $(LIBPATH)/libHLTbase.a \
+   ITS/tgt_$(ALICE_TARGET)/G__ITSbase.o $(LIBPATH)/libITSbase.a \
+   ITS/tgt_$(ALICE_TARGET)/G__ITSsim.o $(LIBPATH)/libITSsim.a \
+   ITS/tgt_$(ALICE_TARGET)/G__ITSrec.o $(LIBPATH)/libITSrec.a \
    STRUCT/tgt_$(ALICE_TARGET)/G__STRUCT.o $(LIBPATH)/libSTRUCT.a \
    TPC/tgt_$(ALICE_TARGET)/G__TPCbase.o $(LIBPATH)/libTPCbase.a \
    TPC/tgt_$(ALICE_TARGET)/G__TPCsim.o $(LIBPATH)/libTPCsim.a \
@@ -63,7 +98,13 @@ ARLIBS:= \
    TPC/tgt_$(ALICE_TARGET)/G__TPCfast.o $(LIBPATH)/libTPCfast.a \
    STEER/tgt_$(ALICE_TARGET)/G__STEER.o $(LIBPATH)/libSTEER.a \
    STEER/tgt_$(ALICE_TARGET)/G__ESD.o $(LIBPATH)/libESD.a \
-   CONTAINERS/tgt_$(ALICE_TARGET)/G__CONTAINERS.o $(LIBPATH)/libCONTAINERS.a \
-   RAW/tgt_$(ALICE_TARGET)/G__RAW.o $(LIBPATH)/libRAW.a
+   STEER/tgt_$(ALICE_TARGET)/G__CDB.o $(LIBPATH)/libCDB.a \
+   RAW/tgt_$(ALICE_TARGET)/G__RAWDatabase.o $(LIBPATH)/libRAWDatabase.a \
+   RAW/tgt_$(ALICE_TARGET)/G__RAWDatasim.o $(LIBPATH)/libRAWDatasim.a \
+   RAW/tgt_$(ALICE_TARGET)/G__RAWDatarec.o $(LIBPATH)/libRAWDatarec.a \
+   RAW/tgt_$(ALICE_TARGET)/G__MDC.o $(LIBPATH)/libMDC.a \
+   TRIGGER/tgt_$(ALICE_TARGET)/G__TRIGGERbase.o $(LIBPATH)/libTRIGGERbase.a
+
+#SHLIBS:= $(BINLIBDIRS) -lEVGEN -lEGPythia6 -lPythia6 -lpythia6 -lAliPythia6 -llhapdf -lTHijing -lhijing -lTHbtp -lTHerwig -lherwig -lTEPEMGEN -lTPHIC -lFASTSIM -lmicrocern
+SHLIBS:= $(BINLIBDIRS) -lEVGEN -lEGPythia6 -lPythia6 -lpythia6 -lAliPythia6 -llhapdf -lTHijing -lhijing -lTHerwig -lherwig -lTPHIC -lFASTSIM -lmicrocern
 
-SHLIBS:= $(BINLIBDIRS) -lEVGEN -lpythia6 -lAliPythia6 -lpdf -lTHijing -lhijing -lTMEVSIM -lmevsim -lTHbtp -lHBTP -lTHerwig -lherwig -lTEPEMGEN -lEPEMGEN -lTPHIC -lFASTSIM -lmicrocern