X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=1452fe404b3b618879d6dd41244c431e8be0de0f;hb=23eb51602075ff2248b9d4a1f4976dbbbca3304f;hp=753f8d9103612e3a3a215cdd4f9161f1fab27508;hpb=ae67527625b43288ba81adefffabadaa30cba245;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index 753f8d91036..1452fe404b3 100644
--- a/Makefile
+++ b/Makefile
@@ -58,9 +58,8 @@ 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} -I${DATE_COMMON_DEFS} -I${DATE_MONITOR_DIR}
+ifneq ($(shell date-config 2>&1 | grep -i usage),)
+DATEFLAGS  = -DALI_DATE $(shell date-config --cflags | tr \" \')
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
@@ -74,6 +73,28 @@ CINTFLAGS += $(DATEFLAGS)
 DEPINC    += $(DATEFLAGS)
 endif
 
+
+#-------------------------------------------------------------------------------
+# ROOT Stuff
+ROOTCONFIG    := root-config
+ROOTLIBDIR    := $(shell $(ROOTCONFIG) --libdir)
+ROOTPLUGDIR   := $(ROOTLIBDIR)/$(dir $(shell $(ROOTCONFIG) --version))
+ROOTINCDIR    := $(shell $(ROOTCONFIG) --incdir)
+ROOTCLIBS     := $(shell $(ROOTCONFIG) --glibs) \
+			-lThread 		\
+			-lMinuit 		\
+			-lVMC 			\
+			-lEG 			\
+			-lGeom 			\
+			-lTreePlayer 		\
+			-lXMLIO 		\
+			-lXMLParser 		\
+			-lProof 		\
+			-lProofPlayer 		\
+			-lMLP 			\
+			-lSpectrum 		\
+			-L$(ROOTPLUGDIR)
+
 #-------------------------------------------------------------------------------
 # Location where to install libraries and binaries and common header files
 
@@ -91,15 +112,16 @@ endif
 
 ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       ACORDE HMPID T0 BCM STRUCT EVGEN RALICE VZERO \
-      THijing MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
+      THijing THbtp EMCAL HBTAN \
       THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
-      JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet
+      JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet \
+      PWG0 PWG1 PWG2 PWG3 PWG4
 
-ifneq ($(wildcard $(ROOTSYS)/include/TPythia8.h),)
+ifneq ($(shell $(ROOTCONFIG) --has-pythia8), no)
 ALIROOTMODULES += PYTHIA8
 endif 
 
-ifneq ($(wildcard $(ROOTSYS)/include/TGLIncludes.h),)
+ifneq ($(shell $(ROOTCONFIG) --has-opengl), no)
 ALIROOTMODULES += EVE
 endif 
 
@@ -111,26 +133,6 @@ ifeq ($(findstring THydjet,$(MAKECMDGOALS)),THydjet)
 ALIROOTMODULES += THydjet
 endif
 
-ifeq ($(findstring PWG0,$(MAKECMDGOALS)),PWG0)
-ALIROOTMODULES += PWG0
-endif
-
-ifeq ($(findstring PWG1,$(MAKECMDGOALS)),PWG1)
-ALIROOTMODULES += PWG1
-endif
-
-ifeq ($(findstring PWG2,$(MAKECMDGOALS)),PWG2)
-ALIROOTMODULES += PWG2
-endif
-
-ifeq ($(findstring PWG3,$(MAKECMDGOALS)),PWG3)
-ALIROOTMODULES += PWG3
-endif
-
-ifeq ($(findstring PWG4,$(MAKECMDGOALS)),PWG4)
-ALIROOTMODULES += PWG4
-endif
-
 ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
 ALIROOTMODULES += SHUTTLE
 endif
@@ -140,8 +142,7 @@ ALIROOTMODULES += Flugg
 endif
 
 CERNMODULES := LHAPDF HIJING MICROCERN HERWIG
-
-ifneq ($(wildcard $(ROOTSYS)/include/TPythia6.h),)
+ifneq ($(wildcard $(ROOTINCDIR)/TPythia6.h),)
 CERNMODULES += PYTHIA6
 endif 
 
@@ -164,9 +165,6 @@ DEPINC     += $(GENINC)
 # Libraries will be linked against SHLIB
 # ROOT libraries 
 
-ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer -lXMLIO -lProof -lProofPlayer -lMLP \
-               -lSpectrum
-
 ALILIBS	      := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
                 -lITS -lPHOS -lACORDE -lHMPID -lVZERO -lZDC -lSTRUCT \
                 -lT0 -lEVGEN -lSTEER 
@@ -174,8 +172,10 @@ ALILIBS	      := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
 LIBS := $(ROOTCLIBS) $(ROOTPLIBS) $(SYSLIBS)
 
 ARVERSIONFILE := $(EXPORTDIR)/ARVersion.h
-SVNREV := $(strip $(shell svn info | grep "Last Changed Rev:" | cut -d: -f2 ))
-SVNBRANCH := $(subst //alisoft.cern.ch/AliRoot/,,$(shell svn info | grep "URL:" | cut -d: -f3 ))
+SVNREV        := $(strip $(shell svn info | grep "Last Changed Rev:" | \
+			         cut -d: -f2 ))
+SVNBRANCH     := w$(subst //alisoft.cern.ch/AliRoot/,,\
+		    $(shell svn info | grep "URL:" | cut -d: -f3 ))
 
 #-------------------------------------------------------------------------------
 # default target
@@ -354,7 +354,7 @@ alimdc-static: $(LIBPATH) $(BINPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB) $(
 	 $(LIBPATH)/libAliMDC.a \
 	 $(ROOTALIBDIR)/libRoot.a \
 	 $(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \
-	 -ldl
+	 -pthread -ldl
 
 alilibs-static: $(LIBPATH) modules $(ALLALIBS)
 
@@ -431,9 +431,6 @@ distclean: clean-all
 clean-aliroot:   $(patsubst %,%/module.mk,$(ALIROOTMODULES)) $(patsubst %,clean-%,$(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 LHAPDF,$(CHECKMODULES))
 CHECKMODULES := $(filter-out MICROCERN,$(CHECKMODULES))