Removing warnings (icc), adding more detailed description

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 9c3993c157dc42d492a06ef4612b1872cc9b2b4f..a634086f37ac7e6e0f33092c3aa8d594c48a3402 100644 (file)
--- 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,50 @@ 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 HLT code is there
+
+ifeq ($(ALIHLT_USEPACKAGE),ALIROOT)
+HLTFLAGS = -DALI_HLT -Duse_aliroot -Duse_root
+ifeq ($(ALIHLT_DOMC),true)
+HLTFLAGS += -Ddo_mc
+endif
+HLTFLAGS += -I$(ALIHLT_TOPDIR)/src -I$(ALIHLT_TOPDIR)/hough -I$(ALIHLT_TOPDIR)/misc -I$(ALIHLT_TOPDIR)/comp
+CXXFLAGS += $(HLTFLAGS)
+CFLAGS += $(HLTFLAGS)
+CINTFLAGS += $(HLTFLAGS)
+DEPINC += $(HLTFLAGS)
+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 +107,9 @@ 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
 
-CERNMODULES:= PDF PYTHIA PYTHIA6 HIJING MICROCERN HERWIG
+CERNMODULES:= PDF PYTHIA6 HIJING MICROCERN HERWIG
 
 MODULES:=$(ALIROOTMODULES) $(CERNMODULES) 
 
@@ -72,6 +117,9 @@ ifeq ($(findstring TFluka,$(MAKECMDGOALS)),TFluka)
 MODULES += TFluka
 endif
 
+ifeq ($(findstring Flugg,$(MAKECMDGOALS)),Flugg)
+MODULES += Flugg
+endif
 
 ##################################################################
 
@@ -164,7 +212,8 @@ ifneq ($(findstring modules,$(MAKECMDGOALS)),modules)
 ifneq ($(MAKECMDGOALS),depend )
 #           Don't include if cleaning of any sort
 ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
-include $(INCLUDEFILES)
+#$(warning INCLUDEFILES=$(INCLUDEFILES))
+-include $(INCLUDEFILES)
 endif
 endif
 #############################################################
@@ -183,14 +232,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)   
@@ -207,6 +260,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)
@@ -258,7 +316,13 @@ endif
 
 clean-aliroot:   $(patsubst %,%/module.mk,$(ALIROOTMODULES)) $(patsubst %,clean-%,$(ALIROOTMODULES))
 
-CHECKMODULES := $(filter-out HBTP,$(filter-out MEVSIM,$(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))