avoid crash in vxWorks 6 when SNL name is long

- option to find() so it follow links
- use of strict
- handle comments correctly when parsing RELEASE

.gitignore

@@ -0,0 +1,7 @@
+O.*
+bin
+dbd
+include
+lib
+man
+templates

LICENSE

@@ -1,29 +1,19 @@
-Copyright (c) 2002 University of Chicago and The Regents of the University
-of California. All rights reserved.
+Copyright (c) 1991-2004 University of Chicago and The Regents of the
+University of California. All rights reserved.
 
-EPICS BASE is distributed subject to the following license agreement:
+EPICS BASE is distributed subject to the following license conditions:
 
  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.
+ 2. The copyright holders shown above 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:
@@ -44,39 +34,28 @@ of Energy ("Los Alamos").
          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.)
+         the Software.
 
- 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.
+ 5. 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
+ 6. 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
+    FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT, (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
+    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
+ 7. 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,
@@ -89,21 +68,17 @@ of Energy ("Los Alamos").
 ________________________________________________________________________
 
 This software is in part copyrighted by the BERLINER SPEICHERRING
-GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY),
-BERLIN, GERMANY.
+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.
+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.
+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.
 ________________________________________________________________________
 
-

MakeRelease

@@ -0,0 +1,96 @@
+#!/bin/sh
+#
+# $Id$
+#
+# Make Release - Creates an EPICS release
+#   By Matthew Needes and Bob Zieman
+#
+#  MakeRelease [-b]
+#
+#    [-b] - For fully built release
+#
+
+
+if [ ! -d src ]; then
+	echo "Cannot find src directory, are you at the top of EPICS base ?"
+	exit 1
+fi
+
+
+FULLY_BUILT=NO
+if [ "${1}" = "-b" ]; then
+	FULLY_BUILT=YES
+	shift
+	if [ "${1}" != "." ]; then
+		echo "TOP: Cannot create a fully built release.";
+		exit 1;
+	fi
+fi
+
+# Retrieve EPICS release string from config/CONFIG_BASE_VERSION
+. config/CONFIG_BASE_VERSION
+
+if [ -z "${EPICS_VERSION}" ];
+	then
+		echo "TOP:  Cannot retrieve release number from config/CONFIG_BASE_VERSION";
+		exit 1;
+	fi
+
+RELS="R${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}";
+
+echo TOP: Creating ../${RELS}.tar;
+
+if [ -f ${RELS}.tar* ];
+	then
+		echo "TOP: This release has already been created.";
+		echo "TOP: Remove tar file or edit config/CONFIG_BASE_VERSION.";
+		exit 1;
+	fi
+
+# Create list of files and dirs to include in tar file
+
+cd ..
+
+ls base/README* base/*.bat | xargs tar cvf ${RELS}.tar
+
+ls base/Make* > /tmp/make_release.out.$$;
+
+ls base/*COPYRIGHT* >> /tmp/make_release.out.$$;
+
+
+if [ -d startup ];
+	then
+		find startup -name CVS -prune -o ! -type d -print \
+				>> /tmp/make_release.out.$$;
+	fi
+
+# binary / library / default.dctsdr / <rec>Record.h / etc.
+if [ $FULLY_BUILT = "YES" ];
+	then
+		find base/include -name CVS -prune -o ! -type d -print \
+				>> /tmp/make_release.out.$$;
+
+		find base/man -name CVS -prune -o ! -type d -print \
+				>> /tmp/make_release.out.$$;
+
+		find base/bin -name CVS -prune -o ! -type d -print \
+				>> /tmp/make_release.out.$$;
+
+		find base/lib -name CVS -prune -o ! -type d -print \
+				>> /tmp/make_release.out.$$;
+
+		find base/dbd -name CVS -prune -o ! -type d -print \
+				>> /tmp/make_release.out.$$;
+
+	fi
+
+find base/config -name CVS -prune -o -name SCCS -prune -o ! -type d -print \
+		| grep -v '/O\..*$' >> /tmp/make_release.out.$$
+
+find base/src -name CVS -prune -o -name SCCS -prune -o ! -type d -print \
+		| grep -v '/O\..*$' >> /tmp/make_release.out.$$
+
+cat /tmp/make_release.out.$$ | xargs tar rvf ${RELS}.tar 
+		
+rm /tmp/make_release.out.$$
+

Makefile

@@ -8,13 +8,47 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
+# Top Level EPICS Makefile
+#        by Matthew Needes and Mike Bordua
+#
+#  Notes:
+#    The build, clean, install, and depends "commands" do not have
+#         their own dependency lists; they are instead handled by
+#         the build.%, clean.%, etc. dependencies.
+#
+#    However, the release dependencies DOES require a complete
+#         install because the release.% syntax is illegal.
+#
 # $Id$
 #
 
-TOP = .
-include $(TOP)/configure/CONFIG
+TOP=.
+include $(TOP)/config/CONFIG_BASE
 
-DIRS += config config/tools configure src
+DIRS = src config
 
-include $(TOP)/configure/RULES_TOP
+INSTALL_BIN = $(INSTALL_LOCATION)/bin/$(HOST_ARCH)
+
+#
+# this bootstraps in makeMakefile.pl (and others) so that it can
+# be used to create the first O.xxxx/Makefile
+#
+PERL_BOOTSTRAP_SCRIPTS = $(notdir $(wildcard $(TOP)/src/tools/*.pl))
+PERL_BOOTSTRAP_SCRIPTS_INSTALL = $(PERL_BOOTSTRAP_SCRIPTS:%=$(INSTALL_BIN)/%)
+all host cross inc rebuild clean depends buildInstall :: $(PERL_BOOTSTRAP_SCRIPTS_INSTALL)
+
+RMDIR=$(PERL) $(TOP)/src/tools/rm.pl -rf
+
+include $(TOP)/config/RULES_TOP
+
+release: 
+	@echo TOP: Creating Release...
+	@./MakeRelease
+
+built_release:
+	@echo TOP: Creating Fully Built Release...
+	@./MakeRelease -b $(INSTALL_LOCATION)
+
+$(INSTALL_BIN)/%.pl: $(TOP)/src/tools/%.pl
+	$(PERL) $(TOP)/src/tools/installEpics.pl -d -m 555 $< $(INSTALL_BIN)
 

README

@@ -1,24 +1,290 @@
----------------------------------------------------------
-EPICS Base - the central core of a control system toolkit
----------------------------------------------------------
+$Id$
 
-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.
+----------------------------------------------------------------------------
+3.13 EPICS BASE Notes and Build Instructions.
+	- By Matthew Needes
+----------------------------------------------------------------------------
 
-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.
+Notes:
 
----------------------------------------------------------
+1. Before you can build or use EPICS, the environemnt variable HOST_ARCH
+   must be set. The base/startup/HostArch script file has been provided
+   to set HOST_ARCH.
 
-Installation and release information can be found in the
-various files in the documentation subdirectory.
+2. You must use GNU make (which is now THE supported make utility) for
+   the build, gnumake.  Set your path so that a recent version (e.g.
+   V3.70) of gnumake is available.
+
+3. You must have perl installed. See the README.Perl in this directory. The
+   config files specify the perl full pathname  as /usr/bin/perl for
+   unix builds and C:\Perl\bin\perl for WIN95/NT builds. You can override
+   these specifications with a CONFIG_SITE_HOST_ARCH.<host_arch> file. 
+
+4. You may need vendors C and C++ compilers in your search path. (Check
+   the definitions of ACC and CCC in CONFIG.Host.<host_arch> or gnu GCC
+   and G++ if ANSI=GCC and CPLUSPLUS=GCC are specified in CONFIG_SITE).
+
+4. For building base you must have echo in your search path. For unix host
+   builds you must also have ar, cp, rm, mv, ranlib, and mkdir in your search
+   path and /bin/chmod must exist. 
+
+----------------------------------------------------------------------------
+   Part 1 - Configuring and Building EPICS Base
+----------------------------------------------------------------------------
+
+1.1  To configure EPICS, edit the following file:
+
+   config/CONFIG_SITE      - Build choices/HOST_ARCH/Vx location.
+   config/CONFIG_SITE_ENV  - For site-specific environment settings
+
+   For a specific host architecture you may want to edit the following file 
+   config/CONFIG_SITE.Host.<arch>      - Override Host build settings for a host arch
+   config/CONFIG_SITE.Vx.<arch>        - Override Vx build settings for a host arch
+   config/CONFIG_SITE_HOST_ARCH.<arch> - Override build settings for a host arch
+ 
+   Optionally you may want to edit the following files 
+   config/CONFIG_SITE.Host - Override Host build settings for all host archs.
+   config/CONFIG_SITE.Vx   - Override Vx build settings for all host archs.
+   config/CONFIG           - Override build settings for all host archs.
+
+1.2  To add a target architecture to EPICS:
+
+   cd base/config
+   cp CONFIG.Vx.mv167 CONFIG.Vx.YOUR_ARCH
+   edit CONFIG.Vx.YOUR_ARCH   - For compiler flags / etc.
+
+   edit CONFIG_SITE    - Add architecture to CROSS_COMPILER_TARGET_ARCHS list.
+
+1.3  To build EPICS:
+
+   cd epics/base
+   gnumake             - To install include files, build and install EPICS.
+                         (Same as "gnumake inc install")
+   gnumake all         - Same as "gnumake"
+   gnumake clean       - To clean temporary object files.  Top level 
+                         clean will remove the O.ARCH dirs specified
+                         in BUILD_ARCHS.
+   gnumake uninstall   - Only available at the top level directory.
+                         Cleans directories created by the install.
+   gnumake rebuild     - Same as "gnumake clean all"
+
+1.4  "Partial" build commands:
+
+     The complete set of targets now supported are: 
+
+            action 
+            arch 
+            action.arch 
+            dir 
+            dir.action 
+            dir.arch 
+            dir.action.arch 
+
+      where: 
+            action can be clean, inc, install, depends, or build
+            action can also be uninstall or rebuild at top level only
+            dir is the name of a subdirectory. 
+            arch can be host, cross, sun4, solaris, mv167, ... 
+
+    Examples are:
+
+       gnumake inc              - To install include files
+       gnumake install.host     - To build and install EPICS for host arch.
+       gnumake install.cross    - To build and install EPICS for Vx archs.
+       gnumake clean.sun4       - Cleans sun4 binaries in O.sun4 dirs only.
+       gnumake install.sun4     - Builds sun4 only.
+       gnumake install.mv167    - Builds mv167 only (a HOST_ARCH build must
+                                  be complete before this can be issued).
+
+NOTES:
+
+   1. EPICS binaries and shell scripts are installed into the directory
+      $(INSTALL_LOCATION)/bin/ARCH.
+
+   2. EPICS libraries are installed into the $(INSTALL_LOCATION)/lib/ARCH
+      directory.
+
+   3. During a normal build (a "make" or "make install"), the "depends"
+      dependency will NOT be invoked.  Only if "make depends" is run
+      explicitly, or a "make built_release" is performed will dependencies
+      be generated automatically.
+   
+   4. Temporary objects are stored in src/DIR/O.ARCH, This allows objects
+      for multiple architectures to be maintained at the same time.
+      While developing source for EPICS, merely cd src/DIR/O.ARCH, and
+      invoke "make":
+
+      cd epics/base/src/db/O.mv167
+      make dbAccess.o
+
+      The above example instructs make to build dbAccess.o for the
+      mv167 target.
+
+----------------------------------------------------------------------------
+   Part 2  ---  Configuration Files in epics/base/config
+----------------------------------------------------------------------------
+CONFIG - This file is meant to be included in the low-level EPICS Makefiles.
+It includes the other EPICS makefiles, and allows individual developers
+and the EPICS system manager to override specific variables in the rest of
+the configuration.
+----------------------------------------------------------------------------
+CONFIG_SITE - This file is meant to be changed only by the EPICS system
+manager.  It specifies:
+
+	HOST_ARCH: The system's host architecture (sun4/hp700/etc).
+               This now come from an environment variable.
+	CROSS_COMPILER_HOST_ARCHS: List of unix architectures with cross_compilers. 
+	CROSS_COMPILER_TARGET_ARCHS: List of architectures to build epics for.
+	VX_DIR: Location of vxWorks.
+	STATIC_BUILD: Whether or not to build clients statically.
+	etc.
+
+----------------------------------------------------------------------------
+CONFIG.Host.ARCH - This file defines a particular host architecture.  It
+contains the following variables:
+
+ 	ARCH_CLASS: solaris / sun4 / hp700 / etc.
+        Host architecture OS vendor C and C++ complier variables.
+	Architecture dependent build flags.  The flag names / contents
+		depend on your architecture class.
+----------------------------------------------------------------------------
+CONFIG_HOST_ARCH.ARCH - This file contains the following variable:
+
+ 	WIND_HOST_TYPE: sun4-solaris2 / sun4-sunos4 /  x86-win32 / etc.
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+CONFIG.Vx.ARCH - This file defines a particular target architecture.  It
+contains the following variables:
+
+ 	ARCH_CLASS: 68k / sun4 / hp700 / etc.
+	Architecture dependent build flags.  The flag names / contents
+		depend on your architecture class.
+	CMPLR_SUFFIX: Vx GNU cross compiler suffix definition. 
+----------------------------------------------------------------------------
+----------------------------------------------------------------------------
+CONFIG_SITE.BUILD_TYPE.ARCH - Contains site specific definitions pertaining to a
+particular architecture and build type.  This file's primary usefulness is to
+define site specific compile and link flags.
+----------------------------------------------------------------------------
+CONFIG_COMMON - Contains definitions describing the layout of base 
+	and definitions common to all builds.
+----------------------------------------------------------------------------
+CONFIG.Host.UnixCommon - Contains host definitions common to all Unix archs.
+----------------------------------------------------------------------------
+CONFIG_BASE -  Defines what subdirectories get built by default under base.
+----------------------------------------------------------------------------
+CONFIG_BASE_VERSION - Defines the version of base. 
+----------------------------------------------------------------------------
+CONFIG_ENV - EPICS Environment Parameter configuration file.
+----------------------------------------------------------------------------
+CONFIG_SITE_ENV - EPICS Environment Parameter Site configuration file
+----------------------------------------------------------------------------
+RULES.Vx - Rules for building with Makefile.Vx makefiles.
+----------------------------------------------------------------------------
+RULES.Host - Rules for building with Makefile.Host makefiles.
+----------------------------------------------------------------------------
+RULES_TOP - Top level rules for building.
+----------------------------------------------------------------------------
+RULES_ARCHS
+RULES_DIRS - Allows top-level type command syntax in low-level directories.
+----------------------------------------------------------------------------
+
+    Table of files to change when building and adding architectures.
+	etc.
+
+Filename                  SYS_MGR  ADD_VX_ARCH  ADD_UNIX_ARCH  DEVELOPER
+
+CONFIG                       m         -             -             m
+CONFIG_SITE                  m         m             m             -
+CONFIG_SITE_ENV              m         -             -             -
+CONFIG.Host.ARCH             -         c             c             -
+CONFIG_HOST_ARCH.ARCH        -         c             c             -
+CONFIG_SITE.Host.ARCH        -         -             -             -
+CONFIG.Vx.ARCH               -         c             c             -
+CONFIG_SITE.ARCH             -         c             c             -
+CONFIG.Vx.ARCH_CLASS         -         c*            -             -
+RULES.Vx                     -         -             -             -
+RULES.Host                   -         -             -             -
+CONFIG_BASE                  -         -             -             -
+CONFIG_BASE_VERSION          -         -             -             -
+CONFIG_COMMON                -         -             -             -
+CONFIG_ENV                   -         -             -             -
+RULES_ARCHS                  -         -             -             -
+RULES_DIRS                   -         -             -             -
+RULES_TOP                    -         -             -             -
+
+     m -  Modify an existing file.
+     c -  Create a new file.
+
+     * -  Create an ARCH_CLASS file only if you are adding a
+             fundamentally new architecture, such as hp700 or
+             a SPARC VME board.  If your board is 68k based,
+             you will not need to create CONFIG.Vx.68k,
+             since it already exists !
+
+----------------------------------------------------------------------------
+   Part 3  ---  Configuration File Inclusion Tree Examples
+----------------------------------------------------------------------------
+----------------------------  hkv2f example --------------------------------
+            (files are numbered in the order of their inclusion)
+
+ src/db/Makefile.Vx     (An example EPICS makefile)
+    ^   ^
+    |   +--- 2.  RULES.Vx
+    |              Default rules.
+    +----1.  CONFIG_BASE
+             ^
+             |
+             + 1. CONFIG
+                  ^^^^^^^
+                  ||||||+- 1. CONFIG_COMMON
+                  ||||||          General info about base.
+                  |||||+-- 2. CONFIG_BASE_VERSION
+                  |||||           Base version.
+                  ||||+--- 3. CONFIG_SITE
+                  ||||             HOST_ARCH = sun4
+                  ||||             CROSS_COMPILER_TARGET_ARCHS = mv167 hkv2f
+                  ||||             VX_DIR = /vxworks
+                  ||||             More.
+                  |||+---- 4. CONFIG_HOST_ARCH.sun4
+                  |||              WIND_HOST_TYPE =  sun4-sunos4
+                  ||+----- 5. CONFIG.Vx
+                  ||               Definitions for Vx builds 
+                  |+------ 6. CONFIG.Vx.hkv2f
+                  |                ARCH_CLASS = 68k 
+                  |                Arch Specific Compiler Flag Setup
+                  |                Vx GNU cross compiler suffix
+                  +------- 7. CONFIG_SITE.Vx.hkv2f
+                                   Site Specific setup 
+
+----------------------------  sun4  example --------------------------------
+            (files are numbered in the order of their inclusion)
+
+ src/db/Makefile.Unix   (An example EPICS makefile)
+    ^   ^
+    |   +--- 2.  RULES.Vx
+    |              Default rules.
+    +----1.  CONFIG_BASE
+             ^
+             |
+             + 1. CONFIG
+                   ^^^^^
+                   |||||+- 1. CONFIG_COMMON
+                   |||||          General info about base.
+                   ||||+-- 2. CONFIG_BASE_VERSION
+                   ||||           Base version.
+                   |||+--- 3. CONFIG_SITE
+                   |||             HOST_ARCH = sun4
+                   |||             CROSS_COMPILER_TARGET_ARCHS = mv167 hkv2f
+                   |||             VX_DIR = /vxworks
+                   |||             More.
+                   ||+---- 4. CONFIG_HOST_ARCH.sun4
+                   ||              WIND_HOST_TYPE =  sun4-sunos4
+                   |+----- 5. CONFIG.Host.sun4
+                   |               ARCH_CLASS = sun4 
+                   |               Arch Specific Compiler Flag Setup
+                   |               Vx GNU cross compiler suffix
+                   +------ 6. CONFIG_SITE.Host.sun4
+                                   Site Specific setup 
 
-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/
 

README.Linux

@@ -0,0 +1,17 @@
+                     Special Notes on Linux
+
+At this point, support for Linux only involves channel access
+clients.  Since Vxworks is not available for Linux, you must
+use other platforms for developing server side code.
+
+You MUST start caRepeater by hand before running a client.  
+Prior to running a client, you must run:
+
+caRepeater &
+
+---
+jpq@nwu.edu
+
+
+
+

README.Perl

@@ -0,0 +1,44 @@
+Perl
+====
+
+A number of shell scripts are now Perl scripts,
+most important:
+
+tools/installEpics.pl
+include/makeEpicsVersion.pl
+libCom/bldEnvData.pl
+libCom/makeStatTbl.pl
+sequencer/makeVersion.pl
+
+WIN32 also uses
+tools/cp.pl, mv.pl, rm.pl, mkdir.pl
+which should behave like the UNIX cp, mv, rm, rmdir.
+All systems could use the Perl versions but that seems
+to be overkill for UNIX.
+
+Advantages:
+* no need for ls, date, basename, grep, awk, sed, ...,
+  which made the make UNIX-specific.
+* Perl is currently available for Unix, OS/2, WIN32, VMS
+  and the scripts should work on all those systems
+
+Disadvantage:
+* You have to get Perl, look e.g. at http://www.perl.com
+* Perl version 5.003_02 works, we don't know about earlier versions.
+
+
+Compile Perl:
+No big deal,
+* on UNIX say 'configure' and 'gnumake',
+* on Windows use MX Visual C++,
+  use File/Open Workspace to open the Makefile {PERL}/perl5i.mak,
+  use Build/Batch build to select eiher the Release or Debug targets.
+
+  You can do the same with the Makefile {Perl}/Ext/WIN32/win32.mak
+  - nice tools but not necessary for EPICS.
+
+  Then call {PERL}/bin/perlw32-install.bat
+
+In any case, read the texts that come with perl!
+
+

README.WIN32

@@ -1,8 +1,8 @@
 
-Compiling EPICS and Building IOC Applications on win32-x86 (Windows95/NT) 
+Compiling EPICS and Building IOC Applications on WIN32 (Windows95/NT) 
 ---------------------------------------------------------------------
 
-Original port of EPICS base build system to WIN32 (Windows95/NT)
+Original port of EPICS base to WIN32 (Windows95/NT)
 was done by Kay-Uwe Kasemir 11/96
 
 please mail questions, comments, corrections, additional examples, etc 
@@ -11,9 +11,9 @@ please mail questions, comments, corrections, additional examples, etc
 0) what you will get
 --------------------
 
-Right now this port of EPICS to win32-x86 should allow you to
+Right now this port of EPICS to WIN32 should allow you to
 
-* compile all of EPICS base using {Tornado, MS Visual C, perl,
+* compile almost all of EPICS base using {Tornado, MS Visual C, perl,
   GNU make} (only {MS Visual C, perl, GNU make} if you prefer
   to compile only the host portions of EPICS base).
 * load EPICS on an IOC (486, pentium, 68k, ...),
@@ -23,19 +23,15 @@ Right now this port of EPICS to win32-x86 should allow you to
 * build and use ca.dll on NT or Win95 to access all IOCs,
   as well as the Com-library, gdd-library, cas-library,
   and all other EPICS base libraries as DLLs.
-* build gdd, cas and a demo of the new portable CA server on win32-x86.
-
-To build only for win32-x86 and not cross compile for IOC development type 
-"make win32-x86" or in your configure/CONFIG_SITE file set 
-"CROSS_COMPILER_HOST_ARCHS="
+* build gdd, cas and a demo of the new portable CA server on WIN32.
 
 1) see what you have
 --------------------
 
-To compile EPICS on win32-x86, we need
+To compile EPICS on WIN32, we need
 
 	WindRiver System's Tornado (used: 1.0)  (not required if host only build)
-	Microsoft's Visual C/C++   (used: 6.0)  (borland C++ rumored to work also)
+	Microsoft's Visual C/C++   (used: 4.0)  (borland C++ rumored to work also)
 
 and some tools:
 
@@ -51,31 +47,22 @@ If you cannot/don't want to find them, contact me, please!
 (Setting env. vars. is different: for NT, use Settings/System,
 for Win95 use autoexec.bat)
 
-When setting paths in the EPICS CONFIG files for win32-x86 the following
-are hints in case you have trouble. You should not need to worry about 
-this unless you type a path into one of the EPICS config files that 
-includes a "\". In most situations gnu make, windows NT, the MS compiler,
-and the MS linker will accept "/" and this will result in less trouble.
+When setting paths in the EPICS CONFIG files for WIN32:
 
-	** Note that that each "\" in any path variables you set
+	** Note that that each "\" in any path variables
 		must be replaced with a "\\" (this is because GNU make treats
 		all "\" characters as line continuation)
 
 	** Note that that each space in any file name or 
-        path name variable you set must be replaced with 
+        path name variable must be replaced with 
         a "\ " (this is because GNU make treats all " " separated
         input as independent tokens in the input stream.
 
-	** win32-x86 will generally allow "/" and "\" interchangeably in file paths,
-		but the DOS shell only accepts "\".
-
-    ** Certain command line utilities such as the MS linker are known to in rare
-        situations confuse "/" in a path with command line options, and it may
-        be necessary to replace a "/" in a path that configured with "\\", but
-        the bulk of our experience indicates that this is not the necessary.
+	** WIN32 will generally allow "/" and "\" interchangeably in file paths,
+		but the DOS shell appears to only accept "\".
 
 Your path should include:
-- The EPICS-binaries that we are about to build in <EPICS>base/bin/win32-x86
+- The EPICS-binaries that we are about to build in <EPICS>base/bin/WIN32
 - The System (for me it's in NT40...)
 - The MS Visual C compiler binaries
 
@@ -108,7 +95,7 @@ include=c:\msdev\include;c:\msdev\mfc\include
 lib=c:\msdev\lib;c:\msdev\mfc\lib
 
 Select host arch to build:
-EPICS_HOST_ARCH=win32-x86			(used by the make system)
+HOST_ARCH=WIN32			(used by the make system)
 
 Set the "TMP" environment variable if you need to specify where 
 temporary files are created.
@@ -139,7 +126,7 @@ Prepare apx. 2 ltr. Tee and type:
 Watch for errors and send them to me.
 
 Known problems:
-* gnumake seems to be faster than win32-x86 sometimes
+* gnumake seems to be faster than WIN32 sometimes
   which results in warnings/errors like
   "file has modification date in the future"
   for newly created things.
@@ -150,7 +137,7 @@ Known problems:
   WIN32 is WIN32, not win32. Gnumake fails
   if e.g. base/src/include/os/WIN32 is ...win32.
 
-4) Creating EPICS IOC applications under win32-x86
+4) Creating EPICS IOC applications under WIN32
 
 o create application development folder
 	
@@ -182,37 +169,13 @@ style project. This allows EPICS programs to be developed directly inside of
 the visual C++ environment. To do this create a "makefile" project and place your 
 gnu make command in the build configuration (accessed from the project/settings menu). 
 You will also need to add GNU make and <EPICS>/bin/win32 into the Visual C++ 
-executable search path (from the tools/options menu). 
-In visual C++ it is possible to double click on the compiler 
+executable search path (from the tools/options menu). I have not so far determined 
+how to configure visual C++ so that it is possible to double click on the compiler 
 error messages generated within an EPICS "makefile" style project and have visual 
-C++ immediately position the cursor on the corresponding line in the source. I
-have found that this works correctly with Makefile projects if the project is in a 
-directory just below the source code. The following build command works well
-in a visual C++ make file project: "kill caRepeater.exe&make -C ..". Be careful 
-not to introduce additional spaces around the &. The kill.exe command is in the
-NT resource kit.
+C++ immediately position the cursor on the corresponding line in the source (as is 
+normally the case in the visual C++ environment). If you solve this problem please 
+forward the details to johill@lanl.gov.
 
-6) Issues that you should be aware of if you are building code that 
-calls EPICS, but you are not using the EPICS build system.
+Good luck !
 
-6a) You will need to include header files from the following paths.
-    <epics>\base\include
-    <epics>\base\include\os\win32
-6b) You will need to link with the following path in effect.
-    <epics>\base\lib\win32-x86. 
-6c) If the visual C++ /Za option is not used then you will also need to define 
-    __STDC__ to be zero on the command line so that EPICS headers will know that
-    a ANSI standard C compiler is in use. 
-6d) If you link with EPICS object libraries then specify /MT or /MTd
-    depending on whether EPICS base and your code are built for debugging. 
-    This specifies the multithreaded operating environment required by EPICS.
-    This will also not define _DLL and therefore the EPICS header files will
-    not specify that sharable libraries are being called. EPICS object library 
-    names follow the convention "xxxObj.lib".
-6e) If you link with EPICS shareable libraries (with DLLs) then you must 
-    use /MDd or /MD depending on whether EPICS base and your code are 
-    built for debugging. This specifies the multithreaded operating environment 
-    required by EPICS. This will also define _DLL and therefore the EPICS header 
-    files will specify an optimized calling convention for shareable libraries. 
-    EPICS shareable libraries (DLL) names follow the convention "xxx.lib"
-    and "xxx.dll".
+-Kay

README.cxxTemplates

@@ -0,0 +1,46 @@
+
+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
+
+

README.cygwin32

@@ -0,0 +1,54 @@
+Compiling EPICS on cygwin32 (Windows95/NT)
+------------------------------------------
+
+Right now this port of EPICS base to cygwin32 R1.3.3 fails
+because cygwin does not yet support point-to-point interfaces.
+ 
+To build EPICS on Win95 or NT using cygwin32, we need
+
+        EPICS base distribution, R3.12.0.beta12 or later, available
+           from http://aps.anl.gov/...
+        The latest cygwin distribution, available from 
+           http://www.cygwin.com
+
+BUILD INSTRUCTIONS
+------------------
+
+
+1) Install the cygwin binary release
+------------------------------------
+
+2) Install the epics base distribution
+--------------------------------------
+        cp <dirname>\<basereleasename>.tar.gz .
+        gunzip -d <basereleasename>.tar.gz
+        tar xvf <basereleasename>.tar
+        chmod +w -R *
+        cd <epicsBaseDir>
+
+3) Set environment variables and path using cygwin32.bat
+-------------------------------------------------------------
+        <edit <epicsBaseDir>/startup/cygwin32.bat changing paths if necessary>
+        cd <epicsBaseDir>\startup
+        edit cygwin32.bat
+        <execute cygwin32.bat>
+         cygwin
+
+4) Set site specific parms in epics config files
+------------------------------------------------
+	cd <epicsBaseDir>\config
+	<edit CONFIG_SITE* files>
+
+5) Build epics base
+-------------------
+        cd <epicsBaseDir>
+        make
+
+6) Create an example EPICS application (<epicsBaseDir> needs drive letter)
+--------------------------------------------------------------------------
+        mkdir <epicsappdir>
+        cd <epicsappdir>
+        perl <epicsBaseDir>\bin\cygwin32\makeBaseApp.pl -l
+        perl <epicsBaseDir>\bin\cygwin32\makeBaseApp.pl -t example example
+        make
+

README.hp700_alpha

@@ -0,0 +1,28 @@
+#
+# supplement README for HP700 
+#
+# Johnny Tang  5-29-97
+#
+
+1. VxWorks 5.2 for HP-UX
+
+   - Make sure that you have set VX_DIR and VX_GNU to your
+     VxWorks root directory. 
+
+   - Under $(VX_DIR), create a soft link:
+     hp700.68k -> hp9700.68k
+
+2. Modify base/config/CONFIG_SITE file
+
+   - ANSI=HPACC
+   - STANDARD=HPCC
+   - CPLUSPLUS=G++
+
+3. HP native c++ compiler has problem to handle the head files
+   in which a inline function is used in conjuction with template
+
+   base/src/cas, the portable CA server can't be compiled successfully
+   because of the above limitation.
+
+   This problem can be resolved by spliting the function declarations
+   from the inline code in the files in base/src/cxxTemplates.

README.solaris

@@ -0,0 +1,25 @@
+----------------------------------------------------------------------------
+EPICS Notes for Solaris
+	- By Andrew Johnson
+
+updated 12-16-96 by Jeff Hill
+
+----------------------------------------------------------------------------
+
+Notes:
+
+1. In order to build EPICS under Solaris 2, you must ensure that the
+solaris directory /usr/ccs/bin is in your search path.
+
+2. It is now possible to compile EPICS under Solaris 2 using either the
+GNU gcc compiler or the Sun SPARCworks ANSI C compiler. The g++/
+Sun SPARCworks ANSI C compiler combination has compiled and linked
+without errors but has not been extensively tested.
+
+3. EPICS under Solaris 2 no longer uses the UCB compatability libraries.
+In order to ensure that the /usr/ucblib files are not inherited, you
+should ensure that your LD_LIBRARY_PATH environment variable does not
+include /usr/ucblib when you build any of the host tools.
+
+--
+anj@ast.cam.ac.uk

SkeletonCOPYRIGHT_UniversityOfChicago

@@ -0,0 +1,10 @@
+/*****************************************************************
+                          COPYRIGHT NOTIFICATION
+*****************************************************************
+
+(C)  COPYRIGHT 1993 UNIVERSITY OF CHICAGO
+
+This software was developed under a United States Government license
+described on the COPYRIGHT_UniversityOfChicago file included as part
+of this distribution.
+**********************************************************************/

config/CONFIG.Host.Borland

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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

config/CONFIG.Host.Darwin

@@ -1,57 +0,0 @@
-#*************************************************************************
-# 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 definitions seem to work
-# for all the weird ways in which the extensions makefile fragments use them.
-#
-AR = ar
-ARCMD = $(AR) -rc $@
-ARFLAGS = rcv
-RANLIB = ranlib
-
-ANSI=GCC
-CPLUSPLUS=G++
-
-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
-
-# Uncomment this if you're using the GNU readline library
-#ARCH_DEP_LDLIBS += -lreadline
-
-# Uncomment this if you're using the libtecla library
-ARCH_DEP_LDLIBS += -ltecla_r -ltermcap
-
-#
-# 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
-G++_SHRLIB_LDFLAGS_YES += -dynamiclib
-
-#
-# Java
-#
-JAVA_DIR=/usr/

config/CONFIG.Host.Linux

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.
@@ -21,19 +12,55 @@ AR = ar -rc
 ARCMD = $(AR) $@
 RANLIB = ranlib -t
 
-ANSI=GCC
-CPLUSPLUS=G++
+#OP_SYS_FLAGS = -D_BSD_SOURCE -D_POSIX_SOURCE
 
-GCC_SHRLIB_LDFLAGS_YES +=  -Wl,-soname,$@
-G++_SHRLIB_LDFLAGS_YES +=  -Wl,-soname,$@
+# 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 = -static
+ACC_SFLAGS_NO=
+ACC_SLIBS_YES =
+ACC_SLIBS_NO=
+ACC_SHRLIB_CFLAGS_YES =  -fPIC
+ACC_SHRLIB_LDFLAGS_YES =  -shared -Wl,-soname,$@ 
 
-OP_SYS_CFLAGS += -D_BSD_SOURCE
 
-ARCH_DEP_CFLAGS = -D_X86_ -Dlinux -mcpu=pentium
-ARCH_DEP_LDLIBS += -lpthread -lreadline -lcurses -lrt
+# 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 = -static
+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,$@ 
 
-#Allows R3.13 built extensions to load R3.14 shared libs
-SYS_DLL_LIBS_Linux += pthread readline curses rt
+# 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 -m32
+ARCH_DEP_LDFLAGS =
 
 #glibc FAQ
 #	"_GNU_SOURCE:  glibc does not make the GNU extensions available 
@@ -48,3 +75,4 @@ SYS_DLL_LIBS_Linux += pthread readline curses rt
 #ARCH_DEP_CFLAGS += -D_GNU_SOURCE
 
 
+

config/CONFIG.Host.LynxOS

@@ -1,65 +0,0 @@
-#*************************************************************************
-# 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.
-#  Sites may override these definitions in CONFIG_SITE.Host.LynxOS
- 
-ARCH_CLASS = LynxOS
-
-# Include definitions common to all Unix archs
-include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
-
-AR = ar -rc
-ARCMD = $(AR) $@
-RANLIB = ranlib -t
-
-
-
-# Configure OS vendor C compiler
-ACC_ANSI = $(ACC) -ansi
-ACC_STRICT = $(ACC) -ansi -pedantic
-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 = 
-ACC_SHRLIB_LDFLAGS_YES =
-
-
-
-# Configure OS vendor C++ compiler
-CCC_NORMAL = $(CCC)
-CCC_STRICT = $(CCC)
-CCC_TEMPL_INST_FLAG = -pedantic -DEXPL_TEMP
-CCC_WARN_YES = -Wall
-CCC_WARN_NO = -w
-CCC_OPT_YES =  -O
-CCC_OPT_NO = -g
-CCC_SFLAGS_YES = -Bstatic
-CCC_SFLAGS_NO=
-CCC_SLIBS_YES = 
-CCC_SLIBS_NO=
-CCC_DEPENDS_FLAG = -pedantic
-
-
-# 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 -DEXPL_TEMP
-
-ARCH_DEP_CFLAGS = -DLynxOS -mposix -D_X86_ -DLYNXOS_RELEASE_2_4_0
-ARCH_DEP_LDLIBS = -lc -lbsd -lnsl -lm -lposix4d9 -llynx

config/CONFIG.Host.UnixCommon

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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
@@ -29,12 +20,12 @@ SHRLIB_SUFFIX = .so
 
 SHRLIBNAME = lib$(LIBRARY)$(SHRLIB_SUFFIX)$(SHRLIB_VERSION:%=.%)
 
-SYS_DLL_LIBS += $(SYS_DLL_LIBS_$(OS_CLASS))
-DLL_LIBS = $(patsubst $(LIBRARY),, $(PROD_LIBS) $(USR_LIBS)) $(SYS_DLL_LIBS)
+DLL_LIBS = $(patsubst $(LIBRARY),, $(PROD_LIBS) $(USR_LIBS))
+DLL_LDLIBS = $(PRODNAME_LIBS:%=-l%) $(DLL_LIBS:%=-l%)
 
 INSTALL_SHRLIB = $(INSTALL_LIB)
 
-LINK.shrlib= $(SHRLIB_LINKER) -o $@ $(CFLAGS) $(CPPFLAGS) $(SHRLIB_LDFLAGS) $(DLL_LDFLAGS) $(LDFLAGS)
+LINK.shrlib= $(SHRLIB_LINKER) -o $@ $(CFLAGS) $(CPPFLAGS) $(SHRLIB_LDFLAGS) $(LDFLAGS)
 
 #-------------------------------------------------------
 # Unix command definitions
@@ -57,19 +48,16 @@ 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

config/CONFIG.Host.WIN32

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.
@@ -32,7 +23,7 @@ ARCMD = lib /nologo /verbose /out:$@
 
 #
 # Configure OS vendor C compiler
-ACC = cl
+ACC = cl 
 
 #
 # __STDC__=0 is a real great idea of Jeff that gives us both:
@@ -60,7 +51,7 @@ ACC_OPT_YES = /Ox
 #
 # /Zi include debugging info in object files
 # /Fr create source browser file
-ACC_OPT_NO = /Zi 
+ACC_OPT_NO = /Zi /Fr
 
 #
 # the following options are required when
@@ -95,11 +86,7 @@ ACC_SLIBS_NO=
 #
 # Use of /Za would dissable DLL import/export keywords which
 # EPICS include/excludes using architecture neutral macros
-#
-# /GX support C++ exceptions
-# /GR generate RTTI information
-#
-CCC = cl /GX /GR
+CCC = cl 
 CCC_NORMAL = $(CCC) /nologo /D__STDC__=0
 CCC_STRICT = $(CCC) /nologo /D__STDC__=0
 CCC_TEMPL_INST_FLAG =
@@ -117,7 +104,7 @@ CCC_OPT_YES = /Ox
 #
 # /Zi include debugging info in object files
 # /Fr create source browser file
-CCC_OPT_NO = /Zi 
+CCC_OPT_NO = /Zi /Fr
 
 #
 # the following options are required when
@@ -137,9 +124,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 /incremental:no
+LINK_OPT_FLAGS_NO = /WARN:3 /debug 
 OPT_LDFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT))
 
 ARCH_DEP_CFLAGS=
@@ -266,6 +253,3 @@ LINK.cc = $(WINLINK) -nologo $(LDFLAGS) -out:$@
 # $(dir $(USR_DEPLIBS))
 #USR_LDFLAGS += $(sort $(USR_DIRS:%=-L%))
 
-# Overrides for CONFIG_COMMON default
-POSIX_CPPFLAGS_YES = 
-

config/CONFIG.Host.alpha

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.

config/CONFIG.Host.cygwin32

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.
@@ -41,4 +32,3 @@ OP_SYS_LDLIBS =
 GCC_DEP_CFLAGS = -D_REENTRANT
 G++_DEP_CFLAGS = -D_REENTRANT
 
-POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE

config/CONFIG.Host.hp700

@@ -1,18 +1,9 @@
-#*************************************************************************
-# 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.
 #  Sites may override these definitions in CONFIG_SITE.Host.hp700
 
-ARCH_CLASS = hpux
+ARCH_CLASS = hp700
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
@@ -62,8 +53,8 @@ HPCC_DEP_CFLAGS=+DAportable
 #New HP C++ compiler
 CCC = aCC
 # avoid treating "future errors" as actual errors
-CCC_NORMAL = $(CCC) +W302 +W829 +W818 +W392 +W469 +W495 +W749 +W667 +W392 +W684
-CCC_STRICT = $(CCC) +p
+CCC_NORMAL = $(CCC) -AA -Aa +W302 +W829 +W818 +W392 +W469 +W495 +W749 +W667 +W392 +W684
+CCC_STRICT = $(CCC) -AA -Aa +p
 CCC_TEMPL_INST_FLAG =
 CCC_WARN_YES = +w
 CCC_WARN_NO =
@@ -82,8 +73,11 @@ CCC_DEP_CFLAGS=+DAportable
 
 # +DAportable causes portable object code to be created for execution
 # on different PA-Risc machines
+
+empty:=
+space:= $(empty) $(empty)
+
 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
-
+ARCH_DEP_LDFLAGS = -Wl,+b,$(subst $(space),:,$(DEFAULT_SHRLIB_SEARCH_PATH)),+s

config/CONFIG.Host.hpux-parisc

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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-parisc is the new name for hp700
--include $(EPICS_BASE)/config/CONFIG.Host.hp700

config/CONFIG.Host.linux-x86

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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
--include $(EPICS_BASE)/config/CONFIG.Host.Linux

config/CONFIG.Host.osf-alpha

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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

config/CONFIG.Host.sgi

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.

config/CONFIG.Host.solaris

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.
@@ -32,26 +23,27 @@ SPARCWORKS = /opt/SUNWspro
 
 # Configure OS vendor C compiler
 ACC = $(SPARCWORKS)/bin/cc
-ACC_ANSI = $(ACC) -Xa -v
+ACC_ANSI = $(ACC) -Xa
 ACC_STRICT = $(ACC) -Xc -v
 ACC_TRAD = $(ACC) -Xs
-ACC_DEP_CFLAGS = -KPIC
+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_YES= -lw -lintl -Bdynamic -ldl -Bstatic
 ACC_SLIBS_NO=
 ACC_SHRLIB_CFLAGS_YES =
-ACC_SHRLIB_LDFLAGS_YES =  -G -h $@ -z ignore -z combreloc -z lazyload
+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
+CCC_DEP_CFLAGS = -KPIC -D_REENTRANT
 CCC_TEMPL_INST_FLAG =
 CCC_WARN_YES = +w
 CCC_WARN_NO = 
@@ -59,22 +51,16 @@ 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_YES= -lw -lintl -Bdynamic -ldl -Bstatic
 CCC_SLIBS_NO=
 CCC_DEPENDS_FLAG = -xM1
 CCC_SHRLIB_CFLAGS_YES =
-CCC_SHRLIB_LDFLAGS_YES =  -G -h $@ -z ignore -z combreloc -z lazyload
+CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
  
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
 POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
 
 # socket and nsl needed by libca.a
-ARCH_DEP_LDLIBS += -lsocket -lnsl
-ARCH_DEP_LDLIBS += -lposix4 -lpthread
-ARCH_DEP_LDLIBS_8 = -lCrun
-ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
+ARCH_DEP_LDLIBS = -lsocket -lnsl
 
-#Allows R3.13 built extensions to load R3.14 shared libs
-SYS_DLL_LIBS_solaris_8 = Crun
-SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))

config/CONFIG.Host.solaris-sparc

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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
--include $(EPICS_BASE)/config/CONFIG.Host.solaris

config/CONFIG.Host.solaris-sparc-gnu

@@ -1,14 +0,0 @@
-#*************************************************************************
-# 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
--include $(EPICS_BASE)/config/CONFIG.Host.solarisGnu
-

config/CONFIG.Host.solaris-x86

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.

config/CONFIG.Host.solaris-x86-gnu

@@ -1,19 +0,0 @@
-#*************************************************************************
-# 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.solarisGnu
-
-# Solaris on x86
-ARCH_DEP_CPPFLAGS += -D_X86_
-

config/CONFIG.Host.solarisGnu

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.solarisGnu
 #
 #  This file is maintained by the EPICS community.
@@ -17,9 +8,6 @@ ARCH_CLASS = solaris
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
 
-#
-# required by sun's C++ compiler
-#
 AR = ar
 _AR = $(AR) $(ARFLAGS)
 G++_AR = $(_AR)
@@ -35,14 +23,7 @@ CPLUSPLUS=G++
 
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
-POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
 
 # socket and nsl needed by libca.a
 ARCH_DEP_LDLIBS += -lsocket -lnsl
-ARCH_DEP_LDLIBS += -lposix4 -lpthread
-ARCH_DEP_LDLIBS_8 = -lCrun
-ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
 
-#Allows R3.13 built extensions to load R3.14 shared libs
-SYS_DLL_LIBS_solaris_8 = Crun
-SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))

config/CONFIG.Host.sun4

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.

config/CONFIG.Host.sun4-sparc

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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

config/CONFIG.Host.win32-x86-borland

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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

config/CONFIG.Vx

@@ -20,7 +20,7 @@ OS_CLASS = vxWorks
 
 # The definitions VX_DIR, VX_GNU, GNU_DIR and GNU_LIB
 # can be overridden for specific host architectures
-# by creating a CONFIG_SITE.Vx.<host_archfile with
+# by creating a CONFIG_SITE.Vx.<host_arch> file with
 # the override definitions.
 
 # Tornado directory definitions
@@ -58,7 +58,8 @@ LD = $(GNU_BIN)/ld$(CMPLR_SUFFIX) -r
 CPLUSPLUS_YES = G++
 G++ = $(GNU_BIN)/cc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc
 LD_G++ = $(GNU_BIN)/ld$(CMPLR_SUFFIX) -r
-NM = $(GNU_BIN)/nm$(CMPLR_SUFFIX)$(HOSTEXE)
+NM = $(GNU_BIN)/nm$(CMPLR_SUFFIX)
+MUNCH = $(GNU_BIN)/munch
 
 #--------------------------------------------------
 # Pre Tornado C++ crosscompiler definitions
@@ -96,7 +97,6 @@ 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
@@ -136,16 +136,3 @@ WARN_CXXFLAGS = $($(CPLUSPLUS)_WARN_$(VX_WARN))
 LINK.c = $(LD) $(LDFLAGS) -o
 LINK.cc = $(LD_CXX) $(LDFLAGS) -o
 
-
-#--------------------------------------------------
-# Munch definitions
-MUNCH_SUFFIX=.munch
-MUNCHNAME = $(LIBNAME:%=%$(MUNCH_SUFFIX))
-
-#--------------------------------------------------
-# The follow 2 exports prevent gnu cross-compiler
-# from finding wrong assembler (as).
-export WIND_BASE = $(VX_DIR)
-export WIND_HOST_TYPE
-
-

config/CONFIG.Vx.T2-ppc604

@@ -0,0 +1,18 @@
+# CONFIG.Vx.ppc604_long,v 1.1.2.1 2002/12/05 20:44:26 jba Exp
+#
+# This file is maintained by the EPICS community.
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+ 
+# For Vx directories of form:
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+ARCH_CLASS = ppc
+
+# Architecture specific build flags 
+ARCH_DEP_CPPFLAGS = -mcpu=604 -D_GNU_TOOL -DTRUE=1
+ARCH_DEP_CFLAGS = --no-builtin -mstrict-align -mlongcall
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
+
+# ARCH_DEP_CFLAGS+= -fsigned-char     #May need for calcPerform.c
+

config/CONFIG.Vx.V69-ppc604

@@ -0,0 +1,17 @@
+# CONFIG.Vx.ppc604_long,v 1.1.2.1 2002/12/05 20:44:26 jba Exp
+#
+# This file is maintained by the EPICS community.
+
+GCC_OPT_YES = -O2
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+ 
+# For Vx directories of form:
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+ARCH_CLASS = ppc
+
+# Architecture specific build flags 
+ARCH_DEP_CPPFLAGS = -mcpu=604 -DCPU=PPC604 -D_VXWORKS_COMPATIBILITY_MODE -DBSD=44
+ARCH_DEP_CFLAGS = -mstrict-align -mlongcall -fno-implicit-fp -fno-strict-aliasing -fno-section-anchors
+VENDOR_DEP_CFLAGS = -std=c99

config/CONFIG.Vx.frc40

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.

config/CONFIG.Vx.frc5ce

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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

config/CONFIG.Vx.hkbaja47

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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$
 #

config/CONFIG.Vx.hkbaja60

@@ -1,25 +0,0 @@
-#*************************************************************************
-# 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.
-
-# Vx GNU cross compiler suffix
-CMPLR_SUFFIX = 68k
- 
-# For Vx directories of form:
-#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
-ARCH_CLASS = 68k
-
-# Architecture specific build flags
-ARCH_DEP_CPPFLAGS = -DCPU=MC68060 -DCPU_FAMILY=MC680X0
-ARCH_DEP_CFLAGS = -m68040
-

config/CONFIG.Vx.hkv2f

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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$
 #

config/CONFIG.Vx.mv147

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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$
 #

config/CONFIG.Vx.mv1604

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.

config/CONFIG.Vx.mv162

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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$
 #

config/CONFIG.Vx.mv162lc

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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$
 #

config/CONFIG.Vx.mv167

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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$
 #

config/CONFIG.Vx.mv177

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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$
 #

config/CONFIG.Vx.mv2700

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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$
 #

config/CONFIG.Vx.niCpu030

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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
 #

config/CONFIG.Vx.pc486

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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
 #
@@ -22,5 +13,5 @@ ARCH_CLASS = pc486
 ARCH_DEP_CPPFLAGS = -DCPU=I80486 -DCPU_FAMILY=I80x86 -D_X86_ 
 ARCH_DEP_CFLAGS = -m486
 ARCH_DEP_CXXFLAGS += -x 'c++' 
-ARCH_DEP_CFLAGS += -fno-defer-pop
+ARCH_DEP_CFLAGS +=   -fno-builtin -fno-defer-pop
 

config/CONFIG.Vx.ppc603

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.

config/CONFIG.Vx.ppc604

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.

config/CONFIG.Vx.simpc

@@ -1,30 +0,0 @@
-#*************************************************************************
-# 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
-#
-# This file is maintained by the EPICS community.
-
-# Vx GNU cross compiler suffix
-CMPLR_SUFFIX = simpc
- 
-# For Vx directories of form:
-#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
-ARCH_CLASS = simpc
-
-ARCH_DEP_CPPFLAGS = -DCPU=SIMNT -DCPU_FAMILY=SIMNT -D_X86_ 
-ARCH_DEP_CFLAGS = -mpentium
-ARCH_DEP_CXXFLAGS += -x 'c++' 
-ARCH_DEP_CFLAGS += -fno-defer-pop -DRW_MULTI_THREAD -D_REENTRANT -nostdlib
-
-#
-# no drivers on the Tornado II simulator
-#
-DIRS = $(filter-out drv dev devOpt, $(DIRS)) 

config/CONFIG.Vx.vxWorks-486

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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
-include $(EPICS_BASE)/config/CONFIG.Vx.pc486

config/CONFIG.Vx.vxWorks-68040

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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
-include $(EPICS_BASE)/config/CONFIG.Vx.mv167

config/CONFIG.Vx.vxWorks-68040lc

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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
-include $(EPICS_BASE)/config/CONFIG.Vx.mv162lc

config/CONFIG.Vx.vxWorks-ppc603

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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-ppc603 is the new R3.14 name for ppc603
-include $(EPICS_BASE)/config/CONFIG.Vx.ppc603

config/CONFIG.Vx.vxWorks-ppc604

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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
-include $(EPICS_BASE)/config/CONFIG.Vx.ppc604

config/CONFIG.Vx.vxipc

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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
 #
@@ -22,5 +13,5 @@ ARCH_CLASS = pc486
 ARCH_DEP_CPPFLAGS = -DCPU=I80486 -DCPU_FAMILY=I80x86 -D_X86_ 
 ARCH_DEP_CFLAGS = -m486
 ARCH_DEP_CXXFLAGS += -x 'c++' 
-ARCH_DEP_CFLAGS += -fno-defer-pop
+ARCH_DEP_CFLAGS +=   -fno-builtin -fno-defer-pop
 

config/CONFIG_BASE

@@ -36,16 +36,19 @@ DIRS += dbtools
 DIRS += rsrv
 DIRS += rec
 DIRS += as 
-DIRS += drv
-DIRS += dev
-DIRS += devOpt
+#DIRS += drv
+#DIRS += dev
+DIRS += dev/softDev
+DIRS += dev/symbDev
+DIRS += dev/testDev
+#DIRS += devOpt
 DIRS += iocCore
 
 #
 # if CPLUSPLUS isnt empty then include C++ src codes
 #
-DIRS += $(patsubst %,gdd,$(strip $(CPLUSPLUS)))
-DIRS += $(patsubst %,cas,$(strip $(CPLUSPLUS)))
+#DIRS += $(patsubst %,gdd,$(strip $(CPLUSPLUS)))
+#DIRS += $(patsubst %,cas,$(strip $(CPLUSPLUS)))
 
 EPICS_BASE = $(TOP)
 
@@ -58,25 +61,3 @@ 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)
-

config/CONFIG_BASE_VERSION

@@ -17,8 +17,8 @@
 #
 
 EPICS_VERSION=3
-EPICS_REVISION=14
-EPICS_MODIFICATION=1
+EPICS_REVISION=13
+EPICS_MODIFICATION=10
 EPICS_UPDATE_NAME=
 EPICS_UPDATE_LEVEL=0
 
@@ -28,6 +28,4 @@ EPICS_LOCAL_VERSION=0
 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

config/CONFIG_COMMON

@@ -69,8 +69,8 @@ INSTALL_LIBRARY = $(INSTALL)
 
 # dbtools from EPICS
 
-# state notation language compiler (removed from base for R3.14)
-SNC = $(SEQ)/bin/$(HOST_ARCH)/snc$(EXE)
+# state notation language compiler (installed from base/src/sequencer)
+SNC = $(EPICS_BASE_HOST_BIN)/snc$(EXE)
 
 ifdef T_A
 
@@ -88,10 +88,9 @@ 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 = -O3
+GCC_OPT_YES = -O
 GCC_OPT_NO = -g
 GCC_SFLAGS_YES = -static
 GCC_SFLAGS_NO =
@@ -110,7 +109,7 @@ G++_WARN_YES = -Wall \
       -Wwrite-strings -Wconversion -Wstrict-prototypes\
       -Wpointer-arith -Winline
 G++_WARN_NO = -w
-G++_OPT_YES = -O3
+G++_OPT_YES = -O
 G++_OPT_NO = -g
 G++_SFLAGS_YES = -static
 G++_SFLAGS_NO =
@@ -185,18 +184,9 @@ TEMPL_INST_CXXFLAG = $($(CPLUSPLUS)_TEMPL_INST_FLAG)
 #--------------------------------------------------
 # Epics includes (CONFIG.Vx will override OS_CLASS)
 OS_CLASS = $(ARCH_CLASS)
-EPICS_INCLUDES = -I$(INSTALL_INCLUDE)/os/$(OS_CLASS) -I$(INSTALL_INCLUDE)
+EPICS_INCLUDES = -I$(INSTALL_INCLUDE) -I$(INSTALL_INCLUDE)/os/$(OS_CLASS)
 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))
@@ -241,9 +231,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) $(POSIX_LDLIBS)
+ $(STATIC_LDLIBS) $(OP_SYS_LDLIBS)
 
-CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(POSIX_CPPFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)
 
 CPPSNCFLAGS = $(INCLUDES)
 

config/CONFIG_COMPAT

@@ -1,47 +0,0 @@
-#*************************************************************************
-# 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$
-#
-# Convert old HOST_ARCH environment variable 
-
-#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_alpha = osf-alpha
-ARCH_Borland = win32-x86-borland
-ARCH_cygwin32 = win32-x86-cygwin
-
-ifndef EPICS_HOST_ARCH
-ifdef HOST_ARCH
-EPICS_HOST_ARCH = $(firstword $(ARCH_$(HOST_ARCH)) $(HOST_ARCH))
-else 
-EPICS_HOST_ARCH = unsupported
-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.
-
-

config/CONFIG_HOST_ARCH.Borland

@@ -1,17 +1,7 @@
-#*************************************************************************
-# 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
 #
 
 EXE=.exe
-HOSTEXE=.exe
 
 CP   =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
 MV   =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl

config/CONFIG_HOST_ARCH.Linux

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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
@@ -14,5 +5,5 @@
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
 
-WIND_HOST_TYPE = i386-linux2
+WIND_HOST_TYPE = x86-linux
 

config/CONFIG_HOST_ARCH.LynxOS

@@ -1,18 +0,0 @@
-#*************************************************************************
-# 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
-
-# Include definitions common to all Unix archs
-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
-
-WIND_HOST_TYPE = LynxOS
-

config/CONFIG_HOST_ARCH.UnixCommon

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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
 #

config/CONFIG_HOST_ARCH.WIN32

@@ -1,17 +1,7 @@
-#*************************************************************************
-# 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
 #
 
 EXE=.exe
-HOSTEXE=.exe
 
 CP   =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
 MV   =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl

config/CONFIG_HOST_ARCH.alpha

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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

config/CONFIG_HOST_ARCH.cygwin32

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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.
@@ -15,7 +6,6 @@
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
 
 EXE=.exe
-HOSTEXE=.exe
 
 TORNADO=YES
 

config/CONFIG_HOST_ARCH.hp700

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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

config/CONFIG_HOST_ARCH.hpux-parisc

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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-parisc is the new name for hp700
--include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.hp700

config/CONFIG_HOST_ARCH.linux-x86

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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
--include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Linux

config/CONFIG_HOST_ARCH.osf-alpha

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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

config/CONFIG_HOST_ARCH.sgi

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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

config/CONFIG_HOST_ARCH.solaris

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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

config/CONFIG_HOST_ARCH.solaris-sparc

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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
--include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris

config/CONFIG_HOST_ARCH.solaris-x86

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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

config/CONFIG_HOST_ARCH.solaris-x86-gnu

@@ -1,4 +0,0 @@
-#  $Id$
-
--include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris
-

config/CONFIG_HOST_ARCH.solarisGnu

@@ -1,4 +1,4 @@
-#  CONFIG_HOST_ARCH.solaris
+#  CONFIG_HOST_ARCH.solarisGnu
 #
 # Override values in CONFIG.Vx
 

config/CONFIG_HOST_ARCH.sun4

@@ -1,12 +1,3 @@
-#*************************************************************************
-# 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

config/CONFIG_HOST_ARCH.sun4-sparc

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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

config/CONFIG_HOST_ARCH.win32-x86

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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
--include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.WIN32

config/CONFIG_HOST_ARCH.win32-x86-borland

@@ -1,13 +0,0 @@
-#*************************************************************************
-# 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

config/CONFIG_SITE

@@ -8,6 +8,7 @@
 #	only.
 #
 
+INSTALL_LOCATION=/usr/local/epics/base-3.13.10
 
 #  The host architecture performing the build,
 #	i.e.: the arch running DCT/getrel/etc.
@@ -54,7 +55,7 @@ endif
 #       sbs_pc6
 #       vxipc
 #
-CROSS_COMPILER_TARGET_ARCHS=
+CROSS_COMPILER_TARGET_ARCHS=T2-ppc604 V69-ppc604
 
 
 #  If only a subset of the host architectures perform
@@ -70,8 +71,8 @@ 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/tornado202
+VX_DIR_YES = /usr/local/vw/tornado202p1
+
 
 #  VxWorks directory for TORNADO=NO
 #VX_DIR_NO=$(VW)
@@ -169,4 +170,3 @@ E2DB_FLAGS =
 #dbst 
 DBST = $(EPICS_EXTENSIONS)/bin/$(HOST_ARCH)/dbst
 
-include $(EPICS_BASE)/config/CONFIG_COMPAT

config/CONFIG_SITE.Host.LynxOS

@@ -1,15 +0,0 @@
-#
-# $Id$
-#
-# Site Specific Configuration Information
-# Only the local epics system manager should modify this file
-
-# APS overrides of definitions 
-
-GCC = gcc
-G++ = g++
-CC = gcc
-CCC = g++
-ACC = gcc
-PLUSPLUS = g++
-CXX = g++

config/CONFIG_SITE.Host.darwin-ppc

@@ -1,5 +0,0 @@
-# $Id$
-
--include $(EPICS_BASE)/config/CONFIG_SITE.Host.Darwin
-
-SHARED_LIBRARIES=NO

config/CONFIG_SITE.Host.hp700

@@ -8,7 +8,7 @@
 SHARED_LIBRARIES=YES
 
 # where we expect to find shared libraries if not found elsewhere
-# DEFAULT_SHRLIB_SEARCH_PATH = /home/controls/epics/cdev/lib/hpux-10.20:/home/controls/epics/cdev/lib/hpux-10.XX:/opt/TclTk/lib:/opt/xpm/lib/X11:/usr/lib/pa1.1:/usr/lib:/lib:/opt/csr/installed/HP-UX/lib::/opt/OPI/GUI/lib/hp700:/opt/OPI/MapperApplications/lib/hp700:/opt/OPI/cdevAppl/lib/hp700:/opt/OPI/cmlog/lib/hp700:/opt/OPI/models/lib/hp700:/opt/OPI/sddsAppl/lib/hp700
+#DEFAULT_SHRLIB_SEARCH_PATH = /opt/epics/R$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)/support/base/$(EPICS_VERSION)-$(EPICS_REVISION)-$(EPICS_MODIFICATION)/lib/hp700
 DEFAULT_SHRLIB_SEARCH_PATH = /cs/lib/R$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION).$(EPICS_UPDATE_NAME)$(EPICS_UPDATE_LEVEL):$(INSTALL_LIB)
 
 #No special action should be required to build or use shared libraries.

config/CONFIG_SITE.Host.hpux-parisc

@@ -1,4 +0,0 @@
-# $Id$
-
-# hpux-parisc is the new name for hp700
--include $(EPICS_BASE)/config/CONFIG_SITE.Host.hp700

config/CONFIG_SITE.Host.linux-x86

@@ -1,7 +0,0 @@
-# $Id$
-
-# linux-x86 is the new name for linux
--include $(EPICS_BASE)/config/CONFIG_SITE.Host.Linux
-
-#SHARED_LIBRARIES=YES
-

config/CONFIG_SITE.Host.solaris

@@ -6,6 +6,6 @@
 
 # APS overrides of definitions 
 
-GCC = /opt/gnu/bin/gcc
-G++ = /opt/gnu/bin/g++
+#GCC = /opt/gnu/bin/gcc
+#G++ = /opt/gnu/bin/g++
 

config/CONFIG_SITE.Host.solaris-sparc

@@ -1,4 +0,0 @@
-# $Id$
-
-# solaris-sparc is the new name for solaris
--include $(EPICS_BASE)/config/CONFIG_SITE.Host.solaris

config/CONFIG_SITE.Host.solaris-sparc-gnu

@@ -1,4 +0,0 @@
-# $Id$
-
-# solaris-sparc is the new name for solaris
--include $(EPICS_BASE)/config/CONFIG_SITE.Host.solaris

config/CONFIG_SITE.Host.win32-x86

@@ -1,5 +0,0 @@
-# $Id$
-
-# win32-x86 is the new name for WIN32
--include $(EPICS_BASE)/config/CONFIG_SITE.Host.WIN32
-

config/CONFIG_SITE.Host.win32-x86-borland

@@ -1,4 +0,0 @@
-# $Id$
-
-# win32-x86-borland is the new name for Borland
--include $(EPICS_BASE)/config/CONFIG_SITE.Host.Borland

config/CONFIG_SITE.Vx.Linux

@@ -7,4 +7,22 @@
 # combinations by creating a CONFIG_SITE.Vx.Linux.<T_A>
 # file with the override definitions.
 
+## ---- jba overrides for cross compiler
+## VX_DIR needed for "export WIND_BASE = $(VX_DIR)"
+#VX_DIR_YES = /home/phoebus/JBA/gnu
+#VX_GNU_YES = $(VX_DIR)
+#VX_INCLUDE_YES = $(VX_GNU)/$(GNU_TARGET)/include
+#
+#CMPLR_PREFIX=  $(GNU_TARGET)-
+#CMPLR_SUFFIX=
+#GCC    = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc
+#AR     = $(GNU_BIN)/$(CMPLR_PREFIX)ar$(CMPLR_SUFFIX)
+#CPP    = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc -x c -E
+#RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX)
+#LD     = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
+#G++    = $(GNU_BIN)/$(CMPLR_PREFIX)g++$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc
+#LD_G++ = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
+#NM     = $(GNU_BIN)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)
+## ---- end jba overrides
+
 -include $(EPICS_BASE)/config/CONFIG_SITE.$(BUILD_TYPE).$(HOST_ARCH).$(T_A)