Possibility to have different binaries in the same tree introduced

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 86e1c51b05e163150eb263b66c0509624b2805a4..87f3800a918595ba888f152399edbfa6cdd80740 100644 (file)
--- 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
@@ -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: 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` \
@@ -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,9 +124,10 @@ 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 *~ \#*