X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=3e65191d24e98c929ce62a0021bb2a81e3afd986;hb=610580f64f734e5201e6000f4bb3afe6512983c5;hp=1cf4676e574ad46542a31a5074176ce9cb7cda1e;hpb=b945e71decc32865a6972dcf84ae67bb8c00d102;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index 1cf4676e574..3e65191d24e 100644
--- a/Makefile
+++ b/Makefile
@@ -91,9 +91,13 @@ endif
 
 ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       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 STAT TTherminator CORRFW
+      THijing THbtp EMCAL HBTAN \
+      THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
+      JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet
+
+ifneq ($(wildcard $(ROOTSYS)/include/TPythia8.h),)
+ALIROOTMODULES += PYTHIA8
+endif 
 
 ifneq ($(wildcard $(ROOTSYS)/include/TGLIncludes.h),)
 ALIROOTMODULES += EVE
@@ -161,9 +165,7 @@ DEPINC     += $(GENINC)
 # ROOT libraries 
 
 ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer -lXMLIO -lProof -lProofPlayer -lMLP \
-		-lSpectrum
-
-ROOTPLIBS     := -lEGPythia6
+               -lSpectrum
 
 ALILIBS	      := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
                 -lITS -lPHOS -lACORDE -lHMPID -lVZERO -lZDC -lSTRUCT \
@@ -429,9 +431,6 @@ distclean: clean-all
 clean-aliroot:   $(patsubst %,%/module.mk,$(ALIROOTMODULES)) $(patsubst %,clean-%,$(ALIROOTMODULES))
 
 CHECKMODULES := $(MODULES)
-CHECKMODULES := $(filter-out HBTP,$(CHECKMODULES))
-CHECKMODULES := $(filter-out MEVSIM,$(CHECKMODULES))
-CHECKMODULES := $(filter-out EPEMGEN,$(CHECKMODULES))
 CHECKMODULES := $(filter-out TPHIC,$(CHECKMODULES))
 CHECKMODULES := $(filter-out LHAPDF,$(CHECKMODULES))
 CHECKMODULES := $(filter-out MICROCERN,$(CHECKMODULES))