Minor fixes in the event tag to take into account the new way of storing the trigger...

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 111f487ce0ecbaab2b32240d18f4b5d813352c7b..590a18f32a91888d4b99ab7d9607fb55f0043f62 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,11 +23,6 @@ export CLASSPATH IRST_INSTALLDIR IRST_CONFIG_DIR
 CODE_CHECK=java rules.ALICE.ALICERuleChecker
 REV_ENG=$(IRST_INSTALLDIR)/scripts/revEng.sh
 
-#-------------------------------------------------------------------------------
-# Include library definition
-
-include build/Makefile.config
-
 #-------------------------------------------------------------------------------
 # Include machine dependent macros
 
@@ -86,7 +81,7 @@ endif
 
 ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       CRT RICH START STRUCT EVGEN RALICE ALIFAST VZERO \
-      THijing CONTAINERS MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
+      THijing MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
       THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR DISPLAY ANALYSIS \
       JETAN HLT LHC
 
@@ -117,8 +112,17 @@ DEPINC     += $(GENINC)
 #-------------------------------------------------------------------------------
 # Libraries to link binaries against
 # Libraries will be linked against SHLIB
+# ROOT libraries 
+
+ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom
 
-LIBS := $(GLIBS) $(ROOTLIBS) $(SYSLIBS)
+ROOTPLIBS     := -lEGPythia6
+
+ALILIBS              := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
+                -lITS -lPHOS -lCRT -lRICH -lVZERO -lZDC -lSTRUCT \
+                -lSTART -lEVGEN -lSTEER
+
+LIBS := $(ROOTCLIBS) $(ROOTPLIBS) $(SYSLIBS)
 
 #-------------------------------------------------------------------------------
 # default target
@@ -126,6 +130,8 @@ LIBS := $(GLIBS) $(ROOTLIBS) $(SYSLIBS)
 default:
        $(MUTE)$(MAKE) aliroot
 
+FORCE:
+
 #-------------------------------------------------------------------------------
 # Each module will add to these macros