X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=91ee0e26efda85e0645d4f60ddd4effb628b991f;hb=220b63a955919c9523ea5711f4e4c2193eade434;hp=7d5eb87adea07f7b0753f1691be449b17b261c32;hpb=bef53f4a98eebada00ec107ce730a691e0c912b1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index 7d5eb87adea..91ee0e26efd 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,11 @@ REV_ENG=$(IRST_INSTALLDIR)/scripts/revEng.sh
 
 SMELL_DETECTOR_DIR=$(IRST_INSTALLDIR)/smell-detector
 
+#-------------------------------------------------------------------------------
+# The compilers
+CXX           := $(shell root-config --cxx)
+F77	      := $(shell root-config --f77)
+CC	      := $(shell root-config --cc)
 
 #-------------------------------------------------------------------------------
 # Include machine dependent macros
@@ -59,24 +64,20 @@ endif
 # Check if DATE is installed
 
 ifneq ($(shell date-config 2>&1 | grep -i usage),)
-DATEFLAGS  = -DALI_DATE $(shell date-config --cflags | tr \" \')
+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' \
+DATEFLAGS := -D`uname` -DDATE_SYS=`uname` -Dlong32='int' \
              -Dlong64='long long' -DdatePointer='long'
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
 DEPINC    += $(DATEFLAGS)
-endif
-
-#-------------------------------------------------------------------------------
-# Check if DIM is installed
-ifdef DIMDIR
-CXXFLAGS  += -DALI_DIM
+DMONLIBS  :=
 endif
 
 #-------------------------------------------------------------------------------
@@ -99,6 +100,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
@@ -120,7 +123,7 @@ 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
@@ -160,9 +163,15 @@ MODDIRS := $(MODULES)
 # The module directory will be added by each module
 
 GENINC     := -I$(ALICE_ROOT)/include -I$(shell root-config --incdir)
-CXXFLAGS   += $(GENINC)
-CXXFLAGSNO += $(GENINC)
-CINTFLAGS  += $(GENINC)
+RCFLAGS    := $(shell root-config --cflags)
+RLFLAGS    := $(shell root-config --ldflags)
+CXXFLAGS   += $(GENINC) $(RCFLAGS)
+CXXFLAGSNO += $(GENINC) $(RCFLAGS)
+CFLAGS     += $(GENINC) $(RCFLAGS)
+CINTFLAGS  += $(GENINC) $(RCFLAGS)
+FFLAGS	   += $(RCFLAGS)
+LDFLAGS    += $(RLFLAGS)
+SOFLAGS    += $(RLFLAGS)
 DEPINC     += $(GENINC)
 
 #-------------------------------------------------------------------------------
@@ -172,7 +181,7 @@ 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)
 
@@ -284,7 +293,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 ))))