Updated reconstruction

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index de0b75ec3253f38d4446e76b1f7e9cf79f457849..50d2aaba266eb3d3b3e17c069f49060ae7548275 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -133,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
@@ -154,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 
@@ -167,7 +165,7 @@ MODDIRS := $(MODULES)
 # Default include dirs for C++, Fortran, Cint, and dependencies
 # The module directory will be added by each module
 
-GENINC     := -Iinclude -isystem$(shell root-config --incdir)
+GENINC     := -I$(ALICE_ROOT)/include -isystem$(shell root-config --incdir)
 RCFLAGS    := $(shell root-config --auxcflags) 
 RLFLAGS    := $(shell root-config --ldflags)
 CXXFLAGS   += $(GENINC) $(RCFLAGS)
@@ -175,6 +173,9 @@ 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)