Fix for multiple events per file: inhibit decrease of size of fParticleFileMap.

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 323d6e2fdbead25d2fa9d2848db688278c521832..7428a2421f99779fb2ab0384947b855a3f56d230 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,12 @@ PACKAGE = Main
 
 DOTS = " ................................................................................"
 
-PRETTY =  awk '{print $$0 substr($(DOTS),1,79-length($$0))}'
+PRETTY =  $(AWK) '{print $$0 substr($(DOTS),1,79-length($$0))}'
 
 ##### Module libraries #####
 
 ALIROOT_DIRS           = STEER TGeant3 TRD PHOS TPC ZDC MUON PMD FMD TOF ITS \
-                         CASTOR RICH START STRUCT EVGEN RALICE
+                         CASTOR RICH START STRUCT EVGEN RALICE ALIFAST THijing CONTAINERS 
 
 ##### TARGETS #####
  
@@ -28,6 +28,7 @@ lib bin:
        @mkdir $@
 
 alilibs:  lib
+       echo MAKEFLAGS = $(MAKEFLAGS)
        for i in $(ALIROOT_DIRS) ; do \
           echo "Making headers in $$i" | $(PRETTY); \
           ${MAKE} -C $$i headers ; \
@@ -41,14 +42,23 @@ alilibs:  lib
           ${MAKE} -C $$i ; \
        done
 
-aliroot geant321 minicern pdf pythia: bin
-       @DIR=`echo $@ | awk '{print toupper($$0)}'` ; \
+aliroot geant321 minicern pdf pythia6 hijing: FORCE
+       @DIR=`echo $@ | $(AWK) '{print toupper($$0)}'` ; \
        echo "Making dependencies in $$DIR" | $(PRETTY); \
        ${MAKE} -C $$DIR depend;\
        echo "Making in $$DIR" | $(PRETTY); \
        ${MAKE} -C $$DIR
 
-cernlibs: geant321 pythia minicern pdf
+TGeant4 AliGeant4: FORCE
+       @DIR=$@; \
+       echo "Making dependencies in $$DIR" | $(PRETTY); \
+       ${MAKE} -C $$DIR depend;\
+       echo "Making in $$DIR" | $(PRETTY); \
+       ${MAKE} -C $$DIR
+
+cernlibs: geant321 pythia6 minicern pdf hijing
+
+geant4: TGeant4 AliGeant4
 
 all:   cernlibs default
 
@@ -56,14 +66,14 @@ FORCE:
 
 ############################### General Macros ################################
 
-include $(ALICE_ROOT)/conf/GeneralMacros
+# include $(ALICE_ROOT)/conf/GeneralMacros
 
 ############################### Specific Macros ###############################
 
 STRUCT_DIRS    = html conf macros data share include Euclid picts \
                   doc etc Makefile .rootrc
 
-LIBRARY_DIRS   = MINICERN GEANT321 PYTHIA PDF
+LIBRARY_DIRS   = MINICERN GEANT321 PYTHIA6 PDF HIJING
 
 dist: AliRoot$(VERSION).tar.gz
 
@@ -127,6 +137,7 @@ htmldoc:            FORCE
 
 clean:  FORCE
                @rm -f *~ \#*
+               @rm -f include/*
                @for i in $(ALIROOT_DIRS) ALIROOT ; do \
                     ${MAKE} -C $$i macroclean ; \
                 done
@@ -140,13 +151,21 @@ libclean:  FORCE
 allclean: libclean clean
 
 # IRST coding rule check
-CHECK_DIRS = $(ALIROOT_DIRS) ALIROOT
+CHECK_DIRS = $(ALIROOT_DIRS) ALIROOT TGeant4 AliGeant4
 check:     
                @for i in $(CHECK_DIRS) ; do \
                     echo "Checking $$i" ; \
                     ${MAKE} -C $$i check ; \
                done
 
+REVENG_DIRS = $(ALIROOT_DIRS)
+
+reveng:
+       @for i in $(REVENG_DIRS) ; do \
+               echo "Reverse engineering $$i" ; \
+               ${MAKE} -C $$i reveng ; \
+       done
+