X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=2284e0e6781ebad0aa3cd61455afbaee8bdd97b4;hb=ff0753e15a827ed137cd4279359344396aa7b83a;hp=1f05acf87d5dc1d4c7f8ac0833af3c28fd8c9f9c;hpb=9ef1c2d9546ffd2a700ba9a633f517f51f5344ac;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index 1f05acf87d5..2284e0e6781 100644
--- 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
 
+# Additional generators
+ALIROOTMODULES += TUHKMgen
+ALIROOTMODULES += EPOS
+
 ifneq ($(shell $(ROOTCONFIG) --has-pythia8), no)
 ALIROOTMODULES += PYTHIA8
 endif 
@@ -137,14 +141,6 @@ ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
 ALIROOTMODULES += SHUTTLE
 endif
 
-ifeq ($(findstring TUHKMgen,$(MAKECMDGOALS)),TUHKMgen)
-ALIROOTMODULES += TUHKMgen
-endif
-
-ifeq ($(findstring EPOS,$(MAKECMDGOALS)),EPOS)
-ALIROOTMODULES += EPOS
-endif
-
 CERNMODULES := LHAPDF HIJING MICROCERN HERWIG
 ifneq ($(wildcard $(ROOTINCDIR)/TPythia6.h),)
 CERNMODULES += PYTHIA6
@@ -176,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
@@ -187,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" >> $@