X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=0cc3ea9fa45b4818dfebaf383aebd0e857833bd1;hb=b832ec023f7c28488920010cf11be92dbb79879e;hp=d3699001bd8c1cd0b88651e56627c84fb40360ca;hpb=118c0ae6d3dcd975582437f3d376d2110d435b0f;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index d3699001bd8..0cc3ea9fa45 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ export CLASSPATH IRST_INSTALLDIR IRST_CONFIG_DIR
 CODE_CHECK=java rules.ALICE.ALICERuleChecker
 REV_ENG=$(IRST_INSTALLDIR)/scripts/revEng.sh
 
-SMELL_DETECTOR_DIR=$(ALICE)/smell-detector
+SMELL_DETECTOR_DIR=$(IRST_INSTALLDIR)/smell-detector
 
 
 #-------------------------------------------------------------------------------
@@ -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)
@@ -90,23 +90,43 @@ $(warning MAKECMDGOALS=$(MAKECMDGOALS))
 endif
 
 ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
-      CRT RICH START STRUCT EVGEN RALICE ALIFAST VZERO \
+      ACORDE HMPID T0 BCM STRUCT EVGEN RALICE VZERO \
       THijing MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
-      THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR DISPLAY ANALYSIS \
-      JETAN HLT LHC EVE
+      THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
+      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
+
 ifeq ($(findstring PWG3,$(MAKECMDGOALS)),PWG3)
 ALIROOTMODULES += PWG3
 endif
 
+ifeq ($(findstring PWG4,$(MAKECMDGOALS)),PWG4)
+ALIROOTMODULES += PWG4
+endif
+
 ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
 ALIROOTMODULES += SHUTTLE
 endif
@@ -115,7 +135,11 @@ ifeq ($(findstring Flugg,$(MAKECMDGOALS)),Flugg)
 ALIROOTMODULES += Flugg
 endif
 
-CERNMODULES := PDF PYTHIA6 HIJING MICROCERN HERWIG
+CERNMODULES := LHAPDF HIJING MICROCERN HERWIG
+
+ifneq ($(wildcard $(ROOTSYS)/include/TPythia6.h),)
+CERNMODULES += PYTHIA6
+endif 
 
 MODULES := $(ALIROOTMODULES) $(CERNMODULES) ALIROOT
 
@@ -136,13 +160,14 @@ DEPINC     += $(GENINC)
 # Libraries will be linked against SHLIB
 # ROOT libraries 
 
-ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom
+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 -lCRT -lRICH -lVZERO -lZDC -lSTRUCT \
-                -lSTART -lEVGEN -lSTEER
+                -lITS -lPHOS -lACORDE -lHMPID -lVZERO -lZDC -lSTRUCT \
+                -lT0 -lEVGEN -lSTEER 
 
 LIBS := $(ROOTCLIBS) $(ROOTPLIBS) $(SYSLIBS)
 
@@ -232,6 +257,22 @@ endif
 
 aliroot: alilibs $(BINPATH) $(ALLEXECS) 
 
+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
+
 #-------------------------------------------------------------------------------
 # Single Makefile "distribution": Makefile + modules + mkdepend scripts
 makedistr: $(MODULES)
@@ -307,11 +348,13 @@ CHECKMODULES := $(filter-out HBTP,$(CHECKMODULES))
 CHECKMODULES := $(filter-out MEVSIM,$(CHECKMODULES))
 CHECKMODULES := $(filter-out EPEMGEN,$(CHECKMODULES))
 CHECKMODULES := $(filter-out TPHIC,$(CHECKMODULES))
-CHECKMODULES := $(filter-out PDF,$(CHECKMODULES))
+CHECKMODULES := $(filter-out LHAPDF,$(CHECKMODULES))
 CHECKMODULES := $(filter-out MICROCERN,$(CHECKMODULES))
 
 check-all:    $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,check-%,$(CHECKMODULES))
 
+smell-all:    $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,smell-%,$(CHECKMODULES))
+
 reveng-all:   $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,reveng-%,$(CHECKMODULES))
 
 revdisp-all:  $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,revdisp-%,$(CHECKMODULES))
@@ -356,6 +399,8 @@ endif
 
 clean-check-all:  $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,clean-check-%,$(CHECKMODULES))
 
+clean-smell-all:  $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,clean-smell-%,$(CHECKMODULES))
+
 clean-reveng-all: $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,clean-reveng-%,$(CHECKMODULES))
 
 htmldoc: