Unify syntax for alpha and other systems for the creation of shared libraries.

diff --git a/conf/GeneralMacros b/conf/GeneralMacros
index 2d679c33dfc70ed3f535f15097031d9d2f1fbadd..e7b0ef16c004ae4f965d19d214d787fee80423e8 100644 (file)
--- a/conf/GeneralMacros
+++ b/conf/GeneralMacros
@@ -6,11 +6,7 @@ $(SLIBRARY):
                 ifeq ($(PLATFORM),aix)
                   @$(SHLD) -o $@ $(LIBS) -p 0 $^
                 else
-                   ifeq ($(PLATFORM),alpha)
-                     @$(SHLD) $(SOFLAGS) $(LDFLAGS) $^ $(SHLIB) -o $@ 
-                   else
-                     @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(SHLIB) -o $@
-                   endif
+                  @$(SHLD) $(SOFLAGS) $(LDFLAGS) $^ $(SHLIB) -o $@
                 endif
                @chmod 555 $@
                @echo "$@ done"

diff --git a/conf/MachineDef.HP-UX b/conf/MachineDef.HP-UX
index c813ada9a584cabc7bc92eb0913876cbc9d21a8b..b73d8e5f6e68cd0e1947a0c4201616809b604e6d 100644 (file)
--- a/conf/MachineDef.HP-UX
+++ b/conf/MachineDef.HP-UX
@@ -30,6 +30,8 @@ DEPINC              = -I /opt/CC/include/CC/
 
 LD            = CC
 LDFLAGS       = $(OPT) +a1 -z
+
+SHLD         = $(LD)
 SOFLAGS       = -b /usr/lib/libm.sl 
 
 G3LIBS        = -lgeant321

diff --git a/conf/MachineDef.Linux b/conf/MachineDef.Linux
index f751cf12ab2ae923fe04dde9d3ed87ccd8d9e252..c32dcce113e5c227e9495c2b624925f72bbb7af3 100644 (file)
--- a/conf/MachineDef.Linux
+++ b/conf/MachineDef.Linux
@@ -32,6 +32,8 @@ DEPINC        = -I/usr/local/include/g++ -I/usr/local/include \
                
 LD            = g++
 LDFLAGS       = $(OPT)
+
+SHLD         = $(LD)
 SOFLAGS       = -Wl,-soname,$(notdir $@) -shared 
 SHLIB         = -lg2c
 

diff --git a/conf/MachineDef.OSF1 b/conf/MachineDef.OSF1
index f9a2c7f3ce4b6e1c7a8d7c151326ecd2ab940d5d..b3d013e4700ef1e167305dec23d20d39d55d0646 100644 (file)
--- a/conf/MachineDef.OSF1
+++ b/conf/MachineDef.OSF1
@@ -30,9 +30,10 @@ DEPINC             = -I/usr/include/cxx
 
 LD            = cxx
 LDFLAGS       = $(OPT)
+
+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
-SHLD          = ld
 SHLIB        = -lcxxstd -lcxx -lexc -lots -lc -lUfor -lfor -lFutil -lm
 
 G3LIBS        = -lgeant321

diff --git a/conf/MachineDef.SunOS b/conf/MachineDef.SunOS
index 3998cc0df3a99c15018bd3912fbb34aeef603f05..964799764bcde5fd3921595c72e51857740a734d 100644 (file)
--- a/conf/MachineDef.SunOS
+++ b/conf/MachineDef.SunOS
@@ -31,6 +31,8 @@ DEPINC        = -I/opt/SUNWspro/SC4.0/include/CC -I/opt/SUNWspro/SC4.0/include/c
                
 LD            = /opt/SUNWspro/bin/CC
 LDFLAGS       = $(OPT) -Qoption ld -t
+
+SHLD         = $(LD)
 SOFLAGS       = -G
 SHLIB         = -L/opt/SUNWspro/lib -lF77 -lM77 /opt/SUNWspro/lib/libsunmath.so.1