Revert unwanted changes concerning PID in HLT

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index bef26fbd606d7901f0d58a0e9f52c4a443a7d962..2284e0e6781ebad0aa3cd61455afbaee8bdd97b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -112,11 +112,15 @@ endif
 
 ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       ACORDE HMPID T0 BCM STRUCT EVGEN RALICE VZERO \
-      THijing THbtp EMCAL HBTAN \
+      THijing THbtp EMCAL \
       THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
       JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet \
       PWG0 PWG1 PWG2 PWG3 PWG4
 
+# Additional generators
+ALIROOTMODULES += TUHKMgen
+ALIROOTMODULES += EPOS
+
 ifneq ($(shell $(ROOTCONFIG) --has-pythia8), no)
 ALIROOTMODULES += PYTHIA8
 endif 
@@ -137,10 +141,6 @@ ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
 ALIROOTMODULES += SHUTTLE
 endif
 
-ifeq ($(findstring Flugg,$(MAKECMDGOALS)),Flugg)
-ALIROOTMODULES += Flugg
-endif
-
 CERNMODULES := LHAPDF HIJING MICROCERN HERWIG
 ifneq ($(wildcard $(ROOTINCDIR)/TPythia6.h),)
 CERNMODULES += PYTHIA6
@@ -172,10 +172,9 @@ 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:" | \
+SVNREV        := $(strip $(shell LANG=C svn info | grep "Last Changed Rev:" | \
                                 cut -d: -f2 ))
-SVNBRANCH     := w$(subst //alisoft.cern.ch/AliRoot/,,\
-                   $(shell svn info | grep "URL:" | cut -d: -f3 ))
+SVNBRANCH     := $(subst //alisoft.cern.ch/AliRoot/,,$(shell svn info | grep "URL:" | cut -d: -f3 ))
 
 #-------------------------------------------------------------------------------
 # default target
@@ -183,12 +182,10 @@ SVNBRANCH     := w$(subst //alisoft.cern.ch/AliRoot/,,\
 default: $(ARVERSIONFILE)
        $(MUTE)$(MAKE) aliroot
 
-FORCE:
-
 #-------------------------------------------------------------------------------
 # Write header file with aliroot svn version and url
 
-$(ARVERSIONFILE): FORCE $(EXPORTDIR)
+$(ARVERSIONFILE): $(ALICE_ROOT)/.svn/entries $(EXPORTDIR)
        $(MUTE)rm -f $(ARVERSIONFILE)
        @echo "***** Making $(ARVERSIONFILE) *****"
        @echo "#ifndef ALIROOT_ARVersion" >> $@
@@ -298,9 +295,15 @@ alimdc-rpm: alimdc-static alimdc-specfile
        $(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \
        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 $(ALIMDCSPECFILE)
-       $(MUTE)cp -p RPMS/i386/alimdc-*.rpm .
+       $(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 *****"