Trying to make real data reconstructable

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 4678064c99f14983b2879e246af7e510106fc07f..2284e0e6781ebad0aa3cd61455afbaee8bdd97b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -117,6 +117,10 @@ ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet \
       PWG0 PWG1 PWG2 PWG3 PWG4
 
       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 
 ifneq ($(shell $(ROOTCONFIG) --has-pythia8), no)
 ALIROOTMODULES += PYTHIA8
 endif 


@@ -137,10 +141,6 @@ ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
 ALIROOTMODULES += SHUTTLE
 endif
 
 ALIROOTMODULES += SHUTTLE
 endif
 

-ifeq ($(findstring Flugg,$(MAKECMDGOALS)),Flugg)
-ALIROOTMODULES += Flugg
-endif
-

 CERNMODULES := LHAPDF HIJING MICROCERN HERWIG
 ifneq ($(wildcard $(ROOTINCDIR)/TPythia6.h),)
 CERNMODULES += PYTHIA6
 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
 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 ))
                                 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
 
 #-------------------------------------------------------------------------------
 # default target


@@ -183,12 +182,10 @@ SVNBRANCH     := w$(subst //alisoft.cern.ch/AliRoot/,,\
 default: $(ARVERSIONFILE)
        $(MUTE)$(MAKE) aliroot
 
 default: $(ARVERSIONFILE)
        $(MUTE)$(MAKE) aliroot
 

-FORCE:
-

 #-------------------------------------------------------------------------------
 # Write header file with aliroot svn version and url
 
 #-------------------------------------------------------------------------------
 # 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" >> $@
        $(MUTE)rm -f $(ARVERSIONFILE)
        @echo "***** Making $(ARVERSIONFILE) *****"
        @echo "#ifndef ALIROOT_ARVersion" >> $@