From 40da9a8f05d127017274c7bf2bf7df81a3d129d1 Mon Sep 17 00:00:00 2001
From: fca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 10 Jun 1999 15:28:32 +0000
Subject: [PATCH] Unify syntax for alpha and other systems for the creation of
 shared libraries.

---
 conf/GeneralMacros    | 6 +-----
 conf/MachineDef.HP-UX | 2 ++
 conf/MachineDef.Linux | 2 ++
 conf/MachineDef.OSF1  | 3 ++-
 conf/MachineDef.SunOS | 2 ++
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/conf/GeneralMacros b/conf/GeneralMacros
index 2d679c33dfc..e7b0ef16c00 100644
--- 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 c813ada9a58..b73d8e5f6e6 100644
--- 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 f751cf12ab2..c32dcce113e 100644
--- 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 f9a2c7f3ce4..b3d013e4700 100644
--- 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 3998cc0df3a..964799764bc 100644
--- 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
 
-- 
2.39.3