corrected includes from g4std

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index e7a6bd459bc33b1b25d616c7b8adb09a64229fe6..b7387f413678951191a64cf024b6578f1e413147 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,20 @@
 include $(ALICE_ROOT)/conf/GeneralDef
 include $(ALICE_ROOT)/conf/MachineDef.$(ALICE_TARGET)
 
-MAKEFLAGS =
+MAKEFLAGS += -s
 
 ##### MACROS #####
 
 PACKAGE = Main
 
+DOTS = " ................................................................................"
+
+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 STRUCT EVGEN RALICE
+                         CASTOR RICH START STRUCT EVGEN RALICE ALIFAST THijing
 
 ##### TARGETS #####
  
@@ -24,36 +28,37 @@ lib bin:
        @mkdir $@
 
 alilibs:  lib
-       @for i in $(ALIROOT_DIRS) ; do \
+       echo MAKEFLAGS = $(MAKEFLAGS)
+       for i in $(ALIROOT_DIRS) ; do \
+          echo "Making headers in $$i" | $(PRETTY); \
           ${MAKE} -C $$i headers ; \
-       done
+        done
        @for i in $(ALIROOT_DIRS) ; do \
+          echo "Making dependencies in $$i" | $(PRETTY); \
           ${MAKE} -C $$i depend ; \
        done
        @for i in $(ALIROOT_DIRS) ; do \
+          echo "Making in $$i" | $(PRETTY); \
           ${MAKE} -C $$i ; \
        done
 
-aliroot: bin
-       @${MAKE} -C ALIROOT
-
-geant321:  lib
-       @-${MAKE} -C GEANT321 depend
-       @${MAKE} -C GEANT321
+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
 
-pythia:    lib
-       @-${MAKE} -C PYTHIA depend
-       @${MAKE} -C PYTHIA
+TGeant4 AliGeant4: FORCE
+       @DIR=$@; \
+       echo "Making dependencies in $$DIR" | $(PRETTY); \
+       ${MAKE} -C $$DIR depend;\
+       echo "Making in $$DIR" | $(PRETTY); \
+       ${MAKE} -C $$DIR
 
-pdf:       lib
-       @-${MAKE} -C PDF depend
-       @${MAKE} -C PDF
+cernlibs: geant321 pythia minicern pdf hijing
 
-minicern:  lib
-       @-${MAKE} -C MINICERN depend
-       @${MAKE} -C MINICERN
-
-cernlibs: geant321 pythia minicern pdf
+geant4: TGeant4 AliGeant4
 
 all:   cernlibs default
 
@@ -61,7 +66,7 @@ FORCE:
 
 ############################### General Macros ################################
 
-include $(ALICE_ROOT)/conf/GeneralMacros
+# include $(ALICE_ROOT)/conf/GeneralMacros
 
 ############################### Specific Macros ###############################
 
@@ -94,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
@@ -152,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
+