Adding TGeant4

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index f4c415d4a7beae0cf3fa3479b851bc93b385ef8b..b7387f413678951191a64cf024b6578f1e413147 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 include $(ALICE_ROOT)/conf/GeneralDef
 include $(ALICE_ROOT)/conf/MachineDef.$(ALICE_TARGET)
 
-MAKEFLAGS = -s
+MAKEFLAGS += -s
 
 ##### MACROS #####
 
@@ -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 CPV STRUCT EVGEN RALICE
+                         CASTOR RICH START STRUCT EVGEN RALICE ALIFAST THijing
 
 ##### 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 pythia 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 pythia minicern pdf hijing
+
+geant4: TGeant4 AliGeant4
 
 all:   cernlibs default
 
@@ -56,7 +66,7 @@ FORCE:
 
 ############################### General Macros ################################
 
-include $(ALICE_ROOT)/conf/GeneralMacros
+# include $(ALICE_ROOT)/conf/GeneralMacros
 
 ############################### Specific Macros ###############################
 
@@ -89,7 +99,7 @@ AliRoot$(VERSION).tar.gz AliLibs$(VERSION).tar.gz AliOffline$(VERSION).tar.gz:
                 gtar cvfz $@ --exclude '*.o' --exclude '*Cint.*' \
                 --exclude 'roothtml' --exclude 'CVS' \
                --exclude Make-depend --exclude '*html/gif' \
-               --exclude "*tgt_*" \
+               --exclude "*tgt_*" --exclude check \
                 `cat /tmp/saves` 
 
 htmldocnew:            FORCE
@@ -147,6 +157,14 @@ check:
                     ${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
+