X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=3e65191d24e98c929ce62a0021bb2a81e3afd986;hb=610580f64f734e5201e6000f4bb3afe6512983c5;hp=fd3068eec2edd3e26b9230fe494c58f6f6e92ef8;hpb=99102ed0f8cd40f96e7edd8e6f24ec5db2615197;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index fd3068eec2e..3e65191d24e 100644
--- a/Makefile
+++ b/Makefile
@@ -91,9 +91,13 @@ 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 \
-      THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
-      JETAN HLT LHC ESDCheck STAT TTherminator CORRFW
+      THijing THbtp EMCAL HBTAN \
+      THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
+      JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet
+
+ifneq ($(wildcard $(ROOTSYS)/include/TPythia8.h),)
+ALIROOTMODULES += PYTHIA8
+endif 
 
 ifneq ($(wildcard $(ROOTSYS)/include/TGLIncludes.h),)
 ALIROOTMODULES += EVE
@@ -161,9 +165,7 @@ DEPINC     += $(GENINC)
 # ROOT libraries 
 
 ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer -lXMLIO -lProof -lProofPlayer -lMLP \
-		-lSpectrum
-
-ROOTPLIBS     := -lEGPythia6
+               -lSpectrum
 
 ALILIBS	      := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
                 -lITS -lPHOS -lACORDE -lHMPID -lVZERO -lZDC -lSTRUCT \
@@ -171,14 +173,29 @@ 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 ))
+
 #-------------------------------------------------------------------------------
 # default target
 
-default:
+default: $(ARVERSIONFILE)
 	$(MUTE)$(MAKE) aliroot
 
 FORCE:
 
+#-------------------------------------------------------------------------------
+# Write header file with aliroot svn version and url
+
+$(ARVERSIONFILE): FORCE $(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
 
@@ -259,7 +276,11 @@ aliroot: alilibs $(BINPATH) $(ALLEXECS)
 
 ROOTALIBDIR=$(shell root-config --libdir)
 
-alimdc-rpm: alimdc-static RAW/alimdc.spec
+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
@@ -270,12 +291,61 @@ alimdc-rpm: alimdc-static RAW/alimdc.spec
 	alimdc-root/opt/alimdc/lib
 	$(MUTE)rm -rf RPMS
 	$(MUTE)mkdir -p RPMS/i386
-	$(MUTE)rpmbuild --verbose --define "_topdir $(ALICE_ROOT)" --define "_tmppath $(ALICE_ROOT)" -bb RAW/alimdc.spec
+	$(MUTE)rpmbuild --verbose --define "_topdir $(ALICE_ROOT)" --define "_tmppath $(ALICE_ROOT)" -bb $(ALIMDCSPECFILE)
 	$(MUTE)cp -p RPMS/i386/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
@@ -361,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))
@@ -386,9 +453,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