X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=7428a2421f99779fb2ab0384947b855a3f56d230;hb=151a251324167cb914925856110b632814e05526;hp=6a55d049d2696ae537df233d0877b6a82076980d;hpb=23c885180b11eadcd39988292fbe08e7d2fab875;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index 6a55d049d26..7428a2421f9 100644
--- 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 START CPV STRUCT EVGEN RALICE
+			  CASTOR RICH START STRUCT EVGEN RALICE ALIFAST THijing CONTAINERS 
 
 ##### 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 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
 
-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 pythia6 minicern pdf hijing
 
-minicern:  lib
-	@-${MAKE} -C MINICERN depend
-	@${MAKE} -C MINICERN
-
-cernlibs: geant321 pythia minicern pdf
+geant4: TGeant4 AliGeant4
 
 all:	cernlibs default
 
@@ -61,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
 
@@ -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
@@ -132,6 +137,7 @@ htmldoc:		FORCE
 
 clean:  FORCE
 		@rm -f *~ \#*
+		@rm -f include/*
 		@for i in $(ALIROOT_DIRS) ALIROOT ; do \
                     ${MAKE} -C $$i macroclean ; \
                 done
@@ -145,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
+