From 7977848096f3094cde3610682466fdf9ff472b45 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Mon, 9 Nov 1998 21:39:47 +0000
Subject: [PATCH] Unix build now always uses SHRLIB_CFLAGS when compiling
 library src files. Added ARCH_CLASS facility for USR_CPPFLAGS.

---
 config/CONFIG.Host.UnixCommon |  1 -
 config/RULES.Host             | 12 ++++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/config/CONFIG.Host.UnixCommon b/config/CONFIG.Host.UnixCommon
index 75a9a1857..be70bd8ed 100644
--- a/config/CONFIG.Host.UnixCommon
+++ b/config/CONFIG.Host.UnixCommon
@@ -19,7 +19,6 @@ LIBNAME = $(LIBRARY:%=lib%.a)
 SHRLIB_SUFFIX = .so
 
 SHRLIBNAME = lib$(LIBRARY)$(SHRLIB_SUFFIX)$(SHRLIB_VERSION:%=.%)
-SHRLIB_CFLAGS = $($(ANSI)_SHRLIB_CFLAGS_$(strip $(SHARED_LIBRARIES)))
 SHRLIB_LDFLAGS = $($(ANSI)_SHRLIB_LDFLAGS_$(strip $(SHARED_LIBRARIES)))
 
 DLL_LDLIBS = $(PRODNAME_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)
diff --git a/config/RULES.Host b/config/RULES.Host
index a4f1a074a..713d70618 100644
--- a/config/RULES.Host
+++ b/config/RULES.Host
@@ -88,6 +88,14 @@ USR_CXXFLAGS+=$(USR_CXXFLAGS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(USR_CPPFLAGS_$(ARCH_CLASS))),)
+USR_CPPFLAGS+=$(subst -nil-,,$(USR_CPPFLAGS_$(ARCH_CLASS)))
+else
+ifdef USR_CPPFLAGS_DEFAULT
+USR_CPPFLAGS+=$(USR_CPPFLAGS_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(USR_LDFLAGS_$(ARCH_CLASS))),)
 USR_LDFLAGS+=$(subst -nil-,,$(USR_LDFLAGS_$(ARCH_CLASS)))
 else
@@ -303,13 +311,13 @@ endif # EPICS_BASE
 ifdef LIBRARY
 ifdef LIBOBJS
 LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS)
+CFLAGS +=  $($(ANSI)_SHRLIB_CFLAGS_YES)
+CXXFLAGS +=  $($(ANSI)_SHRLIB_CFLAGS_YES)
 
 #  check if shared libraries requested
 ifeq ($(strip $(SHARED_LIBRARIES)),YES)
 
 PROD_VERSION =$(SHRLIB_VERSION)
-CFLAGS += $(SHRLIB_CFLAGS)
-CXXFLAGS += $(SHRLIB_CFLAGS)
 ifeq ($(findstring cc,$(suffix $(LIBSRCS))),cc)
 SHRLIB_LINKER = $(CXX)
 else