New makefiles for OSF and Solaris, compatibility changes in the others

diff --git a/Makefile b/Makefile
index 323d6e2fdbead25d2fa9d2848db688278c521832..7b9c0c99a94a7b2b4c9b995204aaa3c10aa14113 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ 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 #####
 
@@ -28,6 +28,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 ; \
@@ -42,7 +43,7 @@ alilibs:  lib
        done
 
 aliroot geant321 minicern pdf pythia: bin
-       @DIR=`echo $@ | awk '{print toupper($$0)}'` ; \
+       @DIR=`echo $@ | $(AWK) '{print toupper($$0)}'` ; \
        echo "Making dependencies in $$DIR" | $(PRETTY); \
        ${MAKE} -C $$DIR depend;\
        echo "Making in $$DIR" | $(PRETTY); \

diff --git a/conf/GeneralDef b/conf/GeneralDef
index caaf08faa2f1249c52bb391d64fce25f36cc660e..ad8d65834f51ef4507115da4fd22c28dcadaa960 100644 (file)
--- a/conf/GeneralDef
+++ b/conf/GeneralDef
@@ -49,7 +49,7 @@ BINDIR = $(ALICE_ROOT)/bin/tgt_$(ALICE_TARGET)
 
 # Current Version
 
-VERSION                = 3.02
+VERSION                = 3.03pre
  
 # Which makedepend
 MAKEDEPEND    = $(ROOTSYS)/bin/rmkdepend

diff --git a/conf/MachineDef.HP-UX b/conf/MachineDef.HP-UX
index 02912480a169cabeccb4f5159e0bd905208fc2ae..8d3fd14cee11d10f34a01dfc966fa1d22aea5247 100644 (file)
--- a/conf/MachineDef.HP-UX
+++ b/conf/MachineDef.HP-UX
@@ -13,8 +13,11 @@ OPT        = -O
 # Shared library suffix
 SL           = sl
 
+# AWK
+AWK          = /usr/xpg4/bin/awk
+
 # The options
-CXXOPTS       = $(OPT) +a1 +z  
+CXXOPTS       = $(OPT) +a1 +z
 COPT          = $(OPT)
 FOPT          = $(OPT) +ppu +Z
 

diff --git a/conf/MachineDef.HP-UX.aCC b/conf/MachineDef.HP-UX.aCC
index e171b593cce405fc96d3fdacf439113d7ad99180..e61a893040a75b82ca8cbb80d53fac65a3e656a4 100644 (file)
--- a/conf/MachineDef.HP-UX.aCC
+++ b/conf/MachineDef.HP-UX.aCC
@@ -13,6 +13,9 @@ OPT         = -O
 # Shared library suffix
 SL           = sl
 
+# AWK
+AWK          = awk
+
 # The options
 CXXOPTS       = $(OPT) +Z -z +W70,495,740,749,823,829
 COPT          = $(OPT)

diff --git a/conf/MachineDef.HP-UX.egcs b/conf/MachineDef.HP-UX.egcs
index 124f453534a2028d0a4446f3cb03c708167b165a..6b5ba565b86e2e93a64a2659914df4183334affb 100644 (file)
--- a/conf/MachineDef.HP-UX.egcs
+++ b/conf/MachineDef.HP-UX.egcs
@@ -14,6 +14,9 @@ OPT           = -O
 # Shared library suffix
 SL           = sl
 
+# AWK
+AWK          = awk
+
 # The options
 CXXOPTS       = $(OPT) -Wall -fPIC
 

diff --git a/conf/MachineDef.Linux b/conf/MachineDef.Linux
index e465296f46574cf18ed1ae5d6dd1a0d1b9b336d3..d8b1d53f56ac4e1aae2b13269a13a610884e6e0f 100644 (file)
--- a/conf/MachineDef.Linux
+++ b/conf/MachineDef.Linux
@@ -14,6 +14,9 @@ OPT           = -O2
 # Shared library suffix
 SL           = so
 
+# AWK
+AWK          = awk
+
 # The options
 #
 # starting from root.2.22 on Linux the flags -fno-rtti -fno-exceptions are

diff --git a/conf/MachineDef.OSF1 b/conf/MachineDef.OSF1
index 84f1317384df4ea01fa26974e76dc7acb9c07365..6c5207db1988979b641b4cd71bc5f0e0ef73665a 100644 (file)
--- a/conf/MachineDef.OSF1
+++ b/conf/MachineDef.OSF1
@@ -8,22 +8,25 @@ CXX           = cxx
 F77          = f77
 
 # Global optimisation
-OPT          = -O
+OPT          = -O2
 
 # Shared library suffix
 SL           = so
 
+# AWK
+AWK          = awk
+
 # The options
-CXXOPTS       = $(OPT) -I/usr/include
+CXXOPTS       = $(OPT) -nostdnew -nortti -I/usr/include
 COPT          = $(OPT)
-FOPT          = $(OPT) -nofor_main
+FOPT          = $(OPT) -nofor_main -warn noinformational
 
 # CERNLIB defines
 
 CLIBDEFS      = -DCERNLIB_DECS -DCERNLIB_BLDLIB -DCERNLIB_CZ
 CLIBCXXOPTS   =
 CLIBCOPT      = 
-CLIBFOPT      = -I.
+CLIBFOPT      = -I. -warn noinformational
 
 # Additional directories for dependencies
 
@@ -32,12 +35,11 @@ DEPINC            = -I/usr/include/cxx
 LD            = cxx
 LDFLAGS       =
 
-SHLD          = ld
-SOFLAGS       = -L/usr/lib/cmplrs/cxx -rpath /usr/lib/cmplrs/cxx -expect_unresolved \
-       -g0 -O1 -msym -shared /usr/lib/cmplrs/cc/crt0.o /usr/lib/cmplrs/cxx/_main.o
-SHLIB        = -lcxxstd -lcxx -lexc -lots -lc -lUfor -lfor -lFutil -lm
+SHLD          = cxx
+SOFLAGS       = -shared -Wl,-expect_unresolved,*,-soname,$(notdir $@)
+SHLIB        = -lUfor -lfor -lFutil
 
-LIBS          = $(ROOTLIBS) -lNew -lm
-GLIBS         = $(ROOTLIBS) $(ROOTGLIBS)  -lXm -lXt -lX11 -lm -lPW -lUfor -lfor -lFutil -lm -lots
+LIBS          = $(ROOTLIBS)
+GLIBS         = $(ROOTLIBS) -lXm -lXt -lX11 -lm -lPW -lUfor -lfor -lFutil -lots
 
 CLIBS         = $(LIBDIR)/libminicern.a

diff --git a/conf/MachineDef.SunOS b/conf/MachineDef.SunOS
index 4354c1b119b10ab504cf9c7025c0289e8ecc755b..95c2e748dc8cdd5ba9236b3ad555268661dec8b5 100644 (file)
--- a/conf/MachineDef.SunOS
+++ b/conf/MachineDef.SunOS
@@ -14,6 +14,9 @@ OPT           = -O
 # Shared library suffix
 SL           = so
 
+# AWK
+AWK          = /usr/xpg4/bin/awk
+
 # The options
 CXXOPTS       = $(OPT) +w -KPIC
 COPT         = $(OPT) -KPIC -erroff=%none
@@ -28,7 +31,7 @@ CLIBFOPT      =
 
 # Additional directories for dependencies
 
-DEPINC        = -I/opt/SUNWspro/SC4.0/include/CC -I/opt/SUNWspro/SC4.0/include/cc
+DEPINC        = -I/opt/SUNWspro/SC4.2/include/CC -I/opt/SUNWspro/SC4.2/include/cc
                
 LD            = /opt/SUNWspro/bin/CC
 LDFLAGS       = $(OPT) -Qoption ld -t