Updated release number.

Updates for beta2
Added solarisGnu.
2002-08-01 18:17:52 +00:00 · 2002-08-01 16:20:42 +00:00 · 2002-08-01 15:41:20 +00:00 · 2002-08-01 15:39:22 +00:00 · 2002-08-01 00:17:26 +00:00 · 2002-08-01 00:09:37 +00:00
1340 changed files with 43879 additions and 146719 deletions
--- a/109
+++ b/109
@@ -0,0 +1,109 @@
+Copyright (c) 2002 University of Chicago and The Regents of the University
+of California. All rights reserved.
+
+EPICS BASE is distributed subject to the following license agreement:
+
+ SOFTWARE LICENSE AGREEMENT
+ Software: EPICS BASE
+ Versions: 3.13.7 and higher
+
+IMPORTANT! READ CAREFULLY: EPICS BASE is NOT distributed as Open Source.
+This is a legal agreement between you (in your capacity as an individual
+and as an agent for your company, institution or other entity) and The
+University of Chicago, as Operator of Argonne National Laboratory under
+Contract W-31-109-ENG-38 with the U.S. Department of Energy ("Argonne"),
+and The Regents of the University of California, as Operator of Los Alamos
+National Laboratory under Contract W-7405-ENG-36 with the U.S. Department
+of Energy ("Los Alamos").
+
+ 1. The "Software", below, refers to EPICS BASE (in either source code, or
+    binary form and accompanying documentation). Each licensee is
+    addressed as "you" or "Licensee."
+
+ 2. Argonne and Los Alamos are copyright holders in the Software. The
+    copyright holders and their third-party licensors hereby grant
+    Licensee a royalty-free nonexclusive license, subject to the
+    limitations stated herein and U.S. Government license rights.
+
+ 3. You may modify and make a copy or copies of the Software for use
+    within your organization, if you meet the following conditions:
+      a. Copies in source code must include the copyright notice and this
+         Software License Agreement.
+      b. Copies in binary form must include the copyright notice and this
+         Software License Agreement in the documentation and/or other
+         materials provided with the copy.
+
+ 4. You may modify a copy or copies of the Software or any portion of it,
+    thus forming a work based on the Software, and distribute copies of
+    such work outside your organization, if you meet all of the following
+    conditions:
+      a. Copies in source code must include the copyright notice and this
+         Software License Agreement;
+      b. Copies in binary form must include the copyright notice and this
+         Software License Agreement in the documentation and/or other
+         materials provided with the copy;
+      c. Modified copies and works based on the Software must carry
+         prominent notices stating that you changed specified portions of
+         the Software; and
+      d. Prior to sending a copy or modified copy of the Software to any
+         person or entity outside your organization you must verify with
+         Argonne that the intended recipient of the Software has executed
+         a license with Argonne for EPICS BASE. (See
+         http://www.aps.anl.gov/epics/license/verify.php for information
+         on how to contact Argonne.)
+
+ 5. THE SOFTWARE INCLUDES PORTIONS WHICH MAY REQUIRE SOME FORM OF EXPORT
+    CONTROL LICENSE FROM THE U.S. GOVERNMENT. FAILURE TO OBTAIN SUCH
+    EXPORT CONTROL LICENSE MAY RESULT IN CRIMINAL LIABILITY UNDER U.S.
+    LAWS.
+
+ 6. Portions of the Software resulted from work developed under a U.S.
+    Government contract and are subject to the following license: the
+    Government is granted for itself and others acting on its behalf a
+    paid-up, nonexclusive, irrevocable worldwide license in this computer
+    software to reproduce, prepare derivative works, and perform publicly
+    and display publicly.
+
+ 7. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY
+    OF ANY KIND. THE COPYRIGHT HOLDERS, THEIR THIRD PARTY LICENSORS, THE
+    UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND THEIR
+    EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+    BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+    FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT, (2) DO NOT ASSUME
+    ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS,
+    OR USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE
+    SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT
+    THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR FREE
+    OR THAT ANY ERRORS WILL BE CORRECTED.
+
+ 8. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR
+    THIRD PARTY LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT
+    OF ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, INCIDENTAL,
+    CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE,
+    INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA, FOR ANY
+    REASON WHATSOEVER, WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF
+    CONTRACT, TORT (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR
+    OTHERWISE, EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE
+    POSSIBILITY OF SUCH LOSS OR DAMAGES.
+
+________________________________________________________________________
+
+This software is in part copyrighted by the BERLINER SPEICHERRING
+GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY),
+BERLIN, GERMANY.
+
+In no event shall BESSY be liable to any party for direct,
+indirect, special, incidental, or consequential damages arising
+out of the use of this software, its documentation, or any
+derivatives thereof, even if BESSY has been advised of the
+possibility of such damage.
+
+BESSY specifically disclaims any warranties, including, but not
+limited to, the implied warranties of merchantability, fitness for
+a particular purpose, and non-infringement.  This software is
+provided on an "as is" basis, and BESSY has no obligation to
+provide maintenance, support, updates, enhancements, or
+modifications.
+________________________________________________________________________
+
+
--- a/19
+++ b/19
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #
 # $Id$
 #
@@ -5,15 +14,7 @@
 TOP = .
 include $(TOP)/configure/CONFIG

-DIRS += config configure src
+DIRS += config config/tools configure src

 include $(TOP)/configure/RULES_TOP

-release::
-	@echo TOP: Creating Release...
-	@$(TOOLS)/MakeRelease
-
-built_release::
-	@echo TOP: Creating Fully Built Release...
-	@$(TOOLS)/MakeRelease -b $(INSTALL_LOCATION)
-	
--- a/24
+++ b/24
@@ -0,0 +1,24 @@
+---------------------------------------------------------
+EPICS Base - the central core of a control system toolkit
+---------------------------------------------------------
+
+Copyright (c) 2002 The University of Chicago, as Operator
+of Argonne National Laboratory.
+Copyright (c) 2002 The Regents of the University of
+California, as Operator of Los Alamos National Laboratory.
+
+EPICS Base Versions 3.13.7 and higher are distributed
+subject to a Software License Agreement found in the
+file LICENSE that is included with this distribution.
+
+---------------------------------------------------------
+
+Installation and release information can be found in the
+various files in the documentation subdirectory.
+
+Additional information about EPICS including mailing list
+archives and subscription instructions, documentation and
+training materials, additional components, links to other
+websites etc. is available on the EPICS home page at
+	http://www.aps.anl.gov/epics/
+
--- a/README.cxxTemplates
+++ b/README.cxxTemplates
@@ -1,46 +0,0 @@
-
-The C++ templates supplied with EPICS base are in 
-"$(EPICS)/base/src/cxxTemplates".
-
-In Stroustrups's "The C++ Programming Language" Appendix A: r.14.9
-(ANSI/ISO resolutions) a mechanism is described for the explicit 
-instantiation of template member functions (that are not inline). 
-At this time some compilers do not support this mechanism (and use
-a template database snd/or smart linker instead). Other compilers 
-(such as g++) provide only limited support for other forms of
-instantiation (g++ does not yet provide a template database or 
-a smart linker for templates).
-
-Since there is no defacto standard mechanism for instatiating
-templates at this time we are defining the preprocessor flag 
-EXPL_TEMPL in the build system when the compiler supports
-explicit instantiation and the compiler does not support
-automatic instantiation via a smart linker and/or template
-database (currently this is only g++).
-
-EPICS codes that use templates may need to include a code block
-as follow that instantiates the template only once into each
-program.
-
-#include <classXYZ.h>
-#include <templXXX.h>
-
-//
-// if the compiler supports explicit instantiation of
-// template member functions
-//
-#if defined(EXPL_TEMPL)
-        //
-        // From Stroustrups's "The C++ Programming Language"
-        // Appendix A: r.14.9
-        //
-        // This explicitly instantiates the template class's member
-        // functions into "templInst.o"
-        //
-        template class templXXX <classXYZ>;
-#endif
-
-Jeff Hill 3-6-97
-johill@lanl.gov
-
-
--- a/RELEASE_NOTES.html
+++ b/RELEASE_NOTES.html
@@ -1,243 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.76 [en] (X11; U; SunOS 5.8 sun4u) [Netscape]">
-   <title>EPICS Release baseR3.14
-</title>
-</head>
-<body>
-
-<center>
-<h1>
-EPICS Release base 3.14.0alpha2</h1></center>
-Since the alpha1 release some major changes were made to the build system,
-to some of the libCom facilities, and to the iocsh facilities.
-<p>The unbundled version of the sequencer has been build and tested with
-this release. You must obtain a version of the sequencer that has been
-built against alpha2.
-<p>A verion of the HPlanGpib support has been built and tested with this
-release. Again you must obtain a version that builds with alpha2.
-<p>A new update to the Application Developer's Guide is available for this
-release.
-<h3>
-Build changes</h3>
-
-<ul>
-<li>
-Operating system independant builds are now done in an O.Common subdirectory
-and then installed instead of being performed directly in an install directory.</li>
-
-<li>
-Build definition names (e.g. RECTYPES, MENUS, DBDNAME, and BPTS) have been
-changed to specify the name of the file to be created and installed instead
-of the source file name.</li>
-
-<li>
-All db and dbd related definitions and rules have been moved into base/configure/RULES.Db
-file. The rules now allow multiple dbd files and registerRecordDeviceDriver
-files to be created in a single Makefile.</li>
-
-<li>
-"gnumake depends" no longer depends on a complete buildInstall.</li>
-</ul>
-
-<h3>
-Converting alpha1 applications to alpha2</h3>
-Build modifications in alpha2 require the following changes to existing
-R3.14 applications.
-<ul>
-<li>
-&nbsp;Remove the now unused RULES files</li>
-
-<li>
-</li>
-
-<ul>./configure/RULES.Db
-<br>./configure/RULES.registerRecordDeviceDriver
-<br>&nbsp;</ul>
-
-<li>
-Delete the following line in ./configure/RULES</li>
-
-<ul>&nbsp;
-<br>include $(TOP)/configure/RULES.registerRecordDeviceDriver</ul>
-</ul>
-
-<ul>
-<li>
-&nbsp; In &lt;top>/configure/Makefile change</li>
-
-<ul>&nbsp;
-<br>@$(PERL) $(TOOLS)/makeConfigAppInclude.pl $(T_A) $@ $(TOP)</ul>
-to
-<ul>@$(PERL) $(TOOLS)/makeConfigAppInclude.pl $(EPICS_HOST_ARCH) $(T_A)
-$@ $(TOP)
-<br>&nbsp;</ul>
-and add the line
-<ul>&nbsp;
-<br>depends: install
-<br>&nbsp;</ul>
-to the bottom of the Makefile.
-<ul>&nbsp;</ul>
-</ul>
-
-<ul>
-<li>
-In all *App/*Db/Makefileschange</li>
-
-<ul>&nbsp;
-<br>include $(TOP)/configure/RULES.Db</ul>
-to
-<ul>include $(TOP)/configure/RULES</ul>
-
-<li>
-In all *App/src/Makefile files</li>
-
-<ul>&nbsp;</ul>
-change&nbsp;&nbsp;&nbsp; DBDNAME = &lt;name>App&nbsp;&nbsp;&nbsp; to&nbsp;&nbsp;&nbsp;
-DBD += &lt;name>
-<ul>&nbsp;</ul>
-and remove the line
-<br>&nbsp;
-<ul>DBDEXPAND = &lt;name>Include.dbd
-<br>&nbsp;</ul>
-NOTE: If any of your *App/*Db/Makefiles contain "DBDNAME =" lines you should
-make these same changes in that *Db dirctory.
-<br>&nbsp;
-<li>
-In all *App/src/Makefile Makefiles</li>
-
-<ul>&nbsp;</ul>
-change&nbsp;&nbsp;&nbsp; RECTYPES=&lt;name>.h&nbsp;&nbsp;&nbsp; to&nbsp;&nbsp;&nbsp;
-DBDINC+=&lt;name>
-<ul>&nbsp;</ul>
-change&nbsp;&nbsp;&nbsp; MENUS=&lt;name>.h&nbsp;&nbsp;&nbsp; to&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-DBDINC+=&lt;name></ul>
-
-<ul>change&nbsp;&nbsp;&nbsp; BPTS&nbsp;&nbsp;&nbsp;&nbsp; to&nbsp;&nbsp;&nbsp;&nbsp;
-DBD
-<p>change&nbsp;&nbsp;&nbsp;&nbsp; INSTALLDB&nbsp;&nbsp;&nbsp;&nbsp; to&nbsp;&nbsp;&nbsp;
-DB
-<p>change&nbsp;&nbsp;&nbsp; DBDINSTALL&nbsp;&nbsp;&nbsp; to&nbsp;&nbsp;&nbsp;&nbsp;
-DBD
-<br>&nbsp;
-<li>
-In all example *App/src/Makefile files change</li>
-
-<ul>&nbsp;
-<br>example_SRCS_DEFAULT += registerRecordDeviceDriver.c</ul>
-to
-<ul>example_SRCS_DEFAULT += &lt;name>_registerRecordDeviceDriver.cpp
-<br>&nbsp;</ul>
-where &lt;name> is the base name of a &lt;name>.dbd file which was created
-from a &lt;name>Include.dbd file and which will be loaded in a st.cmd or
-stcmd.host script (e.g. example).
-<br>&nbsp;
-<li>
-In ./iocBoot/ioc&lt;name>/st.cmd files change</li>
-
-<br>&nbsp;
-<ul>dbLoadDatabase("dbd/exampleApp.dbd")</ul>
-to
-<ul>dbLoadDatabase("dbd/example.dbd")
-<br>&nbsp;</ul>
-
-<li>
-In &lt;top>/iocBoot/ioc&lt;name>/stcmd.host files change</li>
-
-<ul>&nbsp;
-<br>dbLoadDatabase("../../dbd/exampleApp.dbd",0,0)</ul>
-to
-<ul>dbLoadDatabase("../../dbd/example.dbd",0,0)</ul>
-</ul>
-
-<h3>
-EPICS_HOST_ARCH changes</h3>
-GNU compiler builds are now determined by the value of EPICS_HOST_ARCH
-and are no longer specified in CONFIG_SITE.&nbsp; All references to the
-ANSI (ACC/GCC) and CPLUSPLUS (CCC/G++) macros have been removed.
-<br>&nbsp;
-<h3>
-libCom</h3>
-Most of the library routines and files starting with the prefix osi have
-been changed to start with epics. Several also had major changes to their
-user interface. See the latest version of the Application Developer's Guide
-for details.
-<br>&nbsp;
-<center>
-<h2>
-EPICS Release base 3.14.0alpha1 Notes</h2></center>
-
-<p><br>
-<p>This is the first release of 3.14. This is the first release that supports
-iocCore on platforms besides vxWorks.
-<p>iocCore is now supported on the following platforms:
-<ul>
-<li>
-vxWorks</li>
-
-<br>Tornado II is required.
-<li>
-RTEMS</li>
-
-<br>An open source real time operating system. It has been tested on MVME167
-and MC68360 processors. RTEMS also supports powerPC.
-<li>
-solaris</li>
-
-<br>Has been tested on solaris 2.6 and solaris 8.
-<li>
-Linux</li>
-
-<br>Has been tested on Redhat x86 platforms.
-<li>
-winNT</li>
-
-<br>Testing has been done with visual C++ 6.0.</ul>
-A new version of the Application Developers Guide is available. The following
-gives links to the new Application Developer's Guide and to RTEMS information.
-<p>http://www.aps.anl.gov/epics/modules/base/R3-14.php
-<p>Most of the Application Developer's Guide has only minor changes. The
-following are new.
-<ul>
-<li>
-Chapter 2 describes the new features for 3.14.</li>
-
-<li>
-Chapter 4 describes the build facility for 3.14</li>
-
-<li>
-Chapters 19 and 20 describe libCom, which was not previously documented.</li>
-</ul>
-
-<p><br>It must be emphasized that this is an alpha release.
-<ul>
-<li>
-Please don't use it for existing operational systems</li>
-
-<li>
-Don't build your operational CA clients with it.</li>
-
-<li>
-The APIs for new components in libCom are still evolving so if you use
-them be prepared for changes.</li>
-
-<li>
-HPUX - No support currently because we could not find good support for
-multithreading.</li>
-</ul>
-Building Applications
-<ul>
-<li>
-For new applications see Chapters 2 (New Features) and Chapter 4 (Build
-Facility) of the Application Developer's Guide.</li>
-
-<li>
-For existing applications the old config rules are still supported. Some
-changes, however, are needed. Documentation is being prepared and will
-appear in these release notes sooon.</li>
-</ul>
-
-</body>
-</html>
--- a/config.hkv2f.mk
+++ b/config.hkv2f.mk
@@ -1,5 +0,0 @@
-BUILD_TYPE = Vx
-
-DIRS =	src/as src/ca src/db src/dev src/devOpt src/drv \
-	src/libCom src/libvxWorks src/rec src/rsrv \
-	src/sequencer src/util src/dbtools src/misc .
--- a/config.mk
+++ b/config.mk
@@ -1 +0,0 @@
-BUILD_ARCHS=sun4 mv167 mv147
--- a/config.mv147.mk
+++ b/config.mv147.mk
@@ -1,5 +0,0 @@
-BUILD_TYPE = Vx
-
-DIRS =	src/as src/ca src/db src/dev src/devOpt src/drv \
-	src/libCom src/libvxWorks src/rec src/rsrv \
-	src/sequencer src/util src/dbtools src/misc .
--- a/config.mv167.mk
+++ b/config.mv167.mk
@@ -1,5 +0,0 @@
-BUILD_TYPE = Vx
-
-DIRS =	src/as src/ca src/db src/dev src/devOpt src/drv \
-	src/libCom src/libvxWorks src/rec src/rsrv \
-	src/sequencer src/util src/dbtools src/misc .
--- a/config.sun4.mk
+++ b/config.sun4.mk
@@ -1,13 +0,0 @@
-BUILD_TYPE = Unix
-DIRS =	src/libCom \
-	src/db \
-	src/ca \
-	src/toolsComm/antelope \
-	src/toolsComm/flex \
-	src/as \
-	src/bld \
-	src/dct \
-	src/util \
-	src/sequencer \
-	src/dbtools \
-	rec
--- a/config/CONFIG
+++ b/config/CONFIG
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #
 #  $Id$
 #
--- a/config/CONFIG.Host.Borland
+++ b/config/CONFIG.Host.Borland
@@ -1,10 +1,16 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Host.Borland
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Borland
 
-# 	Use std path variables from ms
-HOME = $(HOMEDRIVE)$(HOMEPATH)
-
 BORLAND_LIB = $(BORLAND)\\lib
 BORLAND_INC = $(BORLAND)\\include
 BORLAND_BIN = $(BORLAND)\\bin
@@ -104,7 +110,7 @@ CCC_TEMPL_INST_FLAG =
 # -w-8012 Comparing signed and unsigned values
 # -w-8060 Possibly incorrect assignment
 # -w-8071 Conversion may lose significant digits
-CCC_WARN_YES = -w -g0 -w-8012 -w-8060 -w-8071
+CCC_WARN_YES = -w -g0 -w-8012 -w-8060 -w-8071 -w-8008 -w-8027 -w-8066 -w-8080 -w-8004
 # -w- display warnings off
 CCC_WARN_NO = -w-

@@ -236,7 +242,7 @@ USR_DEPLIBS = $(foreach lib,$(USR_LIBS),$(firstword $(wildcard $($(lib)_DIR)/$(l

 # by default the libraries used when linking the DLL are just
 # PROD_LIBS ans SYS_PROD_LIBS minus the DLL name
-DLL_LIBS = $(subst $(LIBRARY),, $(PROD_LIBS))
+DLL_LIBS = $(patsubst $(LIBRARY),, $(PROD_LIBS))
 
 #
 #	EPICS libs that we need to link the DLL with
--- a/config/CONFIG.Host.Darwin
+++ b/config/CONFIG.Host.Darwin
@@ -0,0 +1,50 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# CONFIG.Host.Darwin
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.Darwin
+ 
+ARCH_CLASS = Darwin
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+#
+# The config files are a real mess.  The following set of definitions
+# seems to work for all the weird ways in which the extensions makefile
+# fragments use them.
+#
+ANSI = GCC
+CPLUSPLUS = c++
+CC = cc
+CXX= c++
+GCC = cc
+
+OP_SYS_CFLAGS += -no-cpp-precomp
+OP_SYS_INCLUDES = -I/sw/include -I/usr/X11R6/include
+OP_SYS_LDFLAGS += -L/sw/lib -L/usr/X11R6/lib
+
+#
+# Compiler/linker problems prevent the use of shared libraries at the moment
+#
+SHARED_LIBRARIES_Darwin = NO
+
+#
+# Something like this will be needed once shared libraries are built
+#
+SHRLIB_SUFFIX = .dylib$(SHARED_LIBRARIES)
+GCC_SHRLIB_LDFLAGS_YES += -dynamiclib -flat_namespace
+G++_SHRLIB_LDFLAGS_YES += -dynamiclib -flat_namespace
+
+#
+# Java
+#
+JAVA_DIR=/usr/
--- a/config/CONFIG.Host.Linux
+++ b/config/CONFIG.Host.Linux
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Host.Linux
 #
 #  This file is maintained by the EPICS community.
@@ -12,55 +21,19 @@ AR = ar -rc
 ARCMD = $(AR) $@
 RANLIB = ranlib -t

-#OP_SYS_FLAGS = -D_BSD_SOURCE -D_POSIX_SOURCE
+ANSI=GCC
+CPLUSPLUS=G++

-# Configure OS vendor C compiler
-ACC = gcc
-ACC_ANSI = $(ACC)
-#ACC_ANSI = $(ACC) -ansi -D_SVID_SOURCE
-#ACC_STRICT = $(ACC) -Xc
-ACC_STRICT = $(ACC) -pedantic
-#ACC_STRICT = $(ACC)  -ansi -pedantic -D_SVID_SOURCE
-ACC_TRAD = $(ACC)
-ACC_WARN_YES =  -Wall
-ACC_WARN_NO =  -w
-ACC_OPT_YES =  -O
-ACC_OPT_NO = -g
-ACC_SFLAGS_YES = -Bstatic
-ACC_SFLAGS_NO=
-ACC_SLIBS_YES =
-ACC_SLIBS_NO=
-ACC_SHRLIB_CFLAGS_YES =  -fPIC
-ACC_SHRLIB_LDFLAGS_YES =  -shared -Wl,-soname,$@ 
+GCC_SHRLIB_LDFLAGS_YES +=  -Wl,-soname,$@
+G++_SHRLIB_LDFLAGS_YES +=  -Wl,-soname,$@

+OP_SYS_CFLAGS += -D_BSD_SOURCE

-# Configure OS vendor C++ compiler
-CCC = g++
-CCC_NORMAL = $(CCC)
-CCC_STRICT = $(CCC)
-#CCC_TEMPL_INST_FLAG = -DEXPL_TEMPL
-CCC_WARN_YES =  -Wall
-CCC_WARN_NO =
-CCC_OPT_YES =  -O
-CCC_OPT_NO = -g
-CCC_SFLAGS_YES = -Bstatic
-CCC_SFLAGS_NO=
-CCC_SLIBS_YES =
-CCC_SLIBS_NO=
-CCC_DEPENDS_FLAG = -MM
-CCC_SHRLIB_CFLAGS_YES =  -fPIC
-CCC_SHRLIB_LDFLAGS_YES =  -shared -Wl,-soname,$@ 
+ARCH_DEP_CFLAGS = -D_X86_ -Dlinux -mcpu=pentium
+ARCH_DEP_LDLIBS += -lpthread -lreadline -lcurses -lrt

-# added smh 6/5/98 : when building fdmgr - seems to use this not ACC
-# in effect this overides orig def in CONFIG_COMMON :
-# which is GCC_STRICT = $(GCC) -ansi -pedantic
-GCC_STRICT = $(GCC) 
-G++_STRICT = $(G++)  -Wtraditional
-
-
-#ARCH_DEP_CFLAGS = -D_X86_ -Dlinux -D_USE_BSD
-ARCH_DEP_CFLAGS = -D_X86_ -Dlinux
-ARCH_DEP_LDFLAGS += -lpthread -lreadline -lcurses -lrt
+#Allows R3.13 built extensions to load R3.14 shared libs
+SYS_DLL_LIBS_Linux += pthread readline curses rt

 #glibc FAQ
 #	"_GNU_SOURCE:  glibc does not make the GNU extensions available 
@@ -75,4 +48,3 @@ ARCH_DEP_LDFLAGS += -lpthread -lreadline -lcurses -lrt
 #ARCH_DEP_CFLAGS += -D_GNU_SOURCE


-
--- a/config/CONFIG.Host.LynxOS
+++ b/config/CONFIG.Host.LynxOS
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Host.LynxOS
 #
 #  This file is maintained by the EPICS community.
--- a/config/CONFIG.Host.UnixCommon
+++ b/config/CONFIG.Host.UnixCommon
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 #
 #  Contains definitions common to all Unix archs
@@ -20,14 +29,12 @@ SHRLIB_SUFFIX = .so

 SHRLIBNAME = lib$(LIBRARY)$(SHRLIB_SUFFIX)$(SHRLIB_VERSION:%=.%)

-#For backward compatability only
-DLL_LIBS = $(subst $(LIBRARY),, $(PROD_LIBS))
-
-DLL_LDLIBS = $(PRODNAME_LIBS:%=-l%) $(DLL_LIBS:%=-l%)
+SYS_DLL_LIBS += $(SYS_DLL_LIBS_$(OS_CLASS))
+DLL_LIBS = $(patsubst $(LIBRARY),, $(PROD_LIBS) $(USR_LIBS)) $(SYS_DLL_LIBS)

 INSTALL_SHRLIB = $(INSTALL_LIB)

-LINK.shrlib= $(SHRLIB_LINKER) -o $@ $(CFLAGS) $(CPPFLAGS) $(SHRLIB_LDFLAGS) $(LDFLAGS)
+LINK.shrlib= $(SHRLIB_LINKER) -o $@ $(CFLAGS) $(CPPFLAGS) $(SHRLIB_LDFLAGS) $(DLL_LDFLAGS) $(LDFLAGS)

 #-------------------------------------------------------
 # Unix command definitions
@@ -50,16 +57,19 @@ COND_PROD_DEPLIBS = $(foreach prod,$(PROD), $(foreach lib, $($(basename $(prod))
 PRODNAME_DEPLIBS = $(foreach lib,$(PRODNAME_LIBS),$(firstword $(wildcard $($(lib)_DIR)/lib$(lib).* $(EPICS_BASE_LIB)/lib$(lib).*)))
 PROD_DEPLIBS = $(foreach lib,$(PROD_LIBS),$(firstword $(wildcard $($(lib)_DIR)/lib$(lib).* $(EPICS_BASE_LIB)/lib$(lib).*)))
 USR_DEPLIBS = $(foreach lib,$(USR_LIBS),$(firstword $(wildcard $($(lib)_DIR)/lib$(lib).* $(EPICS_BASE_LIB)/lib$(lib).*)))
-
+DLL_DEPLIBS = $(foreach lib,$(DLL_LIBS),$(firstword $(wildcard $($(lib)_DIR)/lib$(lib).* $(EPICS_BASE_LIB)/lib$(lib).*)))
 #--------------------------------------------------
 # Determine ld flags
 USR_DIRS = $(dir $(PRODNAME_DEPLIBS)) $(dir $(PROD_DEPLIBS))\
 $(dir $(USR_DEPLIBS))
 USR_LDFLAGS += $(sort $(USR_DIRS:%=-L%))
+DLL_DIRS = $(dir $(DLL_DEPLIBS))
+DLL_LDFLAGS = $(sort $(DLL_DIRS:%=-L%))

 # Determine ld libs
 USR_LDLIBS = $(PRODNAME_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\
 $(SYS_PROD_LIBS:%=-l%)
+DLL_LDLIBS = $(DLL_LIBS:%=-l%)

 #--------------------------------------------------
 # Operating system definitions
--- a/config/CONFIG.Host.WIN32
+++ b/config/CONFIG.Host.WIN32
@@ -1,11 +1,17 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Host.WIN32
 #
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.WIN32
 
-# 	Use std path variables from ms
-HOME = $(HOMEDRIVE)$(HOMEPATH)
-
 #
 # You currently get Visual C++ even if you ask for GNU.
 #
@@ -127,9 +133,9 @@ CCC_SFLAGS_NO= /MD$(VISC_SFLAGS_DEBUG) $(VISC_EPICS_DLL)
 CCC_SLIBS_YES=
 CCC_SLIBS_NO=

-LINK_OPT_FLAGS_YES = /WARN:3 /incremental:no /opt:ref\
+LINK_OPT_FLAGS_YES = /warn:3 /incremental:no /opt:ref\
 /release $(PROD_VERSION:%=/version:%)
-LINK_OPT_FLAGS_NO = /WARN:3 /debug 
+LINK_OPT_FLAGS_NO = /warn:3 /debug 
 OPT_LDFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT))

 ARCH_DEP_CFLAGS=
@@ -236,7 +242,7 @@ USR_DEPLIBS = $(foreach lib,$(USR_LIBS),$(firstword $($(lib)_DIR) $(EPICS_BASE_L

 # by default the libraries used when linking the DLL are just
 # PROD_LIBS ans SYS_PROD_LIBS minus the DLL name
-DLL_LIBS = $(subst $(LIBRARY),, $(PROD_LIBS))
+DLL_LIBS = $(patsubst $(LIBRARY),, $(PROD_LIBS))
 
 #
 #	EPICS libs that we need to link the DLL with
@@ -256,3 +262,6 @@ LINK.cc = $(WINLINK) -nologo $(LDFLAGS) -out:$@
 # $(dir $(USR_DEPLIBS))
 #USR_LDFLAGS += $(sort $(USR_DIRS:%=-L%))

+# Overrides for CONFIG_COMMON default
+POSIX_CPPFLAGS_YES = 
+
--- a/config/CONFIG.Host.alpha
+++ b/config/CONFIG.Host.alpha
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Host.alpha
 #
 #  This file is maintained by the EPICS community.
--- a/config/CONFIG.Host.cygwin32
+++ b/config/CONFIG.Host.cygwin32
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Host.cygwin32
 #
 #  This file is maintained by the EPICS community.
@@ -32,3 +41,4 @@ OP_SYS_LDLIBS =
 GCC_DEP_CFLAGS = -D_REENTRANT
 G++_DEP_CFLAGS = -D_REENTRANT

+POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
--- a/config/CONFIG.Host.darwin-ppc
+++ b/config/CONFIG.Host.darwin-ppc
@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Darwin
--- a/config/CONFIG.Host.hp700
+++ b/config/CONFIG.Host.hp700
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Host.hp700
 #
 #  This file is maintained by the EPICS community.
@@ -27,6 +36,7 @@ ACC_SLIBS_YES =
 ACC_SLIBS_NO=
 ACC_SHRLIB_CFLAGS_YES = +Z
 ACC_SHRLIB_LDFLAGS_YES = -b
+ACC_DEP_CFLAGS=+DAportable

 # Configure OS vendor C++ compiler
 HPCC = cc 
@@ -43,6 +53,7 @@ HPCC_SLIBS_YES =
 HPCC_SLIBS_NO=
 HPCC_SHRLIB_CFLAGS_YES = +Z
 HPCC_SHRLIB_LDFLAGS_YES = -b
+HPCC_DEP_CFLAGS=+DAportable

 #Old HP C++ compiler
 #CCC = CC
@@ -67,11 +78,12 @@ CCC_SHRLIB_CFLAGS_YES = +Z
 # then by searching the specified path (see below)
 CCC_SHRLIB_LDFLAGS_YES = -b
 CCC_DEPENDS_FLAG = +m
+CCC_DEP_CFLAGS=+DAportable

 # +DAportable causes portable object code to be created for execution
 # on different PA-Risc machines
-ARCH_DEP_CFLAGS = -D_HPUX_SOURCE -DHP_UX +DAportable
-ARCH_DEP_CXXFLAGS = -D_HPUX_SOURCE -DHP_UX +DAportable
+ARCH_DEP_CFLAGS = -D_HPUX_SOURCE -DHP_UX 
+ARCH_DEP_CXXFLAGS = -D_HPUX_SOURCE -DHP_UX
 ARCH_DEP_LDLIBS =
 ARCH_DEP_LDFLAGS = -Wl,+b$(DEFAULT_SHRLIB_SEARCH_PATH),+s

--- a/config/CONFIG.Host.hpux-m68k
+++ b/config/CONFIG.Host.hpux-m68k
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# hpux-m68k is the new name for hp700
+-include $(EPICS_BASE)/config/CONFIG.Host.hp700
--- a/config/CONFIG.Host.linux-x86
+++ b/config/CONFIG.Host.linux-x86
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # linux-x86 is the new name for linux
--- a/config/CONFIG.Host.osf-alpha
+++ b/config/CONFIG.Host.osf-alpha
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# osf-alpha is the new name for alpha
+-include $(EPICS_BASE)/config/CONFIG.Host.alpha
--- a/config/CONFIG.Host.sgi
+++ b/config/CONFIG.Host.sgi
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Host.sgi
 #
 #  This file is maintained by the EPICS community.
--- a/config/CONFIG.Host.solaris
+++ b/config/CONFIG.Host.solaris
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Host.solaris
 #
 #  This file is maintained by the EPICS community.
@@ -26,7 +35,8 @@ ACC = $(SPARCWORKS)/bin/cc
 ACC_ANSI = $(ACC) -Xa -v
 ACC_STRICT = $(ACC) -Xc -v
 ACC_TRAD = $(ACC) -Xs
-ACC_DEP_CFLAGS = -KPIC -D_REENTRANT 
+ACC_DEP_CFLAGS = -KPIC
+
 ACC_WARN_YES = 
 ACC_WARN_NO =  -w
 ACC_OPT_YES =  -O
@@ -36,13 +46,13 @@ ACC_SFLAGS_NO=
 ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
 ACC_SLIBS_NO=
 ACC_SHRLIB_CFLAGS_YES =
-ACC_SHRLIB_LDFLAGS_YES =  -G -h $@
+ACC_SHRLIB_LDFLAGS_YES =  -G -h $@ -z ignore -z combreloc -z lazyload

 # Configure OS vendor C++ compiler
 CCC = $(SPARCWORKS)/bin/CC
 CCC_NORMAL = $(CCC) +p
 CCC_STRICT = $(CCC) +p
-CCC_DEP_CFLAGS = -KPIC -D_REENTRANT 
+CCC_DEP_CFLAGS = -KPIC
 CCC_TEMPL_INST_FLAG =
 CCC_WARN_YES = +w
 CCC_WARN_NO = 
@@ -54,11 +64,16 @@ CCC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
 CCC_SLIBS_NO=
 CCC_DEPENDS_FLAG = -xM1
 CCC_SHRLIB_CFLAGS_YES =
-CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
+CCC_SHRLIB_LDFLAGS_YES =  -G -h $@ -z ignore -z combreloc -z lazyload
 

-ARCH_DEP_CFLAGS = -DSOLARIS 
-# socket and nsl needed by libca.a
-ARCH_DEP_LDLIBS = -lsocket -lnsl
-ARCH_DEP_LDLIBS += -lposix4 -lpthread -lthread
+ARCH_DEP_CFLAGS = -DSOLARIS=$(subst 5.,,$(shell uname -r)) 
+POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
+
+# socket and nsl needed by libca.a
+ARCH_DEP_LDLIBS += -lsocket -lnsl
+ARCH_DEP_LDLIBS += -lposix4 -lpthread
+
+#Allows R3.13 built extensions to load R3.14 shared libs
+SYS_DLL_LIBS_solaris += posix4 pthread Crun

--- a/config/CONFIG.Host.solaris-sparc
+++ b/config/CONFIG.Host.solaris-sparc
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # solaris-sparc is the new name for solaris
--- a/config/CONFIG.Host.solaris-sparc-gnu
+++ b/config/CONFIG.Host.solaris-sparc-gnu
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # solaris-sparc is the new name for solaris
--- a/config/CONFIG.Host.solaris-x86
+++ b/config/CONFIG.Host.solaris-x86
@@ -1,66 +1,22 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Host.solaris-x86
 #
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Host.solaris-x86

-ARCH_CLASS = solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solaris

-# Include definitions common to all Unix archs
-include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+# Solaris on x86
+ARCH_DEP_CFLAGS = -DSOLARIS=$(subst 5.,,$(shell uname -r))  -D_X86_  -D__EXTENSIONS__

-#
-# required by sun's C++ compiler
-#
-AR = ar
-_AR = $(AR) $(ARFLAGS)
-G++_AR = $(_AR)
-CCC_AR = $(CCC) -xar -o
-ARCMD = $($(CPLUSPLUS)_AR) $@
-
-RANLIB =
-
-SPARCWORKS = /opt/SUNWspro
-
-# Configure OS vendor C compiler
-ACC = $(SPARCWORKS)/bin/cc
-ACC_ANSI = $(ACC) -Xa
-ACC_STRICT = $(ACC) -Xc -v
-ACC_TRAD = $(ACC) -Xs
-ACC_DEP_CFLAGS = -KPIC -D_REENTRANT 
-ACC_WARN_YES = 
-ACC_WARN_NO =  -w
-ACC_OPT_YES =  -O
-ACC_OPT_NO = -g
-ACC_SFLAGS_YES= -Bstatic
-ACC_SFLAGS_NO=
-ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
-ACC_SLIBS_NO=
-ACC_SHRLIB_CFLAGS_YES =
-ACC_SHRLIB_LDFLAGS_YES =  -G -h $@
-
-# Configure OS vendor C++ compiler
-CCC = $(SPARCWORKS)/bin/CC
-CCC_NORMAL = $(CCC) +p
-CCC_STRICT = $(CCC) +p
-CCC_DEP_CFLAGS = -KPIC -D_REENTRANT 
-CCC_TEMPL_INST_FLAG =
-CCC_WARN_YES = +w
-CCC_WARN_NO = 
-CCC_OPT_YES =  -O
-CCC_OPT_NO = -g
-CCC_SFLAGS_YES= -Bstatic
-CCC_SFLAGS_NO=
-CCC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
-CCC_SLIBS_NO=
-CCC_DEPENDS_FLAG = -xM1
-CCC_SHRLIB_CFLAGS_YES =
-CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
- 
 GCC = gcc
 G++ = g++

-# Solaris on x86
-ARCH_DEP_CFLAGS = -DSOLARIS  -D_X86_
-# socket and nsl needed by libca.a
-ARCH_DEP_LDLIBS = -lsocket -lnsl
-
--- a/config/CONFIG.Host.solaris-x86-gnu
+++ b/config/CONFIG.Host.solaris-x86-gnu
@@ -0,0 +1,25 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# CONFIG.Host.solaris-x86
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.solaris-x86
+
+-include $(EPICS_BASE)/config/CONFIG.Host.solaris
+
+# Solaris on x86
+ARCH_DEP_CFLAGS = -DSOLARIS  -D_X86_
+
+GCC = gcc
+G++ = g++
+
+ANSI=GCC
+CPLUSPLUS=G++
+
--- a/config/CONFIG.Host.sun4
+++ b/config/CONFIG.Host.sun4
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Host.sun4
 #
 #  This file is maintained by the EPICS community.
--- a/config/CONFIG.Host.sun4-sparc
+++ b/config/CONFIG.Host.sun4-sparc
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# sun4-sparc is the new name for sun4
+-include $(EPICS_BASE)/config/CONFIG.Host.sun4
--- a/config/CONFIG.Host.win32-x86
+++ b/config/CONFIG.Host.win32-x86
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # win32-x86 is the new name for WIN32
--- a/config/CONFIG.Host.win32-x86-borland
+++ b/config/CONFIG.Host.win32-x86-borland
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# win32-x86-borland is the new name for Borland
+-include $(EPICS_BASE)/config/CONFIG.Host.Borland
--- a/config/CONFIG.LynxOS
+++ b/config/CONFIG.LynxOS
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$
 #
 # This file contains definitions for Vx builds
@@ -20,7 +29,6 @@ CXX = g++
 # the override definitions.
 
 # Tornado directory definitions
-VX_CONFIG_DIR_YES =
 VX_INCLUDE_YES =
 VX_GNU_YES =
 VX_GNU_BIN_YES =
@@ -28,14 +36,12 @@ VX_GNU_LIB_YES =


 # pre Torando directory definitions
-VX_CONFIG_DIR_NO =
 VX_INCLUDE_NO =
 VX_GNU_NO =
 VX_GNU_BIN_NO =
 
 # directory definitions
 VX_DIR =
-VX_CONFIG_DIR =
 VX_INCLUDE =
 VX_GNU = 

--- a/config/CONFIG.Vx
+++ b/config/CONFIG.Vx
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$
 #
 # This file contains definitions for Vx builds
@@ -15,21 +24,18 @@ OS_CLASS = vxWorks
 # the override definitions.

 # Tornado directory definitions
-VX_CONFIG_DIR_YES = $(VX_DIR)/target/config
 VX_INCLUDE_YES = $(VX_DIR)/target/h
 VX_GNU_YES = $(VX_DIR)/host/$(WIND_HOST_TYPE)
 VX_GNU_BIN_YES = $(VX_GNU)/bin
 VX_GNU_LIB_YES = $(VX_GNU)/lib

 # pre Torando directory definitions
-VX_CONFIG_DIR_NO = $(VX_DIR)/config
 VX_INCLUDE_NO = $(VX_DIR)/h
 VX_GNU_BIN_NO = $(VX_GNU)/$(HOST_ARCH).$(ARCH_CLASS)/bin
 VX_GNU_LIB_NO = $(VX_GNU)/$(HOST_ARCH).$(ARCH_CLASS)/lib

 # directory definitions
 VX_DIR = $(VX_DIR_$(TORNADO))
-VX_CONFIG_DIR = $(VX_CONFIG_DIR_$(TORNADO))
 VX_INCLUDE = $(VX_INCLUDE_$(TORNADO))
 VX_GNU = $(VX_GNU_$(TORNADO))
 GNU_BIN = $(VX_GNU_BIN_$(TORNADO))
@@ -90,6 +96,7 @@ LD_CXX = $(LD_$(CPLUSPLUS))
 # Override flags in CONFIG_COMMON
 GCC_DEP_CFLAGS = -D_REENTRANT
 G++_DEP_CFLAGS = -D_REENTRANT
+POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE

 #--------------------------------------------------
 # Operating system flags
--- a/config/CONFIG.Vx.frc40
+++ b/config/CONFIG.Vx.frc40
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$
 #
 # This file is maintained by the EPICS community.
--- a/config/CONFIG.Vx.frc5ce
+++ b/config/CONFIG.Vx.frc5ce
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG.Vx.frc5ce

 # Vx GNU cross compiler suffix
--- a/config/CONFIG.Vx.hkbaja47
+++ b/config/CONFIG.Vx.hkbaja47
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # $Id$
 #
--- a/config/CONFIG.Vx.hkbaja60
+++ b/config/CONFIG.Vx.hkbaja60
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # $Id$
 #
--- a/config/CONFIG.Vx.hkv2f
+++ b/config/CONFIG.Vx.hkv2f
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # $Id$
 #
--- a/config/CONFIG.Vx.mv147
+++ b/config/CONFIG.Vx.mv147
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # $Id$
 #
--- a/config/CONFIG.Vx.mv1604
+++ b/config/CONFIG.Vx.mv1604
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$
 #
 # This file is maintained by the EPICS community.
--- a/config/CONFIG.Vx.mv162
+++ b/config/CONFIG.Vx.mv162
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # $Id$
 #
--- a/config/CONFIG.Vx.mv162lc
+++ b/config/CONFIG.Vx.mv162lc
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # $Id$
 #
--- a/config/CONFIG.Vx.mv167
+++ b/config/CONFIG.Vx.mv167
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # $Id$
 #
--- a/config/CONFIG.Vx.mv177
+++ b/config/CONFIG.Vx.mv177
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # $Id$
 #
--- a/config/CONFIG.Vx.mv2700
+++ b/config/CONFIG.Vx.mv2700
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # $Id$
 #
--- a/config/CONFIG.Vx.niCpu030
+++ b/config/CONFIG.Vx.niCpu030
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 #  CONFIG.Vx.niCpu030
 #
@@ -11,6 +20,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k

 # Architecture specific build flags
-ARCH_DEP_CPPFLAGS = -DCPU=MC68030
+ARCH_DEP_CPPFLAGS = -DCPU=MC68030 -DNICPU030
 ARCH_DEP_CFLAGS = -m68030
 
--- a/config/CONFIG.Vx.pc486
+++ b/config/CONFIG.Vx.pc486
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # CONFIG.Vx.pc486
 #
--- a/config/CONFIG.Vx.pcPentium
+++ b/config/CONFIG.Vx.pcPentium
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # CONFIG.Vx.pentium
 #
--- a/config/CONFIG.Vx.ppc603
+++ b/config/CONFIG.Vx.ppc603
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$
 #
 # This file is maintained by the EPICS community.
--- a/config/CONFIG.Vx.ppc604
+++ b/config/CONFIG.Vx.ppc604
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$
 #
 # This file is maintained by the EPICS community.
--- a/config/CONFIG.Vx.simpc
+++ b/config/CONFIG.Vx.simpc
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # CONFIG.Vx.simpc
 #
--- a/config/CONFIG.Vx.vxWorks-486
+++ b/config/CONFIG.Vx.vxWorks-486
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # vxWorks-486 is the new R3.14 name for pc486
--- a/config/CONFIG.Vx.vxWorks-68040
+++ b/config/CONFIG.Vx.vxWorks-68040
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # vxWorks-68040 is the new R3.14 name for mv167
--- a/config/CONFIG.Vx.vxWorks-68040lc
+++ b/config/CONFIG.Vx.vxWorks-68040lc
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # vxWorks-68040lc is the new R3.14 name for mv162lc
--- a/config/CONFIG.Vx.vxWorks-68060
+++ b/config/CONFIG.Vx.vxWorks-68060
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # vxWorks-68060 is the new R3.14 name for mv177
--- a/config/CONFIG.Vx.vxWorks-ppc604
+++ b/config/CONFIG.Vx.vxWorks-ppc604
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # vxWorks-ppc604 is the new R3.14 name for ppc604
--- a/config/CONFIG.Vx.vxipc
+++ b/config/CONFIG.Vx.vxipc
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 # CONFIG.Vx.VXIpc
 #
--- a/config/CONFIG_BASE
+++ b/config/CONFIG_BASE
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #
 #  $Id$
 #
@@ -49,3 +58,25 @@ endif

 EPICS_BASE = $(INSTALL_LOCATION)

+Com_DIR             = $(EPICS_BASE_LIB)
+asHost_DIR          = $(EPICS_BASE_LIB)
+asIoc_DIR           = $(EPICS_BASE_LIB)
+ca_DIR              = $(EPICS_BASE_LIB)
+cas_DIR             = $(EPICS_BASE_LIB)
+dbIoc_DIR           = $(EPICS_BASE_LIB)
+dbStaticHost_DIR    = $(EPICS_BASE_LIB)
+dbStaticIoc_DIR     = $(EPICS_BASE_LIB)
+dbtoolsIoc_DIR      = $(EPICS_BASE_LIB)
+gdd_DIR             = $(EPICS_BASE_LIB)
+iocsh_DIR           = $(EPICS_BASE_LIB)
+miscIoc_DIR         = $(EPICS_BASE_LIB)
+recIoc_DIR          = $(EPICS_BASE_LIB)
+registryIoc_DIR     = $(EPICS_BASE_LIB)
+rsrvIoc_DIR         = $(EPICS_BASE_LIB)
+softDevIoc_DIR      = $(EPICS_BASE_LIB)
+testDevIoc_DIR      = $(EPICS_BASE_LIB)
+recIocObj_DIR       = $(EPICS_BASE_LIB)
+softDevIocObj_DIR   = $(EPICS_BASE_LIB)
+testDevIocObj_DIR   = $(EPICS_BASE_LIB)
+iocCore_DIR         = $(EPICS_BASE_LIB)
+
--- a/config/CONFIG_BASE_VERSION
+++ b/config/CONFIG_BASE_VERSION
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #
 #  $Id$
 #
@@ -10,17 +19,15 @@
 EPICS_VERSION=3
 EPICS_REVISION=14
 EPICS_MODIFICATION=0
-EPICS_UPDATE_NAME=alpha
+EPICS_UPDATE_NAME=beta
 EPICS_UPDATE_LEVEL=2

 EPICS_LOCAL_NAME=B
 EPICS_LOCAL_VERSION=0

-CVS_DATE="\$$Date$$"
-CVS_TAG="\$$Name$$"
-
 EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}.$(EPICS_LOCAL_NAME)$(EPICS_LOCAL_VERSION)"

 CVS_DATE="\$$Date$$"
+CVS_TAG="\$$Name$$"

 BASE_3_14=YES
--- a/config/CONFIG_COMMON
+++ b/config/CONFIG_COMMON
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #
 #  $Id$
 #
@@ -79,9 +88,10 @@ GCC_ANSI = $(GCC) -ansi
 GCC_STRICT = $(GCC) -ansi -pedantic
 GCC_TRAD = $(GCC) -traditional
 GCC_DEP_CFLAGS = -fPIC -D_REENTRANT
+
 GCC_WARN_YES = -Wall
 GCC_WARN_NO = -w
-GCC_OPT_YES = -O
+GCC_OPT_YES = -O3
 GCC_OPT_NO = -g
 GCC_SFLAGS_YES = -static
 GCC_SFLAGS_NO =
@@ -100,7 +110,7 @@ G++_WARN_YES = -Wall \
      -Wwrite-strings -Wconversion -Wstrict-prototypes\
      -Wpointer-arith -Winline
 G++_WARN_NO = -w
-G++_OPT_YES = -O
+G++_OPT_YES = -O3
 G++_OPT_NO = -g
 G++_SFLAGS_YES = -static
 G++_SFLAGS_NO =
@@ -175,9 +185,18 @@ TEMPL_INST_CXXFLAG = $($(CPLUSPLUS)_TEMPL_INST_FLAG)
 #--------------------------------------------------
 # Epics includes (CONFIG.Vx will override OS_CLASS)
 OS_CLASS = $(ARCH_CLASS)
-EPICS_INCLUDES = -I$(INSTALL_INCLUDE) -I$(INSTALL_INCLUDE)/os/$(OS_CLASS)
+EPICS_INCLUDES = -I$(INSTALL_INCLUDE)/os/$(OS_CLASS) -I$(INSTALL_INCLUDE)
 EPICS_DBDFLAGS = -I $(INSTALL_LOCATION)/dbd

+#--------------------------------------------------
+# Posix flags
+POSIX=YES
+POSIX_CPPFLAGS_YES += -D_POSIX_C_SOURCE=199506L
+POSIX_LDLIBS_YES +=
+
+POSIX_CPPFLAGS += $(POSIX_CPPFLAGS_$(POSIX))
+POSIX_LDLIBS += $(POSIX_LDLIBS_$(POSIX))
+
 #--------------------------------------------------
 # Warnings flags  (CONFIG.Vx will override)
 WARN_CFLAGS = $($(ANSI)_WARN_$(HOST_WARN))
@@ -222,9 +241,9 @@ LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\
 $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS)

 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS)\
- $(STATIC_LDLIBS) $(OP_SYS_LDLIBS)
+ $(STATIC_LDLIBS) $(OP_SYS_LDLIBS) $(POSIX_LDLIBS)

-CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(POSIX_CPPFLAGS)

 CPPSNCFLAGS = $(INCLUDES)

--- a/config/CONFIG_COMPAT
+++ b/config/CONFIG_COMPAT
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #
 # $Id$
 #
@@ -5,13 +14,15 @@

 #Syntax:
 # ARCH_<host_arch> = <epics_host_arch>
+ARCH_solarisGnu = solaris-sparc-gnu
 ARCH_solaris = solaris-sparc
 ARCH_sun4 = sun4-sparc
 ARCH_Linux = linux-x86
 ARCH_WIN32 = win32-x86
 ARCH_hp700 = hpux-m68k
-ARCH_hp700 = osf-alpha
+ARCH_alpha = osf-alpha
 ARCH_Borland = win32-x86-borland
+ARCH_cygwin32 = win32-x86-cygwin

 ifndef EPICS_HOST_ARCH
 ifdef HOST_ARCH
@@ -22,3 +33,15 @@ endif
 endif

 HOST_ARCH := $(EPICS_HOST_ARCH)
+
+# Note: 
+# The EPICS_HOST_ARCH solaris-<arch>-gnu is new for base release R3.14
+# so existing R3.13 applications, when HOST_ARCH is set to solaris and
+# when built with R3.14, will look for base solaris-<arch> directories
+# and not solaris-<arch>-gnu. If you plan to build R3.13 applications 
+# against a solaris-<arch>-gnu built R3.14 base, you should set
+# ANSI=GCC and CPLUSPLUS=G++ in base/config/CONFIG_SITE.Host.solaris
+# and change ARCH_solaris=solaris-<arch> to ARCH_solaris=solaris-<arch>-gnu
+# in base/config/CONFIG_COMPAT.
+
+
--- a/config/CONFIG_ENV
+++ b/config/CONFIG_ENV
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #	$Id$
 #	Author:	Andrew Johnson
 #	Date:	20 April 1995
--- a/config/CONFIG_HOST_ARCH.Borland
+++ b/config/CONFIG_HOST_ARCH.Borland
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #  CONFIG_HOST_ARCH.Borland
 #

@@ -15,6 +24,9 @@ ECHO=echo

 WIND_HOST_TYPE = x86-win32
 
-# 	Use std path variables from ms
+# Does not work if using cygwin make
+# because HOME is always defined
+ifndef HOME
 HOME = $(HOMEDRIVE)$(HOMEPATH)
+endif

--- a/config/CONFIG_HOST_ARCH.Darwin
+++ b/config/CONFIG_HOST_ARCH.Darwin
@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+#  CONFIG_HOST_ARCH.Darwin
+#
+# Override values in CONFIG.Vx
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
--- a/config/CONFIG_HOST_ARCH.Linux
+++ b/config/CONFIG_HOST_ARCH.Linux
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #  CONFIG_HOST_ARCH.Linux
 #
 # Override values in CONFIG.Vx
--- a/config/CONFIG_HOST_ARCH.LynxOS
+++ b/config/CONFIG_HOST_ARCH.LynxOS
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #  CONFIG_HOST_ARCH.LynxOS
 #
 # Override values in CONFIG.LynxOS
--- a/config/CONFIG_HOST_ARCH.UnixCommon
+++ b/config/CONFIG_HOST_ARCH.UnixCommon
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************

 #  CONFIG_HOST_ARCH.UnixCommon
 #
--- a/config/CONFIG_HOST_ARCH.WIN32
+++ b/config/CONFIG_HOST_ARCH.WIN32
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #  CONFIG_HOST_ARCH.WIN32
 #

@@ -14,6 +23,9 @@ ECHO=echo

 WIND_HOST_TYPE = x86-win32
 
-# 	Use std path variables from ms
+# Does not work if using cygwin make
+# because HOME is always defined
+ifndef HOME
 HOME = $(HOMEDRIVE)$(HOMEPATH)
+endif

--- a/config/CONFIG_HOST_ARCH.alpha
+++ b/config/CONFIG_HOST_ARCH.alpha
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #  CONFIG_HOST_ARCH.alpha
 #
 # Override values in CONFIG.Vx
--- a/config/CONFIG_HOST_ARCH.cygwin32
+++ b/config/CONFIG_HOST_ARCH.cygwin32
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # CONFIG_HOST_ARCH.cygwin32
 #
 # This file is maintained by the EPICS community.
--- a/config/CONFIG_HOST_ARCH.darwin-ppc
+++ b/config/CONFIG_HOST_ARCH.darwin-ppc
@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Darwin
--- a/config/CONFIG_HOST_ARCH.hp700
+++ b/config/CONFIG_HOST_ARCH.hp700
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #  CONFIG_HOST_ARCH.hp700
 #
 # Override values in CONFIG.Vx
--- a/config/CONFIG_HOST_ARCH.hpux-m68k
+++ b/config/CONFIG_HOST_ARCH.hpux-m68k
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# hpux-m68k is the new name for hp700
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.hp700
--- a/config/CONFIG_HOST_ARCH.linux-x86
+++ b/config/CONFIG_HOST_ARCH.linux-x86
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # linux-x86 is the new name for linux
--- a/config/CONFIG_HOST_ARCH.osf-alpha
+++ b/config/CONFIG_HOST_ARCH.osf-alpha
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# osf-alpha is the new name for alpha
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.alpha
--- a/config/CONFIG_HOST_ARCH.sgi
+++ b/config/CONFIG_HOST_ARCH.sgi
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #  CONFIG_HOST_ARCH.sgi
 #
 # Override values in CONFIG.Vx
--- a/config/CONFIG_HOST_ARCH.solaris
+++ b/config/CONFIG_HOST_ARCH.solaris
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #  CONFIG_HOST_ARCH.solaris
 #
 # Override values in CONFIG.Vx
--- a/config/CONFIG_HOST_ARCH.solaris-sparc
+++ b/config/CONFIG_HOST_ARCH.solaris-sparc
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # solaris-sparc is the new name for solaris
--- a/config/CONFIG_HOST_ARCH.solaris-sparc-gnu
+++ b/config/CONFIG_HOST_ARCH.solaris-sparc-gnu
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #  $Id$

 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris
--- a/config/CONFIG_HOST_ARCH.solaris-x86
+++ b/config/CONFIG_HOST_ARCH.solaris-x86
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #  CONFIG_HOST_ARCH.solaris-x86
 #
 # Override values in CONFIG.Vx
--- a/config/CONFIG_HOST_ARCH.solaris-x86-gnu
+++ b/config/CONFIG_HOST_ARCH.solaris-x86-gnu
@@ -0,0 +1,4 @@
+#  $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris
+
--- a/config/CONFIG_HOST_ARCH.sun4
+++ b/config/CONFIG_HOST_ARCH.sun4
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #  CONFIG_HOST_ARCH.sun4
 #
 # Override values in CONFIG.Vx
--- a/config/CONFIG_HOST_ARCH.sun4-sparc
+++ b/config/CONFIG_HOST_ARCH.sun4-sparc
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# sun4-sparc is the new name for sun4
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.sun4
--- a/config/CONFIG_HOST_ARCH.win32-x86
+++ b/config/CONFIG_HOST_ARCH.win32-x86
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 # win32-x86 is the new name for WIN32
--- a/config/CONFIG_HOST_ARCH.win32-x86-borland
+++ b/config/CONFIG_HOST_ARCH.win32-x86-borland
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# win32-x86-borland is the new name for Borland
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Borland
--- a/config/CONFIG_SITE
+++ b/config/CONFIG_SITE
@@ -66,7 +66,7 @@ TORNADO=YES
 #  VxWorks directory for TORNADO=YES
 #VX_DIR_YES=c:\\Tornado
 #VX_DIR_YES = /usr/local/vw/tornado101
-VX_DIR_YES = /usr/local/vw/tornado20
+VX_DIR_YES = /usr/local/vw/tornado202

 #  VxWorks directory for TORNADO=NO
 #VX_DIR_NO=$(VW)
--- a/config/CONFIG_SITE.Host.darwin-ppc
+++ b/config/CONFIG_SITE.Host.darwin-ppc
@@ -0,0 +1,5 @@
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_SITE.Host.Darwin
+
+SHARED_LIBRARIES=NO
--- a/config/CONFIG_SITE.Host.hpux-m68k
+++ b/config/CONFIG_SITE.Host.hpux-m68k
@@ -0,0 +1,4 @@
+# $Id$
+
+# hpux-m68k is the new name for hp700
+-include $(EPICS_BASE)/config/CONFIG_SITE.Host.hp700
--- a/config/CONFIG_SITE.Host.linux-x86
+++ b/config/CONFIG_SITE.Host.linux-x86
@@ -3,4 +3,5 @@
 # linux-x86 is the new name for linux
 -include $(EPICS_BASE)/config/CONFIG_SITE.Host.Linux

-SHARED_LIBRARY=YES
+#SHARED_LIBRARIES=YES
+
--- a/config/CONFIG_SITE.Host.win32-x86-borland
+++ b/config/CONFIG_SITE.Host.win32-x86-borland
@@ -0,0 +1,4 @@
+# $Id$
+
+# win32-x86-borland is the new name for Borland
+-include $(EPICS_BASE)/config/CONFIG_SITE.Host.Borland
--- a/config/CONFIG_SITE.Vx.linux-x86
+++ b/config/CONFIG_SITE.Vx.linux-x86
@@ -0,0 +1,6 @@
+# $Id$
+#
+# This file contains overrides for Vx builds
+
+-include $(EPICS_BASE)/config/CONFIG_SITE.Vx.Linux
+
--- a/config/Makefile
+++ b/config/Makefile
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #
 # $Id$
 #
@@ -11,8 +20,5 @@ INSTALL_CONFIG = $(INSTALL_LOCATION)/config
 CONFIGS += $(subst ../,,$(wildcard ../CONFIG*))
 CONFIGS += $(subst ../,,$(wildcard ../RULES*))

-BIN_INSTALLS += $(wildcard ../tools/*.pl)
-BIN_INSTALLS += ../tools/installEpics
-
 include $(TOP)/configure/RULES

--- a/config/RULES.Db
+++ b/config/RULES.Db
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$
 #
 #	Rules for making things related to databases
@@ -7,7 +16,7 @@ MAKEBPT		= $(EPICS_BASE_HOST_BIN)/makeBpt$(EXE)
 ifndef MSI
 # Tool from R3.14 extensions bin, R3.13 extensions bin, or user path
 MSI = $(firstword $(wildcard $(EPICS_EXTENSIONS_HOST_BIN)/msi$(HOSTEXE) \
-         $(EPICS_EXTENSIONS)/bin/$(HOST_OS_CLASS)/msi$(HOSTEXE)) msi$(HOSTEXE))
+         $(EPICS_EXTENSIONS)/bin/$(HOST_ARCH)/msi$(HOSTEXE)) msi$(HOSTEXE))
 endif

 DBEXPAND	= $(EPICS_BASE_HOST_BIN)/dbExpand$(EXE)
--- a/config/RULES.Host
+++ b/config/RULES.Host
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$
 #
 #	Rules for making things specified in Makefile.Host
@@ -225,7 +234,7 @@ endif
 #	(convenience for extensions and applications)
 ifneq ($(EPICS_BASE),$(TOP))
 ifneq ($(EPICS_BASE),$(INSTALL_LOCATION))
-EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS)
+EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS) -I$(EPICS_BASE_INCLUDE)
 EPICS_DBDFLAGS += -I $(EPICS_BASE)/dbd
 endif
 endif
@@ -306,11 +315,6 @@ LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS)
 LIBNAME_RCS=$(foreach lib, $(basename $(LIBRARY)), $(RCS) $($(lib)_RCS) $($(lib)_RCS_$(ARCH_CLASS)))
 LIBNAME_RESS=$(addsuffix $(RES), $(basename $(LIBNAME_RCS)))

-ifneq ($(words $(DLL_LIBS)), $(words $(DLL_DEPLIBS)))
-#  If invalid library names, don't make DLL file
-SHARED_LIBRARIES = NO
-endif
-
 #  check if shared libraries requested
 ifeq ($(strip $(SHARED_LIBRARIES)),YES)

@@ -329,8 +333,6 @@ endif # LIBOBJS
 endif # LIBRARY

 #---------------------------------------------------------------
-#	Main targets
-
 all::	install

 build:: inc
@@ -407,7 +409,7 @@ endif
 PRODNAME_OBJS=$(addsuffix $(OBJ), $(basename $(PRODNAME_SRCS)))
 PRODNAME_RESS=$(addsuffix $(RES), $(basename $(PRODNAME_RCS)))

-ifeq ($(HOST_ARCH),Borland)
+ifdef BORLANDC
 $(PRODNAME): $(PRODNAME_OBJS) $(PRODNAME_RESS)
 	@$(RM) $@
 	$(PRODNAME_LINKER) $(PRODNAME_OBJS) , $@ ,,$(LINKLIBS) $(subst /,\\,$(LDLIBS)),, $(PRODNAME_RESS)
@@ -468,7 +470,8 @@ JAR_OPTIONS = cvf
 ifdef MANIFEST
 JAR_OPTIONS = cvmf
 endif
-JAR_DEPFILES +=  $(wildcard $(JAR_INPUT) $(addsuffix /*,$(JAR_INPUT)))
+#JAR_DEPFILES +=  $(wildcard $(JAR_INPUT) $(addsuffix /*,$(JAR_INPUT)))
+JAR_DEPFILES +=  $(JAR_INPUT)

 $(DIRECTORY_TARGETS) :
 	$(MKDIR) $@
@@ -497,7 +500,7 @@ $(JAR):%.jar:  $(JAR_DEPFILES)

 $(INSTALL_JAVA)/%.jar: %.jar
 	@echo "Installing jar file $@"
-	$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m 644 $< $(@D)

 $(PACKAGE)_%.h:$(INSTALL_JAVA)/$(PACKAGE)/%.class
 	$(JAVAHCMD) $(PACKAGE).$*
@@ -520,11 +523,13 @@ $(PACKAGE)_%.h:$(INSTALL_JAVA)/$(PACKAGE)/%.class
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!

-depends:: $(LIBSRCS) $(SRCS) $(COND_PROD_SRCS)
+depends:: $(LIBSRCS) $(SRCS) $(COND_PROD_SRCS) $(SRCS.c) $(SRCS.cc)
 	$(RM) DEPENDS
+ifneq ($(strip $(LIBSRCS) $(SRCS) $(COND_PROD_SRCS) $(SRCS.c) $(SRCS.cc)),)
 	$(DEPENDS_RULE)
+endif

-ifeq ($(HOST_ARCH),Borland)
+ifdef BORLANDC
 %$(EXE): %.c
 	@$(RM) $@
 	$(COMPILE.c)  $<
@@ -633,7 +638,7 @@ endif
 %.db: ../%.edf
 	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) $<

-%.edf: ../%.sch
+%.edf: ../%.sch $(DEPSCHS)
 	@if [ ! -f cad.rc -a -r ../cad.rc ] ; then ln -s ../cad.rc ; fi
 	$(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) $<

@@ -661,29 +666,29 @@ $(INSTALL_DBD)/%: ../%
 
 %Record.h: %Record.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \
+	$(EPICS_BASE_HOST_BIN)/dbToRecordtypeH$(EXE) \
 	        $(DBDFLAGS)  $<
 
 %Record.h: ../%Record.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \
+	$(EPICS_BASE_HOST_BIN)/dbToRecordtypeH$(EXE) \
 	        $(DBDFLAGS)  $<
 
 menu%.h: menu%.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToMenuH$(EXE) $<
+	$(EPICS_BASE_HOST_BIN)/dbToMenuH$(EXE) $<
 
 menu%.h: ../menu%.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToMenuH$(EXE) $<
+	$(EPICS_BASE_HOST_BIN)/dbToMenuH$(EXE) $<
 
 bpt%.dbd: bpt%.data
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt$(EXE) $<
+	$(EPICS_BASE_HOST_BIN)/makeBpt$(EXE) $<
 
 bpt%.dbd: ../bpt%.data
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt$(EXE) $<
+	$(EPICS_BASE_HOST_BIN)/makeBpt$(EXE) $<
 
 # Patch for old applications
 ifdef USER_DBDFLAGS
@@ -694,14 +699,14 @@ ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo Expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbExpand$(EXE) $(DBDFLAGS) $< > $@
+	$(EPICS_BASE_HOST_BIN)/dbExpand$(EXE) $(DBDFLAGS) $< > $@

 ifneq (,$(wildcard ../base.dbd))
 $(DBDNAME): ../base.dbd
 endif
 endif

-ifeq ($(HOST_ARCH),Borland)
+ifdef BORLANDC
 $(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS) $(LIBNAME_RESS)
 	$(LINK.shrlib) $(LIBOBJS) , $@ ,,$(LINKLIBS) $(subst /,\\,$(DLL_LDLIBS)), $(DLL_DEF_FLAG), $(LIBNAME_RESS)

@@ -710,7 +715,7 @@ $(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS) $(LIBNAME_RESS)
 	$(LINK.shrlib) $(LIBOBJS) $(DLL_LDLIBS) $(LIBNAME_RESS)

 endif
-ifeq ($(HOST_ARCH),Borland)
+ifdef BORLANDC
 # rule for lib (archive of object files) creation
 $(LIBNAME): $(LIBOBJS)
 	$(RM) $@
@@ -752,7 +757,7 @@ $(INSTALL_LIB)/%.lib: %.lib

 $(INSTALL_SHRLIB)/lib%: lib%
 	@echo "Installing library $@"
-	@$(INSTALL) -d -m 555 $< $(INSTALL_SHRLIB)
+	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
 ifdef SHRLIB_VERSION
 	@$(RM) $(@:%.$(SHRLIB_VERSION)=%)
 	ln -s $< $(@:%.$(SHRLIB_VERSION)=%) 
--- a/config/RULES.Unix
+++ b/config/RULES.Unix
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 INCREC +=$(RECTYPES) $(MENUS)
@@ -179,29 +188,29 @@ $(INSTALL_DBD)/%: ../%
 
 %Record.h: %Record.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH \
+	$(EPICS_BASE_HOST_BIN)/dbToRecordtypeH \
 	        $(DBDFLAGS)  $<
 
 %Record.h: ../%Record.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH \
+	$(EPICS_BASE_HOST_BIN)/dbToRecordtypeH \
 	        $(DBDFLAGS)  $<
 
 menu%.h: menu%.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToMenuH $<
+	$(EPICS_BASE_HOST_BIN)/dbToMenuH $<
 
 menu%.h: ../menu%.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToMenuH $<
+	$(EPICS_BASE_HOST_BIN)/dbToMenuH $<
 
 bpt%.dbd: bpt%.data
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt $<
+	$(EPICS_BASE_HOST_BIN)/makeBpt $<
 
 bpt%.dbd: ../bpt%.data
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt $<
+	$(EPICS_BASE_HOST_BIN)/makeBpt $<
 
 # Patch for old applications
 ifdef USER_DBDFLAGS
@@ -212,7 +221,7 @@ ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbExpand $(DBDFLAGS) $< > $@
+	$(EPICS_BASE_HOST_BIN)/dbExpand $(DBDFLAGS) $< > $@

 ifneq (,$(wildcard ../base.dbd))
 $(DBDNAME): ../base.dbd
--- a/config/RULES.Vx
+++ b/config/RULES.Vx
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 # $Id$

 ifneq ($(strip $(LIBOBJS_$(ARCH_CLASS))),)
@@ -39,7 +48,7 @@ MAN_DIRECTORY_TARGETS = $(foreach n, $(MANLIST),$(INSTALL_MAN)/man$(n))
 #	(convenience for extensions and applications)
 ifneq ($(EPICS_BASE),$(TOP))
 ifneq ($(EPICS_BASE),$(INSTALL_LOCATION))
-EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS)
+EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS) -I$(EPICS_BASE_INCLUDE)
 EPICS_DBDFLAGS += -I $(EPICS_BASE)/dbd
 endif
 endif
@@ -77,7 +86,9 @@ endif

 depends:: $(SRCS.c) $(SRCS.cc)
 	$(RM) DEPENDS
+ifneq ($(strip $(SRCS.c) $(SRCS.cc)),)
 	$(DEPENDS_RULE)
+endif

 clean::
 	@echo "Cleaning"
@@ -204,29 +215,29 @@ $(INSTALL_DBD)/%: ../%

 %Record.h: %Record.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \
+	$(EPICS_BASE_HOST_BIN)/dbToRecordtypeH$(EXE) \
 		$(DBDFLAGS)  $<

 %Record.h: ../%Record.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \
+	$(EPICS_BASE_HOST_BIN)/dbToRecordtypeH$(EXE) \
 		$(DBDFLAGS)  $<

 menu%.h: menu%.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToMenuH$(EXE) $<
+	$(EPICS_BASE_HOST_BIN)/dbToMenuH$(EXE) $<

 menu%.h: ../menu%.dbd
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToMenuH$(EXE) $<
+	$(EPICS_BASE_HOST_BIN)/dbToMenuH$(EXE) $<

 bpt%.dbd: bpt%.data
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt$(EXE) $<
+	$(EPICS_BASE_HOST_BIN)/makeBpt$(EXE) $<

 bpt%.dbd: ../bpt%.data
 	$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt$(EXE) $<
+	$(EPICS_BASE_HOST_BIN)/makeBpt$(EXE) $<

 # Patch for old applications
 ifdef USER_DBDFLAGS
@@ -237,7 +248,7 @@ ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo Expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbExpand$(EXE) $(DBDFLAGS) $< > $@
+	$(EPICS_BASE_HOST_BIN)/dbExpand$(EXE) $(DBDFLAGS) $< > $@
 endif

 $(LIBNAME): $(LIBOBJS)
--- a/config/RULES_ARCHS
+++ b/config/RULES_ARCHS
@@ -1,3 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
 #
 # $Id$
 #
--- a/Show More
+++ b/Show More