From 628f555a55fadba050d83a3539432182264ac5d8 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Mon, 4 Aug 1997 22:36:02 +0000
Subject: [PATCH] include CONFIG.UNIX/allow AR macro on win32

---
 config/CONFIG.Linux    | 4 +++-
 config/CONFIG.alpha    | 4 +++-
 config/CONFIG.cygwin32 | 2 +-
 config/CONFIG.hp700    | 4 +++-
 config/CONFIG.sgi      | 4 +++-
 config/CONFIG.solaris  | 6 +++++-
 config/CONFIG.sun4     | 8 +++++---
 7 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/config/CONFIG.Linux b/config/CONFIG.Linux
index fd60ccf51..4ea34a7a7 100644
--- a/config/CONFIG.Linux
+++ b/config/CONFIG.Linux
@@ -3,6 +3,8 @@
 #
 #  This file is maintained by the EPICS community.
 
+include $(EPICS_BASE)/config/CONFIG.unix
+
 # Compiler and utility invocation (supply path to compiler here)
 #   (with warning flags built in)
 #  Paths to compilers
@@ -19,7 +21,7 @@ ACC = acc
 AR = ar 
 _AR = $(AR) $(ARFLAGS)
 ARFLAGS = r
-ARCMD = $(AR) $(ARFLAGS)
+ARCMD = $(AR) $(ARFLAGS) $@
 
 RANLIB = ranlib
 RANLIBFLAGS = -t
diff --git a/config/CONFIG.alpha b/config/CONFIG.alpha
index f5e5d1f64..30b4b875a 100644
--- a/config/CONFIG.alpha
+++ b/config/CONFIG.alpha
@@ -2,6 +2,8 @@
 #
 #  This file is maintained by the EPICS community.
 
+include $(EPICS_BASE)/config/CONFIG.unix
+
 # BUILD_TYPE
 #   Currently either Vx or Host
 BUILD_TYPE = Host
@@ -18,7 +20,7 @@ AR = ar -rc
 _AR = $(AR) $(ARFLAGS)
 G++_AR = $(_AR)
 CCC_AR = $(AR)
-ARCMD = $($(CPLUSPLUS)_AR)
+ARCMD = $($(CPLUSPLUS)_AR) $@
 
 RANLIB = ranlib
 YACC = $(EYACC)
diff --git a/config/CONFIG.cygwin32 b/config/CONFIG.cygwin32
index 5680a92a5..e371bb358 100755
--- a/config/CONFIG.cygwin32
+++ b/config/CONFIG.cygwin32
@@ -27,7 +27,7 @@ OBJ=.o
 AR = ar
 _AR = $(AR) $(ARFLAGS)
 G++_AR = $(_AR)
-ARCMD = $($(CPLUSPLUS)_AR)
+ARCMD = $($(CPLUSPLUS)_AR) $@
 
 RANLIB = ranlib
 YACC = $(EYACC)
diff --git a/config/CONFIG.hp700 b/config/CONFIG.hp700
index e4bf18635..a362e972c 100644
--- a/config/CONFIG.hp700
+++ b/config/CONFIG.hp700
@@ -2,6 +2,8 @@
 #
 #  This file is maintained by the EPICS community.
 
+include $(EPICS_BASE)/config/CONFIG.unix
+
 # BUILD_TYPE
 #   Currently either Vx or Unix
 BUILD_TYPE = Host
@@ -17,7 +19,7 @@ HPACC = cc -Aa
 HPCC = cc -Ac
 TRADCC = cc
 AR = ar 
-ARCMD = $(AR) $(ARFLAGS)
+ARCMD = $(AR) $(ARFLAGS) $@
 
 RANLIB = ranlib
 YACC = $(EYACC)
diff --git a/config/CONFIG.sgi b/config/CONFIG.sgi
index 4f9b9238a..1117d9929 100644
--- a/config/CONFIG.sgi
+++ b/config/CONFIG.sgi
@@ -3,6 +3,8 @@
 #
 #  This file is maintained by the EPICS community.
 
+include $(EPICS_BASE)/config/CONFIG.unix
+
 # BUILD_TYPE
 #   Currently either Vx or Host
 BUILD_TYPE = Host
@@ -16,7 +18,7 @@ GCC = cc
 ACC = cc
 
 AR = ar 
-ARCMD = $(AR) $(ARFLAGS)
+ARCMD = $(AR) $(ARFLAGS) $@
 ARFLAGS = r
 
 RANLIB =
diff --git a/config/CONFIG.solaris b/config/CONFIG.solaris
index f3657b372..540002650 100644
--- a/config/CONFIG.solaris
+++ b/config/CONFIG.solaris
@@ -3,6 +3,8 @@
 #
 #  This file is maintained by the EPICS community.
 
+include $(EPICS_BASE)/config/CONFIG.unix
+
 # BUILD_TYPE
 #   Currently either Vx or Host
 BUILD_TYPE = Host
@@ -23,7 +25,7 @@ AR = ar
 _AR = $(AR) $(ARFLAGS)
 G++_AR = $(_AR)
 CCC_AR = $(CCC) -xar -o
-ARCMD = $($(CPLUSPLUS)_AR)
+ARCMD = $($(CPLUSPLUS)_AR) $@
 
 RANLIB =
 YACC = $(EYACC)
@@ -49,6 +51,7 @@ ACC_TRAD_INVOKE_W_NO = $(ACC) -Xs -w
 ACC_TRAD_INVOKE_W_YES = $(ACC) -Xs
 ACC_LD_FLAGS = 
 ACC_LD_LIBS =
+
 SUNCC_TRAD_INVOKE_W_NO = $(ACC_TRAD_INVOKE_W_NO)
 SUNCC_TRAD_INVOKE_W_YES = $(ACC_TRAD_INVOKE_W_YES)
 GCC_ANSI_INVOKE_W_NO = $(GCC) -ansi -w
@@ -166,3 +169,4 @@ LINK.cc = $(CXX) -o $@ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
 DEPENDS_RULE.c = -$(COMPILE.c) -xM $(SRCS.c) > .DEPENDS
 DEPENDS_RULE.cc = -$(COMPILE.cc) -xM $(SRCS.cc) >> .DEPENDS
+
diff --git a/config/CONFIG.sun4 b/config/CONFIG.sun4
index 4211dd1c0..26a55bbe6 100644
--- a/config/CONFIG.sun4
+++ b/config/CONFIG.sun4
@@ -3,6 +3,8 @@
 #
 #  This file is maintained by the EPICS community.
 
+include $(EPICS_BASE)/config/CONFIG.unix
+
 # BUILD_TYPE
 #   Currently either Vx or Host
 
@@ -44,9 +46,9 @@ OBJ=.o
 ARFLAGS = r
 AR = ar
 _AR = $(AR) $(ARFLAGS)
-G++_AR = $(_AR) 
-CCC_AR = $(CCC) -xar -o 
-ARCMD = $($(CPLUSPLUS)_AR)
+G++_AR = $(_AR)
+CCC_AR = $(CCC) -xar -o
+ARCMD = $($(CPLUSPLUS)_AR) $@
 
 ACC_ANSI_INVOKE_W_NO = $(ACC) -Xa -w
 ACC_ANSI_INVOKE_W_YES = $(ACC) -Xa