From 0697f3d60901cbb4b201a8d1cd2b3ea55eada714 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Tue, 25 Apr 2000 20:27:23 +0000
Subject: [PATCH] Updates to changes from Chris Larrieu for hp700 build.

---
 config/CONFIG.Host.hp700      | 12 +++++++-----
 config/CONFIG_SITE.Host.hp700 |  5 +++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/config/CONFIG.Host.hp700 b/config/CONFIG.Host.hp700
index 371fe6afc..0e8abb2e2 100644
--- a/config/CONFIG.Host.hp700
+++ b/config/CONFIG.Host.hp700
@@ -51,11 +51,7 @@ HPCC_SHRLIB_LDFLAGS_YES = -b
 #New HP C++ compiler
 CCC = aCC
 # avoid treating "future errors" as actual errors
-CCC_NORMAL = $(CCC) +W302 +W829 +W818 +W392 +W469 +W495 +W749 +W667 +W749 +W392
-# shared libs will be found by searching environment variable SHLIB_PATH,
-# then by searching the specified path (see below)
-CCC_SHRLIB_LDFLAGS_YES = -b -Wl,+s,+b$(DEFAULT_SHRLIB_SEARCH_PATH)
-
+CCC_NORMAL = $(CCC) +W302 +W829 +W818 +W392 +W469 +W495 +W749 +W667 +W749 +W392 +W684
 CCC_STRICT = $(CCC) +p
 CCC_TEMPL_INST_FLAG =
 CCC_WARN_YES = +w
@@ -66,6 +62,11 @@ CCC_SFLAGS_YES= -Wl,-a,archive
 CCC_SFLAGS_NO=
 CCC_SLIBS_YES =
 CCC_SLIBS_NO=
+CCC_SHRLIB_CFLAGS_YES =
+# shared libs will be found by searching environment variable SHLIB_PATH,
+# then by searching the specified path (see below)
+CCC_SHRLIB_LDFLAGS_YES = -b
+
 CCC_DEPENDS_FLAG =
 
 # +DAportable causes portable object code to be created for execution
@@ -73,4 +74,5 @@ CCC_DEPENDS_FLAG =
 ARCH_DEP_CFLAGS = -D_HPUX_SOURCE -DHP_UX +DAportable
 ARCH_DEP_CXXFLAGS = -D_HPUX_SOURCE -DHP_UX +DAportable
 ARCH_DEP_LDLIBS =
+ARCH_DEP_LDFLAGS = -Wl,+s,+b$(DEFAULT_SHRLIB_SEARCH_PATH)
 
diff --git a/config/CONFIG_SITE.Host.hp700 b/config/CONFIG_SITE.Host.hp700
index e7026994b..0078f44bb 100644
--- a/config/CONFIG_SITE.Host.hp700
+++ b/config/CONFIG_SITE.Host.hp700
@@ -9,6 +9,11 @@ SHARED_LIBRARIES=YES
 
 # where we expect to find shared libraries if not found elsewhere
 DEFAULT_SHRLIB_SEARCH_PATH = /cs/op/lib/R$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION).$(EPICS_UPDATE_NAME)$(EPICS_UPDATE_LEVEL):$(INSTALL_LIB)
+
+#No special action should be required to build or use shared libraries.
+#However, when a new shared library is built using the above configuration,
+#it should be copied into the location specified by DEFAULT_SHRLIB_SEARCH_PATH
+#which in this specific case is: /cs/lib/R3.13.1.1/
  
 # cal added this so that libraries can be built with position
 # independent code even if shared libraries aren't being built