Some rationalisation of the definition of CLIBS and G3LIBS

diff --git a/conf/GeneralDef b/conf/GeneralDef
index 97a3d4ff4ad4920ee90e144ef7fd653ae3cf6f77..72beeff74800ebddafc5b881f4073a478c54592d 100644 (file)
--- a/conf/GeneralDef
+++ b/conf/GeneralDef
@@ -73,10 +73,6 @@ ROOTGLIBS     = -lGpad -lGui -lGX11 -lX3d  -lXpm
  
 # CERN Libraries 
 
-ifeq ($(PLATFORM),alpha)
-CLIBS         = $(LIBDIR)/libminicern.a
-else
 CLIBS         = -lminicern
-endif
 
 G3LIBS        = -lgeant321

diff --git a/conf/MachineDef.HP-UX b/conf/MachineDef.HP-UX
index fe1d4bceabc5d7316e82760b774827189a436eb0..3dfb8ab7e46fca8513914f9f816214b7846860ca 100644 (file)
--- a/conf/MachineDef.HP-UX
+++ b/conf/MachineDef.HP-UX
@@ -35,9 +35,6 @@ LDFLAGS       = $(OPT) +a1 -z
 SHLD         = $(LD)
 SOFLAGS       = -b /usr/lib/libm.sl 
 
-G3LIBS        = -lgeant321
-CLIBS         = -lminicern
-
 LIBS          = $(ROOTLIBS) -lNew -lm
 GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/lib/X11R6 -L/usr/local/lib \
                 -lX11 -lm -ldld 

diff --git a/conf/MachineDef.HP-UX.aCC b/conf/MachineDef.HP-UX.aCC
index 24acfef37522faccb080e80d02fc53da9134b436..fd49d0c196bb39394f7c025ace0ec3ab75cb5f5e 100644 (file)
--- a/conf/MachineDef.HP-UX.aCC
+++ b/conf/MachineDef.HP-UX.aCC
@@ -35,9 +35,6 @@ LDFLAGS       = $(OPT) -z
 SHLD         = $(LD)
 SOFLAGS       = -b /usr/lib/libm.sl 
 
-G3LIBS        = -lgeant321
-CLIBS         = -lminicern
-
 LIBS          = $(ROOTLIBS) -lNew -lm
 GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/lib/X11R6 -L/usr/local/lib \
                 -lX11 -lm -ldld 

diff --git a/conf/MachineDef.HP-UX.egcs b/conf/MachineDef.HP-UX.egcs
index 28b74a42c552438a8c211e50a55ee112f93651d0..124f453534a2028d0a4446f3cb03c708167b165a 100644 (file)
--- a/conf/MachineDef.HP-UX.egcs
+++ b/conf/MachineDef.HP-UX.egcs
@@ -1,8 +1,7 @@
 # $Id$
  
 # Which Machine 
-PLATFORM      = linux
-#en esperant que ca marche...
+PLATFORM      = HP-UX
 
 # The compilers
 CXX           = echo $*.cxx ; g++
@@ -10,8 +9,7 @@ F77          = echo $*.F ; g77
 CC           = echo $*.c ; gcc
 
 # Global optimisation
-OPT           = -O2
-OPT           = -g
+OPT           = -O
 
 # Shared library suffix
 SL           = sl
@@ -19,12 +17,6 @@ SL         = sl
 # The options
 CXXOPTS       = $(OPT) -Wall -fPIC
 
-#essai numero 2232...
-
-#CXXFLAGS      = -fPIC -I/usr/include/X11R5
-
-#fin essai
-
 COPT         = $(OPT) -fPIC
 FOPT         = $(OPT) -fPIC -fno-second-underscore
 
@@ -45,12 +37,8 @@ LD            = g++
 LDFLAGS       = $(OPT)
 
 SHLD         = $(LD)
-#SOFLAGS       = -Wl,-b,/usr/lib/libm.sl
 SOFLAGS       = -shared -fPIC
 SHLIB         = 
 
-#LIBS          = $(ROOTLIBS) -lm -rdynamic
-#GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/X11R6/lib -lX11 -lg2c -ldl -lcrypt -rdynamic
-
 LIBS          = $(ROOTLIBS) -lm
 GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/X11R6/lib -lX11 -lg2c -lcrypt 

diff --git a/conf/MachineDef.OSF1 b/conf/MachineDef.OSF1
index 4571308f51103ef7e28fd0d86c429b8ce22ae08c..46c8a3b996aec9ecc26a148ebb97074c8b512861 100644 (file)
--- a/conf/MachineDef.OSF1
+++ b/conf/MachineDef.OSF1
@@ -37,8 +37,7 @@ SOFLAGS       = -L/usr/lib/cmplrs/cxx -rpath /usr/lib/cmplrs/cxx -expect_unresol
        -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
 
-G3LIBS        = -lgeant321
-CLIBS         = -lminicern
-
 LIBS          = $(ROOTLIBS) -lNew -lm
 GLIBS         = $(ROOTLIBS) $(ROOTGLIBS)  -lXm -lXt -lX11 -lm -lPW -lUfor -lfor -lFutil -lm -lots
+
+CLIBS         = $(LIBDIR)/libminicern.a

diff --git a/conf/MachineDef.SunOS b/conf/MachineDef.SunOS
index f002278c921f68f5d18288344d647624e225de24..4354c1b119b10ab504cf9c7025c0289e8ecc755b 100644 (file)
--- a/conf/MachineDef.SunOS
+++ b/conf/MachineDef.SunOS
@@ -37,9 +37,6 @@ SHLD        = $(LD)
 SOFLAGS       = -G
 SHLIB         = -L/opt/SUNWspro/lib -lF77 -lM77 /opt/SUNWspro/lib/libsunmath.so.1
 
-G3LIBS        = -lgeant321
-CLIBS         = -lminicern
-
 LIBS          = $(ROOTLIBS) -lm -lgen -ldl -lsocket -lsunmath
 GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/dt/lib -L/usr/openwin/lib \
                 -L/usr/ccs/lib -lXm -lXt -lX11 -lm -lgen -ldl -lsocket -lsunmath