X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=50d2aaba266eb3d3b3e17c069f49060ae7548275;hb=7c1a1f1d73cf0d0ee2b3b9e2e4f56086e75fd9fa;hp=770c26d775a830ab6f688324214e40b5e548d5ba;hpb=9be1be4e6141f3ae48afacbe55bef9934b29a060;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index 770c26d775a..50d2aaba266 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,11 @@ SMELL_DETECTOR_DIR=$(IRST_INSTALLDIR)/smell-detector
 
 #-------------------------------------------------------------------------------
 # The compilers
-CXX           = $(shell root-config --cxx)
-F77	      = $(shell root-config --f77)
-CC	      = $(shell root-config --cc)
+CXX           := $(shell root-config --cxx)
+F77	      := $(shell root-config --f77)
+CC	      := $(shell root-config --cc)
+
+CXXWARN       =
 
 #-------------------------------------------------------------------------------
 # Include machine dependent macros
@@ -63,19 +65,24 @@ endif
 #-------------------------------------------------------------------------------
 # Check if DATE is installed
 
-ifneq ($(shell date-config 2>&1 | grep -i usage),)
-DATEFLAGS  = -DALI_DATE $(shell date-config --cflags | tr \" \')
-CXXFLAGS  += $(DATEFLAGS)
-CFLAGS    += $(DATEFLAGS)
-CINTFLAGS += $(DATEFLAGS)
-DEPINC    += $(DATEFLAGS)
-else
-DATEFLAGS  = -D`uname` -DDATE_SYS=`uname` -Dlong32='int' \
+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 \" \')
+DMONLIBS  := $(shell date-config --monitorlibs)
+endif
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
 DEPINC    += $(DATEFLAGS)
+
+#-------------------------------------------------------------------------------
+# Add warning flags if any
+
+ifneq ($(ALICXXWARN),no)
+CXXFLAGS  += $(CXXWARN)
 endif
 
 #-------------------------------------------------------------------------------
@@ -98,6 +105,8 @@ ROOTCLIBS     := $(shell $(ROOTCONFIG) --glibs) \
 			-lMLP 			\
 			-lSpectrum 		\
 			-L$(ROOTPLUGDIR)
+CHECKALIEN    := $(shell root-config --has-alien)
+CHECKXML      := $(shell root-config --has-xml)
 
 #-------------------------------------------------------------------------------
 # Location where to install libraries and binaries and common header files
@@ -119,15 +128,13 @@ ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       THijing THbtp EMCAL \
       THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
       JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet \
-      PWG0 PWG1 PWG2 PWG3 PWG4
+      PWG0 PWG1 PWG2 PWG3 PWG4 TRIGGER
 
 # 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
@@ -145,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 
@@ -158,13 +165,19 @@ 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)
-CXXFLAGS   += $(GENINC) $(shell root-config --cflags)
-CXXFLAGSNO += $(GENINC) $(shell root-config --cflags)
-CINTFLAGS  += $(GENINC) $(shell root-config --cflags)
-FFLAGS	   += $(shell root-config --cflags)
-LDFLAGS    += $(shell root-config --ldflags)
-SOFLAGS    += $(shell root-config --ldflags)
+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) -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)
 
 #-------------------------------------------------------------------------------
@@ -174,12 +187,12 @@ DEPINC     += $(GENINC)
 
 ALILIBS	      := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
                 -lITS -lPHOS -lACORDE -lHMPID -lVZERO -lZDC -lSTRUCT \
-                -lT0 -lEVGEN -lSTEER 
+                -lT0 -lEVGEN -lSTEER -lTRIGGER
 
 LIBS := $(ROOTCLIBS) $(ROOTPLIBS) $(SYSLIBS)
 
 ARVERSIONFILE := $(EXPORTDIR)/ARVersion.h
-SVNREV        := $(strip $(shell LANG=C svn info | grep "Last Changed Rev:" | \
+SVNREV        := $(strip $(shell LANG=C LANGUAGE=C svn info | grep "Last Changed Rev:" | \
 			         cut -d: -f2 ))
 SVNBRANCH     := $(subst //alisoft.cern.ch/AliRoot/,,$(shell svn info | grep "URL:" | cut -d: -f3 ))
 
@@ -286,7 +299,7 @@ ALIRECO.par: macros/loadlibsrec.C STEER/PROOF-INF.ALIRECO/SETUP.C
 	(tar cfzh $@ ALIRECO 2> /dev/null && echo "Package archive" $@ "created in" $(PWD)/$@) || (tar cfzh /tmp/$@ ALIRECO 2> /dev/null && echo "Package archive" $@ "created in /tmp/"$@)
 	$(MUTE)rm -rf ALIRECO
 
-ROOTALIBDIR=$(shell root-config --libdir)
+ROOTALIBDIR:=$(shell root-config --libdir)
 
 ALIMDCSPECFILE=$(RAWDIRO)/alimdc.spec
 ALIMDCVERSION=$(subst -,.,$(notdir $(subst /RAW/mdc.h,,$(shell svn info RAW/mdc.h | grep "URL:" | cut -d: -f3 ))))
@@ -372,7 +385,7 @@ alimdc-static: $(LIBPATH) $(BINPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB) $(
 	 $(LIBPATH)/libAliMDC.a \
 	 $(ROOTALIBDIR)/libRoot.a \
 	 $(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \
-	 -pthread -ldl
+	 -pthread -ldl -lcurses
 
 alilibs-static: $(LIBPATH) modules $(ALLALIBS)