X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=52e7b2a99e4871af1ec61bbd6b35de96aea01591;hb=a9b12ce13421f84fee90edf82b2bdc17e42e69e8;hp=2ed02b36f8cb07704558cfafa4d4c7f4811bb257;hpb=3b85abd60bef18825388d20c637a8bced0346561;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index 2ed02b36f8c..52e7b2a99e4 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,13 @@ 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)
+
+CXXWARN       =
 
 #-------------------------------------------------------------------------------
 # Include machine dependent macros
@@ -58,22 +65,49 @@ 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}
-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
 
+#-------------------------------------------------------------------------------
+# 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)
+CHECKALIEN    := $(shell root-config --has-alien)
+CHECKXML      := $(shell root-config --has-xml)
+
 #-------------------------------------------------------------------------------
 # Location where to install libraries and binaries and common header files
 
@@ -90,12 +124,21 @@ $(warning MAKECMDGOALS=$(MAKECMDGOALS))
 endif
 
 ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
-      ACORDE HMPID T0 STRUCT EVGEN RALICE VZERO \
-      THijing MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
-      THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
-      JETAN HLT LHC ESDCheck
+      ACORDE HMPID T0 BCM STRUCT EVGEN RALICE VZERO \
+      THijing THbtp EMCAL \
+      THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
+      JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet \
+      PWG0 PWG1 PWG2 PWG3 PWG4 TRIGGER
+
+# Additional generators
+ALIROOTMODULES += TUHKMgen
+ALIROOTMODULES += EPOS
+
+ifneq ($(shell $(ROOTCONFIG) --has-pythia8), no)
+ALIROOTMODULES += PYTHIA8
+endif 
 
-ifneq ($(wildcard $(ROOTSYS)/include/TGLIncludes.h),)
+ifneq ($(shell $(ROOTCONFIG) --has-opengl), no)
 ALIROOTMODULES += EVE
 endif 
 
@@ -103,33 +146,16 @@ ifeq ($(findstring TFluka,$(MAKECMDGOALS)),TFluka)
 ALIROOTMODULES += TFluka
 endif
 
-ifeq ($(findstring PWG0,$(MAKECMDGOALS)),PWG0)
-ALIROOTMODULES += PWG0
-endif
-
-ifeq ($(findstring PWG2,$(MAKECMDGOALS)),PWG2)
-ALIROOTMODULES += PWG2
-endif
-
-ifeq ($(findstring PWG3,$(MAKECMDGOALS)),PWG3)
-ALIROOTMODULES += PWG3
-endif
-
-ifeq ($(findstring PWG4,$(MAKECMDGOALS)),PWG4)
-ALIROOTMODULES += PWG4
+ifeq ($(findstring THydjet,$(MAKECMDGOALS)),THydjet)
+ALIROOTMODULES += THydjet
 endif
 
 ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
 ALIROOTMODULES += SHUTTLE
 endif
 
-ifeq ($(findstring Flugg,$(MAKECMDGOALS)),Flugg)
-ALIROOTMODULES += Flugg
-endif
-
 CERNMODULES := LHAPDF HIJING MICROCERN HERWIG
-
-ifneq ($(wildcard $(ROOTSYS)/include/TPythia6.h),)
+ifneq ($(wildcard $(ROOTINCDIR)/TPythia6.h),)
 CERNMODULES += PYTHIA6
 endif 
 
@@ -141,10 +167,16 @@ 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)
-CXXFLAGSNO += $(GENINC)
-CINTFLAGS  += $(GENINC)
+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)
+LDFLAGS    += $(RLFLAGS)
+SOFLAGS    += $(RLFLAGS)
 DEPINC     += $(GENINC)
 
 #-------------------------------------------------------------------------------
@@ -152,24 +184,34 @@ DEPINC     += $(GENINC)
 # Libraries will be linked against SHLIB
 # ROOT libraries 
 
-ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer -lXMLIO
-
-ROOTPLIBS     := -lEGPythia6
-
 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 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 ))
+
 #-------------------------------------------------------------------------------
 # default target
 
-default:
+default: $(ARVERSIONFILE)
 	$(MUTE)$(MAKE) aliroot
 
-FORCE:
-
+#-------------------------------------------------------------------------------
+# Write header file with aliroot svn version and url
+
+$(ARVERSIONFILE): $(ALICE_ROOT)/.svn/entries $(EXPORTDIR)
+	$(MUTE)rm -f $(ARVERSIONFILE)
+	@echo "***** Making $(ARVERSIONFILE) *****"
+	@echo "#ifndef ALIROOT_ARVersion" >> $@
+	@echo "#define ALIROOT_ARVersion" >> $@
+	@echo "#define ALIROOT_SVN_REVISION $(SVNREV)" >> $@
+	@echo "#define ALIROOT_SVN_BRANCH \"$(SVNBRANCH)\"" >> $@
+	@echo "#endif" >> $@ 
 #-------------------------------------------------------------------------------
 # Each module will add to these macros
 
@@ -248,11 +290,103 @@ endif
 
 aliroot: alilibs $(BINPATH) $(ALLEXECS) 
 
-alimdc-static: $(LIBPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB)
+ALIRECO.par: macros/loadlibsrec.C STEER/PROOF-INF.ALIRECO/SETUP.C
+	$(MUTE)echo "***** Creating package archive" $@ "*****"
+	$(MUTE)rm -rf ALIRECO
+	$(MUTE)mkdir -p ALIRECO/PROOF-INF
+	$(MUTE)cat $^ > ALIRECO/PROOF-INF/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)
+
+ALIMDCSPECFILE=$(RAWDIRO)/alimdc.spec
+ALIMDCVERSION=$(subst -,.,$(notdir $(subst /RAW/mdc.h,,$(shell svn info RAW/mdc.h | grep "URL:" | cut -d: -f3 ))))
+ALIMDCRELEASE=$(firstword $(shell svn info RAW/mdc.h | grep "Revision:" | cut -d: -f2 ))
+
+alimdc-rpm: alimdc-static alimdc-specfile
+	$(MUTE)rm -rf alimdc-root
+	$(MUTE)mkdir -p alimdc-root/opt/alimdc/lib
+	$(MUTE)mkdir -p alimdc-root/opt/alimdc/include
+	$(MUTE)cp RAW/mdc.h alimdc-root/opt/alimdc/include
+	$(MUTE)cp $(LIBPATH)/libAliMDC.a \
+	$(ROOTALIBDIR)/libRoot.a \
+	$(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \
+	alimdc-root/opt/alimdc/lib
+	$(MUTE)rm -rf RPMS
+	$(MUTE)case `uname -m` in \
+	    i?86*)	ALIMDCARCHDIR=i386;;\
+	    ia64*)	ALIMDCARCHDIR=ia64;;\
+	    x86_64*)	ALIMDCARCHDIR=x86_64;;\
+	    *)		echo "Unknown architecture: `uname -m`"; exit 1;;\
+	esac; \
+	mkdir -p RPMS/$$ALIMDCARCHDIR; \
+	rpmbuild --verbose --define "_topdir $(ALICE_ROOT)" --define "_tmppath $(ALICE_ROOT)" -bb $(ALIMDCSPECFILE); \
+	cp -p RPMS/$$ALIMDCARCHDIR/alimdc-*.rpm .;
+	$(MUTE)rm -rf alimdc-root
+	$(MUTE)rm -rf RPMS
+	@echo "***** alimdc RPM created and put $(ALICE_ROOT) folder *****"
+
+alimdc-specfile: $(RAWDIRO)
+	$(MUTE)rm -rf $(ALIMDCSPECFILE)
+	@echo "***** Making alimdc RPM spec-file $(ALIMDCSPECFILE) *****"
+	@echo "# RPM specfile for alimdc static libs" >> $(ALIMDCSPECFILE)
+	@echo "# Package contains both ROOT and AliRoot" >> $(ALIMDCSPECFILE)
+	@echo "# static libs needed by mStreamRecorder" >> $(ALIMDCSPECFILE)
+	@echo "# in order to ROOT-ify the incoming raw" >> $(ALIMDCSPECFILE)
+	@echo "# data" >> $(ALIMDCSPECFILE)
+	@echo "# Example how-to build alimdc RPM:" >> $(ALIMDCSPECFILE)
+	@echo "# cd $ALICE_ROOT" >> $(ALIMDCSPECFILE)
+	@echo "# make alimdc-rpm" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "Summary: AliMDC static libraries" >> $(ALIMDCSPECFILE)
+	@echo "Name: alimdc" >> $(ALIMDCSPECFILE)
+	@echo "Version:  $(ALIMDCVERSION)" >> $(ALIMDCSPECFILE)
+	@echo "Release: $(ALIMDCRELEASE)" >> $(ALIMDCSPECFILE)
+	@echo "# Copyright: CERN Alice Off-line" >> $(ALIMDCSPECFILE)
+	@echo "License: CERN Alice Off-line" >> $(ALIMDCSPECFILE)
+	@echo "Vendor: ALICE Core Off-line Group" >> $(ALIMDCSPECFILE)
+	@echo "URL: http://aliceinfo.cern.ch" >> $(ALIMDCSPECFILE)
+	@echo "Group: Applications/Alice" >> $(ALIMDCSPECFILE)
+	@echo "Prefix: /opt/%{name}" >> $(ALIMDCSPECFILE)
+	@echo "BuildRoot: %{_tmppath}/%{name}-root" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# automatic dependencies" >> $(ALIMDCSPECFILE)
+	@echo "AutoReqProv: yes" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# list here required RPM packages for runtime" >> $(ALIMDCSPECFILE)
+	@echo "Requires: glibc" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "Provides: alimdc" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# description of the package" >> $(ALIMDCSPECFILE)
+	@echo "%description" >> $(ALIMDCSPECFILE)
+	@echo "Package contains both ROOT and AliRoot" >> $(ALIMDCSPECFILE)
+	@echo "static libs needed by mStreamRecorder" >> $(ALIMDCSPECFILE)
+	@echo "in order to ROOT-ify the incoming raw" >> $(ALIMDCSPECFILE)
+	@echo "data. The package version correspond to" >> $(ALIMDCSPECFILE)
+	@echo "the AliRoot one." >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# list of files to be installed" >> $(ALIMDCSPECFILE)
+	@echo "%files" >> $(ALIMDCSPECFILE)
+	@echo "%defattr (-,root,root)" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libAliMDC.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libRoot.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libpcre.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libfreetype.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/include/mdc.h" >> $(ALIMDCSPECFILE)
+
+alimdc-static: $(LIBPATH) $(BINPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB) $(STEERBaseALIB) $(alimdcCXXO)
 	 $(MUTE)rm -rf $(LIBPATH)/libAliMDC.a
 	 $(MUTE)rm -rf junk
-	 mkdir junk && cd junk && ar x ../$(RAWDatabaseALIB) && ar x ../$(MDCALIB) && ar x ../$(ESDALIB) && ar r ../$(LIBPATH)/libAliMDC.a *.o && cd .. && rm -rf junk
+	 mkdir junk && cd junk && ar x ../$(RAWDatabaseALIB) && ar x ../$(MDCALIB) && ar x ../$(ESDALIB) && ar x ../$(STEERBaseALIB) && ar r ../$(LIBPATH)/libAliMDC.a *.o && cd .. && rm -rf junk
+	 $(LD) $(LDFLAGS) -o $(BINPATH)/alimdca $(alimdcCXXO) \
+	 $(LIBPATH)/libAliMDC.a \
+	 $(ROOTALIBDIR)/libRoot.a \
+	 $(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \
+	 -pthread -ldl -lcurses
 
+alilibs-static: $(LIBPATH) modules $(ALLALIBS)
 
 include  build/MakefileDA
 
@@ -327,9 +461,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))
@@ -352,9 +483,10 @@ endif
 
 clean-modules:
 ifndef ALIQUIET
-	@echo "***** Cleaning up module.mk files *****"
+	@echo "***** Cleaning up module.mk and temporary compilation files *****"
 endif
 	$(MUTE)rm -rf $(patsubst %,%/module.mk,$(MODULES))
+	$(MUTE)rm -rf $(patsubst %,%/tgt_$(ALICE_TARGET),$(MODULES))
 
 clean-depend:
 ifndef ALIQUIET