X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=1840bd2c356790cbe7ac7e03bc20b1a81bfe3b70;hb=790bbabf2c30561c1025fdd75cdc4cf14b9f2b63;hp=46878dfbcbaa18aa612ccd000cc66c6e4e1842ca;hpb=e95543bdbd1e0e439f22d1dc142bfcbb9689b5a1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index 46878dfbcba..1840bd2c356 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 STRUCT EVGEN
+ALIROOT_DIRS		= STEER TGeant3 TRD PHOS TPC ZDC MUON PMD FMD TOF ITS \
+			  CASTOR RICH START STRUCT EVGEN RALICE ALIFAST THijing
 
 ##### TARGETS #####
  
@@ -24,31 +28,26 @@ lib bin:
 	@mkdir $@
 
 alilibs:  lib
+	echo MAKEFLAGS = $(MAKEFLAGS)
+	for i in $(ALIROOT_DIRS) ; do \
+	   echo "Making headers in $$i" | $(PRETTY); \
+	   ${MAKE} -C $$i headers ; \
+        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
-
-pythia:    lib
-	@-${MAKE} -C PYTHIA depend
-	@${MAKE} -C PYTHIA
-
-pdf:       lib
-	@-${MAKE} -C PDF depend
-	@${MAKE} -C PDF
-
-minicern:  lib
-	@-${MAKE} -C MINICERN depend
-	@${MAKE} -C MINICERN
+aliroot geant321 minicern pdf pythia: bin
+	@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
 
@@ -58,28 +57,28 @@ 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 \
-                  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: AliLibs3.01.tar.gz
+distlib: AliLibs$(VERSION).tar.gz
 
-AliLibs3.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` \
@@ -89,15 +88,11 @@ AliRoot3.01.tar.gz AliLibs3.01.tar.gz AliOffline3.01.tar.gz:
 		@ls -1d $^ | sed -e "s/^/$(ALICE_LEVEL)\//" > /tmp/saves
 	 	@cd $(ALICE) ; \
                 gtar cvfz $@ --exclude '*.o' --exclude '*Cint.*' \
-                --exclude '*/roothtml/*' --exclude '*/CVS' \
+                --exclude 'roothtml' --exclude 'CVS' \
 		--exclude Make-depend --exclude '*html/gif' \
+		--exclude "*tgt_*" --exclude check \
                 `cat /tmp/saves` 
 
-alidepend:
-		@for i in $(ALIROOT_DIRS) ; do \
-                    ${MAKE} -C $$i depend ; \
-                done
-
 htmldocnew:		FORCE
 		@for i in $(ALIROOT_DIRS) ; do \
 		    echo "Making HTML doc for $$i" ; \
@@ -144,3 +139,27 @@ libclean:  FORCE
                 done
 
 allclean: libclean clean
+
+# IRST coding rule check
+CHECK_DIRS = $(ALIROOT_DIRS) ALIROOT
+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
+
+
+
+
+
+
+
+