DP:Misalignment of CPV added

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index e8945590fd9b88b3fd19c67d4cec146027c7c686..2ed02b36f8cb07704558cfafa4d4c7f4811bb257 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ endif
 
 ifdef DATE_ROOT
 DATEFLAGS  = -DALI_DATE -D${DATE_SYS} -DDATE_SYS=${DATE_SYS} -Dlong32=${DATE_LONG32} \
-             -Dlong64='${DATE_LONG64}' -DdatePointer=${DATE_POINTER} -I${DATE_COMMON_DEFS}
+             -Dlong64='${DATE_LONG64}' -DdatePointer=${DATE_POINTER} -I${DATE_COMMON_DEFS} -I${DATE_MONITOR_DIR}
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
@@ -93,7 +93,11 @@ ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       ACORDE HMPID T0 STRUCT EVGEN RALICE VZERO \
       THijing MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
       THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
-      JETAN HLT LHC EVE
+      JETAN HLT LHC ESDCheck
+
+ifneq ($(wildcard $(ROOTSYS)/include/TGLIncludes.h),)
+ALIROOTMODULES += EVE
+endif 
 
 ifeq ($(findstring TFluka,$(MAKECMDGOALS)),TFluka)
 ALIROOTMODULES += TFluka
@@ -111,6 +115,10 @@ ifeq ($(findstring PWG3,$(MAKECMDGOALS)),PWG3)
 ALIROOTMODULES += PWG3
 endif
 
+ifeq ($(findstring PWG4,$(MAKECMDGOALS)),PWG4)
+ALIROOTMODULES += PWG4
+endif
+
 ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
 ALIROOTMODULES += SHUTTLE
 endif
@@ -119,7 +127,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
 
@@ -140,7 +152,7 @@ DEPINC     += $(GENINC)
 # Libraries will be linked against SHLIB
 # ROOT libraries 
 
-ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer
+ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer -lXMLIO
 
 ROOTPLIBS     := -lEGPythia6
 
@@ -241,6 +253,9 @@ alimdc-static: $(LIBPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB)
         $(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
 
+
+include  build/MakefileDA
+
 #-------------------------------------------------------------------------------
 # Single Makefile "distribution": Makefile + modules + mkdepend scripts
 makedistr: $(MODULES)