Make coherent ROOTLIBS definition

diff --git a/build/Makefile.HP-UX b/build/Makefile.HP-UX
index 179d5531484f5e9e37ae6e78509e2d67a0b375cb..9274b8aee41cc439db7b6286e18e24c93bc52d37 100644 (file)
--- a/build/Makefile.HP-UX
+++ b/build/Makefile.HP-UX
@@ -5,19 +5,19 @@ PLATFORM:= hpux
 # The compilers
 CXX           = aCC
 F77          = f77
 # The compilers
 CXX           = aCC
 F77          = f77

-CC           = aCC
+CC           = cc

 
 # Global optimisation
 OPT           = -O
 
 CXXOPTS       = $(OPT) -Wc,-ansi_for_scope,on +Z -z +W70,495,740,749,823,829 -Dextname
 
 # Global optimisation
 OPT           = -O
 
 CXXOPTS       = $(OPT) -Wc,-ansi_for_scope,on +Z -z +W70,495,740,749,823,829 -Dextname

-COPT          = $(OPT)
+COPT          = $(OPT) +Z

 FOPT          = $(OPT) +ppu +Z
 
 
 
 CXXFLAGS      = $(CXXOPTS)
 FOPT          = $(OPT) +ppu +Z
 
 
 
 CXXFLAGS      = $(CXXOPTS)

-CFLAGS       = #-Wall -fPIC -pipe
+CFLAGS       = $(COPT)

 
 # rootcint flags
 CINTFLAGS     = #$(CXXFLAGS)
 
 # rootcint flags
 CINTFLAGS     = #$(CXXFLAGS)


@@ -44,7 +44,7 @@ GLIBS         = $(ROOTLIBS) -L/usr/lib/X11R6 -lX11
 SOEXT        = sl
 
 # additional ROOT libraries
 SOEXT        = sl
 
 # additional ROOT libraries

-ROOTLIBS  += -lEGPythia6 -lcrypt 
+ROOTLIBS  += -lcrypt 

 
 # rmkdepend flags for building dependencies of FORTRAN files
 DEPENDFFLAGS = $(FFLAGS)
 
 # rmkdepend flags for building dependencies of FORTRAN files
 DEPENDFFLAGS = $(FFLAGS)


@@ -53,10 +53,7 @@ DEPENDFFLAGS = $(FFLAGS)
 LIBS          = $(ROOTLIBS)
 GLIBS         = $(ROOTLIBS) -L/usr/lib/X11R6 -lX11 
 
 LIBS          = $(ROOTLIBS)
 GLIBS         = $(ROOTLIBS) -L/usr/lib/X11R6 -lX11 
 

-#System libraries
-#SYSLIBS = -ldl -lbsd
-
-#EXEFLAGS+= -lg2c
+# System libraries

 
 
 
 
 
 

diff --git a/build/Makefile.Linux b/build/Makefile.Linux
index 67a874f2af44027d04a37cd31a43cfb818e63ed7..fb3b47a177d819eb7cd488890c8385262b88a9a2 100644 (file)
--- a/build/Makefile.Linux
+++ b/build/Makefile.Linux
@@ -36,7 +36,7 @@ SHLIB         = -lg2c
 SOEXT        = so
 
 # additional ROOT libraries
 SOEXT        = so
 
 # additional ROOT libraries

-ROOTLIBS  += -lEGPythia6 -lcrypt 
+ROOTLIBS  += -lcrypt 

 
 # rmkdepend flags for building dependencies of FORTRAN files
 DEPENDFFLAGS = $(FFLAGS)
 
 # rmkdepend flags for building dependencies of FORTRAN files
 DEPENDFFLAGS = $(FFLAGS)

diff --git a/build/Makefile.OSF1 b/build/Makefile.OSF1
index 5f94cb64cc7cf4a02b641ffeee2c531508498b2a..5bbbc911d75043bc93833ae4466b274edfb7b48a 100644 (file)
--- a/build/Makefile.OSF1
+++ b/build/Makefile.OSF1
@@ -54,7 +54,7 @@ SYSLIBS = -lbsd
 AFLAGS = $(filter-out -rpath /usr/lib/cmplrs/cxx -msym -shared /usr/lib/cmplrs/cc/crt0.o,$(SOFLAGS))
 
 # Additional flags and libraries for building aliroot executable
 AFLAGS = $(filter-out -rpath /usr/lib/cmplrs/cxx -msym -shared /usr/lib/cmplrs/cc/crt0.o,$(SOFLAGS))
 
 # Additional flags and libraries for building aliroot executable

-EXEFLAGS += -lXm -lXt -lX11 -lPW -lUfor -lfor -lFutil -lots -lEGPythia6 
+EXEFLAGS += -lXm -lXt -lX11 -lPW -lUfor -lfor -lFutil -lots

 EXEFLAGS += -taso
 
 # Cure funny problem 
 EXEFLAGS += -taso
 
 # Cure funny problem 

diff --git a/build/Makefile.SunOS b/build/Makefile.SunOS
index 8a5b1fc53f6da7e441e7b18f4be7d6e2d0fc079c..fd084898eee047e62e857c56b260b3a5f0bd1a49 100644 (file)
--- a/build/Makefile.SunOS
+++ b/build/Makefile.SunOS
@@ -15,7 +15,7 @@ CXXOPTS       = $(OPT) +w -KPIC -features=rtti
 COPT         = $(OPT) -KPIC -erroff=%none -DCERNLIB_SUN -DCERNLIB_BLDLIB -DCERNLIB_CZ
 FOPT         = $(OPT) -KPIC
 CXXFLAGS      = $(CXXOPTS)
 COPT         = $(OPT) -KPIC -erroff=%none -DCERNLIB_SUN -DCERNLIB_BLDLIB -DCERNLIB_CZ
 FOPT         = $(OPT) -KPIC
 CXXFLAGS      = $(CXXOPTS)

-CFLAGS       = 
+CFLAGS       = $(OPT)

 
 # rootcint flags
 CINTFLAGS     = $(filter-out -O +w -KPIC -features=rtti,$(CXXFLAGS))
 
 # rootcint flags
 CINTFLAGS     = $(filter-out -O +w -KPIC -features=rtti,$(CXXFLAGS))


@@ -42,7 +42,7 @@ FFLAGS = $(FOPT) $(CLIBFOPT) $(CLIBDEFS)
 # rmkdepend flags for building dependencies of FORTRAN files
 DEPENDFFLAGS = $(FFLAGS) 
 
 # rmkdepend flags for building dependencies of FORTRAN files
 DEPENDFFLAGS = $(FFLAGS) 
 

-ROOTLIBS += -lm -ldl -lnsl -lsocket -lEG -lEGPythia6
+ROOTLIBS += -lm -ldl -lnsl -lsocket

 
 # Additional flags and libraries for building aliroot executable
 EXEFLAGS += -O -Qoption ld -t -L/usr/dt/lib -L/usr/openwin/lib -L/usr/ccs/lib -lXm -lXt -lX11 -lm -lgen -ldl -lsocket -lsunmath 
 
 # Additional flags and libraries for building aliroot executable
 EXEFLAGS += -O -Qoption ld -t -L/usr/dt/lib -L/usr/openwin/lib -L/usr/ccs/lib -lXm -lXt -lX11 -lm -lgen -ldl -lsocket -lsunmath 

diff --git a/build/Makefile.config b/build/Makefile.config
index 97c83e454215ca8797c01a523644b3a4e278fec1..6329ee18745011e690fd0b057244895002db2443 100644 (file)
--- a/build/Makefile.config
+++ b/build/Makefile.config
@@ -1,5 +1,5 @@
 # ROOT libraries 
 # ROOT libraries 

-ROOTLIBS      = $(shell $(ROOTSYS)/bin/root-config --glibs) -lMinuit -lHtml -lEG 
+ROOTLIBS      = $(shell $(ROOTSYS)/bin/root-config --glibs) -lMinuit -lHtml -lEG  -lEGPythia6

 ROOTLIBS     := $(filter-out -lNew,$(ROOTLIBS))
 ROOTLIBS  += -L/usr/X11R6/lib -lX11 
 
 ROOTLIBS     := $(filter-out -lNew,$(ROOTLIBS))
 ROOTLIBS  += -L/usr/X11R6/lib -lX11 
 


@@ -7,5 +7,5 @@ ROOTLIBS  += -L/usr/X11R6/lib -lX11
 EXEFLAGS = 
 
 ALILIBS              = -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
 EXEFLAGS = 
 
 ALILIBS              = -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \

-                -lITS -lPHOS -lCASTOR -lRICH -lVZERO -lZDC -lSTRUCT \
+                -lITS -lPHOS -lCRT -lRICH -lVZERO -lZDC -lSTRUCT \

                 -lTGeant3 -lSTART -lEVGEN -lSTEER -lCONTAINERS
                 -lTGeant3 -lSTART -lEVGEN -lSTEER -lCONTAINERS

diff --git a/build/Makefile.solaris b/build/Makefile.solaris
index 849d953d143313644dacf504a6ff70a7c86b77c6..daef9821427cf0a0819fb45793d45859317d16e5 100644 (file)
--- a/build/Makefile.solaris
+++ b/build/Makefile.solaris
@@ -42,7 +42,7 @@ FFLAGS = $(FOPT) $(CLIBFOPT) $(CLIBDEFS)
 # rmkdepend flags for building dependencies of FORTRAN files
 DEPENDFFLAGS = $(FFLAGS) 
 
 # rmkdepend flags for building dependencies of FORTRAN files
 DEPENDFFLAGS = $(FFLAGS) 
 

-ROOTLIBS += -lm -ldl -lnsl -lsocket -lEG -lEGPythia6
+ROOTLIBS += -lm -ldl -lnsl -lsocket

 
 # Additional flags and libraries for building aliroot executable
 EXEFLAGS += -O -Qoption ld -t -L/usr/dt/lib -L/usr/openwin/lib -L/usr/ccs/lib -lXm -lXt -lX11 -lm -lgen -ldl -lsocket -lsunmath 
 
 # Additional flags and libraries for building aliroot executable
 EXEFLAGS += -O -Qoption ld -t -L/usr/dt/lib -L/usr/openwin/lib -L/usr/ccs/lib -lXm -lXt -lX11 -lm -lgen -ldl -lsocket -lsunmath