X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=fd17b33491cee5e8e0744b3d5bae5e84e044c65b;hb=a7e9db2aa80120f69e93dc1dd0699b81a4cab2e4;hp=1aa36e29221bf2ffaef2b482b89da7beb8133b78;hpb=5fdadcc5aceb207fac634de275df7c40648d1c41;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index 1aa36e29221..fd17b33491c 100644
--- a/Makefile
+++ b/Makefile
@@ -90,19 +90,31 @@ $(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 EVE
+      JETAN HLT LHC ESDCheck STAT
+
+ifneq ($(wildcard $(ROOTSYS)/include/TGLIncludes.h),)
+ALIROOTMODULES += EVE
+endif 
 
 ifeq ($(findstring TFluka,$(MAKECMDGOALS)),TFluka)
 ALIROOTMODULES += TFluka
 endif
 
+ifeq ($(findstring THydjet,$(MAKECMDGOALS)),THydjet)
+ALIROOTMODULES += THydjet
+endif
+
 ifeq ($(findstring PWG0,$(MAKECMDGOALS)),PWG0)
 ALIROOTMODULES += PWG0
 endif
 
+ifeq ($(findstring PWG1,$(MAKECMDGOALS)),PWG1)
+ALIROOTMODULES += PWG1
+endif
+
 ifeq ($(findstring PWG2,$(MAKECMDGOALS)),PWG2)
 ALIROOTMODULES += PWG2
 endif
@@ -123,7 +135,11 @@ ifeq ($(findstring Flugg,$(MAKECMDGOALS)),Flugg)
 ALIROOTMODULES += Flugg
 endif
 
-CERNMODULES := LHAPDF PYTHIA6 HIJING MICROCERN HERWIG
+CERNMODULES := LHAPDF HIJING MICROCERN HERWIG
+
+ifneq ($(wildcard $(ROOTSYS)/include/TPythia6.h),)
+CERNMODULES += PYTHIA6
+endif 
 
 MODULES := $(ALIROOTMODULES) $(CERNMODULES) ALIROOT
 
@@ -144,13 +160,13 @@ 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
 
 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)
 
@@ -240,11 +256,19 @@ endif
 
 aliroot: alilibs $(BINPATH) $(ALLEXECS) 
 
-alimdc-static: $(LIBPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB)
+ROOTALIBDIR=$(shell root-config --libdir)
+
+alimdc-static: $(LIBPATH) $(BINPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB) $(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
+	 $(LD) $(LDFLAGS) -o $(BINPATH)/alimdca $(alimdcCXXO) \
+	 $(LIBPATH)/libAliMDC.a \
+	 $(ROOTALIBDIR)/libRoot.a \
+	 $(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \
+	 -ldl
 
+alilibs-static: $(LIBPATH) modules $(ALLALIBS)
 
 include  build/MakefileDA