Import All particles from Pythia and add CutOnChild

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index feb751d7a9b9e99c30f1549444289cf9ebb3797e..7faf000eca9894116b45200ce53ae4296f44cb0d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,8 @@ PACKAGE = Main
 
 ##### Module libraries #####
 
-ALIROOT_DIRS           = STEER TGeant3 TRD PHOS TPC ZDC MUON PMD FMD TOF ITS CASTOR \
-                 RICH STRUCT EVGEN
+ALIROOT_DIRS           = STEER TGeant3 TRD PHOS TPC ZDC MUON PMD FMD TOF ITS \
+                         CASTOR RICH STRUCT EVGEN RALICE
 
 ##### TARGETS #####
  
@@ -24,6 +24,9 @@ lib bin:
        @mkdir $@
 
 alilibs:  lib
+       @for i in $(ALIROOT_DIRS) ; do \
+          ${MAKE} -C $$i headers ; \
+       done
        @for i in $(ALIROOT_DIRS) ; do \
           ${MAKE} -C $$i depend ; \
        done
@@ -52,7 +55,7 @@ minicern:  lib
 
 cernlibs: geant321 pythia minicern pdf
 
-all:   default cernlibs
+all:   cernlibs default
 
 FORCE:
 
@@ -63,37 +66,36 @@ include $(ALICE_ROOT)/conf/GeneralMacros
 ############################### Specific Macros ###############################
 
 STRUCT_DIRS    = html conf macros data share include Euclid picts \
-                  Makefile README .rootrc
+                  doc etc Makefile .rootrc
 
 LIBRARY_DIRS   = MINICERN GEANT321 PYTHIA PDF
 
-dist: AliRoot3.01.tar.gz
+dist: AliRoot$(VERSION).tar.gz
 
-AliRoot3.01.tar.gz: $(STRUCT_DIRS) $(ALIROOT_DIRS) ALIROOT
+AliRoot$(VERSION).tar.gz: $(STRUCT_DIRS) $(ALIROOT_DIRS) ALIROOT
 
-distall: AliOffline3.01.tar.gz
+distall: AliOffline$(VERSION).tar.gz
 
-AliOffline3.01.tar.gz: $(STRUCT_DIRS) $(ALIROOT_DIRS) $(LIBRARY_DIRS) ALIROOT
+AliOffline$(VERSION).tar.gz: $(STRUCT_DIRS) $(ALIROOT_DIRS) $(LIBRARY_DIRS) ALIROOT
 
-distlib: AliLib3.10.tar.gz
+distlib: AliLibs$(VERSION).tar.gz
 
-AliLib3.01.tar.gz: $(LIBRARY_DIRS)
+AliLibs$(VERSION).tar.gz: $(LIBRARY_DIRS)
 
-AliRoot3.01.tar.gz AliLibs3.01.tar.gz AliOffline3.01.tar.gz:
+AliRoot$(VERSION).tar.gz AliLibs$(VERSION).tar.gz AliOffline$(VERSION).tar.gz:
                @rm -f $(ALICE)/$@ 
                @rm -f `find . -name '*~' -print` \
                        `find . -name '*.bak' -print` \
-                       `find . -name '.*~' -print` 
+                       `find . -name '.*~' -print` \
+                      `find . -name '*\#*' -print` 
                @rm -f /tmp/saves
                @ls -1d $^ | sed -e "s/^/$(ALICE_LEVEL)\//" > /tmp/saves
                @cd $(ALICE) ; \
                 gtar cvfz $@ --exclude '*.o' --exclude '*Cint.*' \
-                --exclude '*/roothtml/*' `cat /tmp/saves` ; \
-
-alidepend:
-               @for i in $(ALIROOT_DIRS) ; do \
-                    ${MAKE} -C $$i depend ; \
-                done
+                --exclude 'roothtml' --exclude 'CVS' \
+               --exclude Make-depend --exclude '*html/gif' \
+               --exclude "*tgt_*" \
+                `cat /tmp/saves` 
 
 htmldocnew:            FORCE
                @for i in $(ALIROOT_DIRS) ; do \
@@ -110,6 +112,7 @@ htmldocnew:         FORCE
 
 htmldoc:               FORCE
                @rm -rf html/roothtml
+               @rm -f  html/picts
                @rm -f /tmp/macros
                @cd html ;\
                aliroot -q -b "mkhtml.C(0,1)" ;\
@@ -122,13 +125,14 @@ htmldoc:          FORCE
                        aliroot -b -q "mkhtml.C(\"$$i\")" > /dev/null ;\
                 done ;\
                ./makeExampleList ;
-               @ln -s ../../picts html/roothtml/gif
-               @ln -s ../../../picts html/roothtml/src/gif
-               @ln -s ../../../picts html/roothtml/examples/gif
+               @ln -s ../picts html/picts
+               @ln -s ../../picts html/roothtml/picts
+               @ln -s ../../../picts html/roothtml/src/picts
+               @ln -s ../../../picts html/roothtml/examples/picts
 
 clean:  FORCE
                @rm -f *~ \#*
-               @for i in $(ALIROOT_DIRS) ; do \
+               @for i in $(ALIROOT_DIRS) ALIROOT ; do \
                     ${MAKE} -C $$i macroclean ; \
                 done