X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=Makefile;h=7c83daa7654865a948f33a6171efc45f71a2ed43;hp=54283e132c50fb0737437efda26a889ff0bb0ca8;hb=f3c4a6df213285b4ffca491d5d431a1c8b425ee7;hpb=44c62722705f4ec11d9906b51429370aae73abfb

diff --git a/Makefile b/Makefile
index 54283e132c5..7c83daa7654 100644
--- 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,13 @@ 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 MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN
 
 ##### TARGETS #####
  
@@ -28,6 +29,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 +43,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 +67,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,9 +138,15 @@ htmldoc:		FORCE
 
 clean:  FORCE
 		@rm -f *~ \#*
-		@for i in $(ALIROOT_DIRS) ALIROOT ; do \
+		@rm -f include/*
+		@for i in $(ALIROOT_DIRS) ALIROOT; do \
                     ${MAKE} -C $$i macroclean ; \
                 done
+                ifdef G4INSTALL
+	 	  @for i in TGeant4 AliGeant4; do \
+                    ${MAKE} -C $$i macroclean ; \
+                  done
+                endif  
 
 libclean:  FORCE
 		@rm -f *~ \#*
@@ -140,13 +157,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
+