increasing the default number of EMCal SuperModules (prep for 2011)

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 2cf5490c3859fe050dd8533616dab169be1d18e6..50d2aaba266eb3d3b3e17c069f49060ae7548275 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,22 +65,18 @@ endif
 #-------------------------------------------------------------------------------
 # Check if DATE is installed
 
-ifneq ($(shell which date-config | grep "^/"),)
+ifeq ($(shell which date-config 2>/dev/null),)
+DATEFLAGS := -D$(shell uname) -DDATE_SYS=$(shell uname) -Dlong32='int' \
+             -Dlong64='long long' -DdatePointer='long'
+DMONLIBS  :=
+else 
 DATEFLAGS := -DALI_DATE $(shell date-config --cflags | tr \" \')
-CXXFLAGS  += $(DATEFLAGS)
-CFLAGS    += $(DATEFLAGS)
-CINTFLAGS += $(DATEFLAGS)
-DEPINC    += $(DATEFLAGS)
 DMONLIBS  := $(shell date-config --monitorlibs)
-else
-DATEFLAGS := -D`uname` -DDATE_SYS=`uname` -Dlong32='int' \
-             -Dlong64='long long' -DdatePointer='long'
+endif
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
 DEPINC    += $(DATEFLAGS)
-DMONLIBS  :=
-endif
 
 #-------------------------------------------------------------------------------
 # Add warning flags if any
@@ -137,10 +133,8 @@ ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
 # Additional generators
 ALIROOTMODULES += TUHKMgen
 ALIROOTMODULES += EPOS
-
-ifneq ($(shell $(ROOTCONFIG) --has-pythia8), no)
 ALIROOTMODULES += PYTHIA8
-endif 
+ALIROOTMODULES += TAmpt
 
 ifneq ($(shell $(ROOTCONFIG) --has-opengl), no)
 ALIROOTMODULES += EVE
@@ -158,7 +152,7 @@ ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
 ALIROOTMODULES += SHUTTLE
 endif
 
-CERNMODULES := LHAPDF HIJING MICROCERN HERWIG
+CERNMODULES := LHAPDF HIJING MICROCERN HERWIG   
 ifneq ($(wildcard $(ROOTINCDIR)/TPythia6.h),)
 CERNMODULES += PYTHIA6
 endif 
@@ -171,14 +165,17 @@ MODDIRS := $(MODULES)
 # Default include dirs for C++, Fortran, Cint, and dependencies
 # The module directory will be added by each module
 
-GENINC     := -I$(ALICE_ROOT)/include -I$(shell root-config --incdir)
-RCFLAGS    := $(shell root-config --cflags)
+GENINC     := -I$(ALICE_ROOT)/include -isystem$(shell root-config --incdir)
+RCFLAGS    := $(shell root-config --auxcflags) 
 RLFLAGS    := $(shell root-config --ldflags)
 CXXFLAGS   += $(GENINC) $(RCFLAGS)
-CXXFLAGSNO += $(GENINC) $(RCFLAGS)
+CXXFLAGSNO += $(GENINC) $(RCFLAGS) -Wno-write-strings
 CFLAGS     += $(GENINC) $(RCFLAGS)
 CINTFLAGS  += $(GENINC) $(RCFLAGS)
 FFLAGS    += $(RCFLAGS)
+ifeq (macosxicc,$(ALICE_TARGET))
+FFLAGS     := $(patsubst -pthread, -reentrancy threaded, $(FFLAGS))
+endif
 LDFLAGS    += $(RLFLAGS)
 SOFLAGS    += $(RLFLAGS)
 DEPINC     += $(GENINC)