X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=d5bff0c27ac71a113112a47eae7dc11950d862ce;hb=c54404bf5f2c787e1f5cf109626a13966c2b0088;hp=fddfdd82e915ddc55ad60d2628762188c7e6a5f3;hpb=2830f9fbec48e1b78147d25e528d7b6a5dd43f75;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index fddfdd82e91..d5bff0c27ac 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,9 @@ endif
 
 # IRST coding rule check
 IRST_INSTALLDIR=$(ALICE)/local/IRST
+IRST_CONFIG_DIR=$(IRST_INSTALLDIR)/userConfig/ALICE
 CLASSPATH=$(IRST_INSTALLDIR)
-export CLASSPATH IRST_INSTALLDIR
+export CLASSPATH IRST_INSTALLDIR IRST_CONFIG_DIR
 CODE_CHECK=java rules.ALICE.ALICERuleChecker
 REV_ENG=$(IRST_INSTALLDIR)/scripts/revEng.sh
 
@@ -52,6 +53,33 @@ LDFLAGS := -g $(filter-out -O%,$(LDFLAGS))
 endif
 ##################################################################
 
+##################################################################
+# 
+#               Check if called with profile
+
+ifeq ($(ALIPROFILE),YES)
+override ALICE_TARGET:=$(ALICE_TARGET)PROF
+FFLAGS += -pg
+CXXFLAGS += -pg
+CFLAGS += -pg
+SOFLAGS += -pg
+LDFLAGS += -pg
+endif
+##################################################################
+
+##################################################################
+# 
+#               check if DATE is installed
+
+ifdef DATE_ROOT
+DATEFLAGS = -DALI_DATE -D${DATE_SYS} -DDATE_SYS=${DATE_SYS} -Dlong32=${DATE_LONG32} -Dlong64=${DATE_LONG64} -DdatePointer=${DATE_POINTER}
+CXXFLAGS += $(DATEFLAGS)
+CFLAGS += $(DATEFLAGS)
+CINTFLAGS += $(DATEFLAGS)
+DEPINC += $(DATEFLAGS)
+endif
+##################################################################
+
 ##################################################################
 #
 #                   Modules to build 
@@ -62,9 +90,10 @@ 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 \
-      THerwig TEPEMGEN EPEMGEN FASTSIM
+      THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR DISPLAY ANALYSIS \
+      JETAN HLT
 
-CERNMODULES:= PDF PYTHIA PYTHIA6 HIJING MICROCERN HERWIG
+CERNMODULES:= PDF PYTHIA6 HIJING MICROCERN HERWIG
 
 MODULES:=$(ALIROOTMODULES) $(CERNMODULES) 
 
@@ -168,7 +197,7 @@ ifneq ($(MAKECMDGOALS),depend )
 #           Don't include if cleaning of any sort
 ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
 #$(warning INCLUDEFILES=$(INCLUDEFILES))
-include $(INCLUDEFILES)
+-include $(INCLUDEFILES)
 endif
 endif
 #############################################################
@@ -187,14 +216,18 @@ include build/dummy.d
 
 # targets
 
-.PHONY:		alilibs aliroot makedistr clean htmldoc
+.PHONY:		alilibs aliroot makedistr clean htmldoc profile
 
 modules: $(patsubst %,%/module.mk,$(MODULES)) 	
 
 
 aliroot: $(BINPATH) $(ALLEXECS) alilibs bin
 
+ifeq ($(ALIPROFILE),YES)
+alilibs: $(LIBPATH) $(ALLLIBS) $(ALLALIBS) lib modules
+else
 alilibs: $(LIBPATH) $(ALLLIBS) lib modules
+endif
 
 # Single Makefile "distribution": Makefile + modules + mkdepend scripts
 makedistr: $(MODULES)	 
@@ -211,6 +244,11 @@ ifndef ALIQUIET
 	@echo "***** Entering DEBUG mode. *****"
 endif
 	@(export ALIDEBUG=YES && $(MAKE))
+profile:
+ifndef ALIQUIET
+	@echo "***** Entering PROFILE mode. *****"
+endif
+	@(export ALIPROFILE=YES && $(MAKE))
 lib: 
 	@mkdir lib
 	@mkdir lib/tgt_$(ALICE_TARGET)
@@ -262,10 +300,13 @@ endif
 
 clean-aliroot:   $(patsubst %,%/module.mk,$(ALIROOTMODULES)) $(patsubst %,clean-%,$(ALIROOTMODULES))
 
-CHECKMODULES := $(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 PDF,$(CHECKMODULES))
+CHECKMODULES := $(filter-out MICROCERN,$(CHECKMODULES))
 
 check-all:			$(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,check-%,$(CHECKMODULES))