X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=Makefile;h=87f3800a918595ba888f152399edbfa6cdd80740;hp=877e6695f2b830ac98eae10f6c4c1cb8dea5c4b5;hb=3084ef941007ec3ba4eaf3306ba21b8e27374158;hpb=ce7c8058fd204495de875c6224a9a3107db029f0

diff --git a/Makefile b/Makefile
index 877e6695f2b..87f3800a918 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,9 @@ lib bin:
 	@mkdir $@
 
 alilibs:  lib
+	@for i in $(ALIROOT_DIRS) ; do \
+	   ${MAKE} -C $$i headers ; \
+	done
 	@for i in $(ALIROOT_DIRS) ; do \
 	   ${MAKE} -C $$i depend ; \
 	done
@@ -52,7 +55,7 @@ minicern:  lib
 
 cernlibs: geant321 pythia minicern pdf
 
-all:	default cernlibs
+all:	cernlibs default
 
 FORCE:
 
@@ -67,19 +70,19 @@ STRUCT_DIRS	= html conf macros data share include Euclid picts \
 
 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: AliLib3.10.tar.gz
+distlib: AliLibs$(VERSION).tar.gz
 
-AliLib3.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` \
@@ -93,11 +96,6 @@ AliRoot3.01.tar.gz AliLibs3.01.tar.gz AliOffline3.01.tar.gz:
 		--exclude Make-depend --exclude '*html/gif' \
                 `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" ; \
@@ -113,6 +111,7 @@ htmldocnew:		FORCE
 
 htmldoc:		FORCE
 		@rm -rf html/roothtml
+		@rm -f  html/picts
 		@rm -f /tmp/macros
 		@cd html ;\
 		aliroot -q -b "mkhtml.C(0,1)" ;\
@@ -125,13 +124,14 @@ htmldoc:		FORCE
 			aliroot -b -q "mkhtml.C(\"$$i\")" > /dev/null ;\
                 done ;\
 		./makeExampleList ;
-		@ln -s ../../picts html/roothtml/gif
-		@ln -s ../../../picts html/roothtml/src/gif
-		@ln -s ../../../picts html/roothtml/examples/gif
+		@ln -s ../picts html/picts
+		@ln -s ../../picts html/roothtml/picts
+		@ln -s ../../../picts html/roothtml/src/picts
+		@ln -s ../../../picts html/roothtml/examples/picts
 
 clean:  FORCE
 		@rm -f *~ \#*
-		@for i in $(ALIROOT_DIRS) ; do \
+		@for i in $(ALIROOT_DIRS) ALIROOT ; do \
                     ${MAKE} -C $$i macroclean ; \
                 done