X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=c27ca3bdf45d0ba02376a6f8c1a2299d4ccfa2cd;hb=c0394bfb312c0e6804313e37d18aedf2bbb9d431;hp=de34189ae6c273bfd7af82bb20c56328cc100664;hpb=c376a06a57314301725529f765eeaf3de89084c8;p=u%2Fmrichter%2FAliRoot.git diff --git a/Makefile b/Makefile index de34189ae6c..c27ca3bdf45 100644 --- a/Makefile +++ b/Makefile @@ -90,10 +90,10 @@ $(warning MAKECMDGOALS=$(MAKECMDGOALS)) endif ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \ - ACORDE HMPID T0 STRUCT EVGEN RALICE VZERO \ + ACORDE HMPID T0 BCM STRUCT EVGEN RALICE VZERO \ THijing MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \ THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \ - JETAN HLT LHC ESDCheck + JETAN HLT LHC ESDCheck STAT TTherminator CORRFW ifneq ($(wildcard $(ROOTSYS)/include/TGLIncludes.h),) ALIROOTMODULES += EVE @@ -111,6 +111,10 @@ ifeq ($(findstring PWG0,$(MAKECMDGOALS)),PWG0) ALIROOTMODULES += PWG0 endif +ifeq ($(findstring PWG1,$(MAKECMDGOALS)),PWG1) +ALIROOTMODULES += PWG1 +endif + ifeq ($(findstring PWG2,$(MAKECMDGOALS)),PWG2) ALIROOTMODULES += PWG2 endif @@ -156,13 +160,14 @@ DEPINC += $(GENINC) # Libraries will be linked against SHLIB # ROOT libraries -ROOTCLIBS := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer -lXMLIO +ROOTCLIBS := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer -lXMLIO -lProof -lProofPlayer -lMLP \ + -lSpectrum ROOTPLIBS := -lEGPythia6 ALILIBS := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \ -lITS -lPHOS -lACORDE -lHMPID -lVZERO -lZDC -lSTRUCT \ - -lT0 -lEVGEN -lSTEER + -lT0 -lEVGEN -lSTEER LIBS := $(ROOTCLIBS) $(ROOTPLIBS) $(SYSLIBS) @@ -254,10 +259,10 @@ aliroot: alilibs $(BINPATH) $(ALLEXECS) ROOTALIBDIR=$(shell root-config --libdir) -alimdc-static: $(LIBPATH) $(BINPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB) $(alimdcCXXO) +alimdc-static: $(LIBPATH) $(BINPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB) $(STEERBaseALIB) $(alimdcCXXO) $(MUTE)rm -rf $(LIBPATH)/libAliMDC.a $(MUTE)rm -rf junk - mkdir junk && cd junk && ar x ../$(RAWDatabaseALIB) && ar x ../$(MDCALIB) && ar x ../$(ESDALIB) && ar r ../$(LIBPATH)/libAliMDC.a *.o && cd .. && rm -rf junk + mkdir junk && cd junk && ar x ../$(RAWDatabaseALIB) && ar x ../$(MDCALIB) && ar x ../$(ESDALIB) && ar x ../$(STEERBaseALIB) && ar r ../$(LIBPATH)/libAliMDC.a *.o && cd .. && rm -rf junk $(LD) $(LDFLAGS) -o $(BINPATH)/alimdca $(alimdcCXXO) \ $(LIBPATH)/libAliMDC.a \ $(ROOTALIBDIR)/libRoot.a \