changes for 3.14.0alpha2

provides similar functionallity.
Allow for longer task names in semaphore show messages.

Makefile

@@ -1,43 +1,19 @@
 #
-# 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)/config/CONFIG_BASE
+TOP = .
+include $(TOP)/configure/CONFIG
 
-DIRS = src config
+DIRS += config configure src
 
-INSTALL_BIN = $(INSTALL_LOCATION)/bin/$(HOST_ARCH)
+include $(TOP)/configure/RULES_TOP
 
-#
-# 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 uninstall clean depends buildInstall :: $(PERL_BOOTSTRAP_SCRIPTS_INSTALL)
-
-include $(TOP)/config/RULES_TOP
-
-release: 
+release::
 	@echo TOP: Creating Release...
-	@./MakeRelease
+	@$(TOOLS)/MakeRelease
 
-built_release:
+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)
-
+	@$(TOOLS)/MakeRelease -b $(INSTALL_LOCATION)
+	

README

@@ -1,290 +0,0 @@
-$Id$
-
-----------------------------------------------------------------------------
-3.13 EPICS BASE Notes and Build Instructions.
-	- By Matthew Needes
-----------------------------------------------------------------------------
-
-Notes:
-
-1. Before you can build or use EPICS, the environemnt variable HOST_ARCH
-   must be set. The epics/startup/HostArch script file has been provided
-   to set HOST_ARCH.
-
-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 shellscripts 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 
-
-

README.Linux

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

@@ -1,44 +0,0 @@
-Perl
-====
-
-A number of shell scripts are now Perl scripts,
-most important:
-
-tools/installEpics.pl
-include/makeEpicsVersion.pl
-libCom/bldEnvData.pl
-libCom/makeStatSymTbl.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

@@ -25,13 +25,17 @@ Right now this port of EPICS to WIN32 should allow you to
   and all other EPICS base libraries as DLLs.
 * build gdd, cas and a demo of the new portable CA server on WIN32.
 
+To build only for WIN32 and not cross compile for IOC development type 
+"make host" or in your config files set "CROSS_COMPILER_HOST_ARCHS=void"
+
+
 1) see what you have
 --------------------
 
 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: 4.0)  (borland C++ rumored to work also)
+	Microsoft's Visual C/C++   (used: 6.0)  (borland C++ rumored to work also)
 
 and some tools:
 
@@ -47,19 +51,28 @@ 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:
+When setting paths in the EPICS CONFIG files for WIN32 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.
 
-	** Note that that each "\" in any path variables
+	** Note that that each "\" in any path variables you set
 		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 must be replaced with 
+        path name variable you set must be replaced with 
         a "\ " (this is because GNU make treats all " " separated
         input as independent tokens in the input stream.
 
 	** WIN32 will generally allow "/" and "\" interchangeably in file paths,
-		but the DOS shell appears to only accept "\".
+		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.
 
 Your path should include:
 - The EPICS-binaries that we are about to build in <EPICS>base/bin/WIN32
@@ -169,13 +182,18 @@ 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). I have not so far determined 
-how to configure visual C++ so that it is possible to double click on the compiler 
+executable search path (from the tools/options menu). 
+In visual C++ 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 (as is 
-normally the case in the visual C++ environment). If you solve this problem please 
-forward the details to johill@lanl.gov.
+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.
 
-Good luck !
-
--Kay
+6) When compiling applications that link with EPICS base you will need to
+include from <epics>\base\include, include from <epics>\base\include\os\win32,
+and augment the link path with <epics>\base\lib\win32-x86. If the visual C++
+/Za option is not used then you will also need to define __STDC__ to be zero 
+on the command line.

README.cygwin32

@@ -1,87 +0,0 @@
-Compiling EPICS on cygwin32 (Windows95/NT)
-------------------------------------------
-
-Right now this port of EPICS to cygwin32 it is possible to
-compile the EPICS base for the cygwin32 Host using Cygnus' beta19
-release of the GNU-win32 tools.
- 
-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/...
-        Cygnus's latest gnu-win32 distribution, available from 
-           http://www.cygnus.com/misc/gnu-win32/ (release b19 or later)
-        Perl,version 5.003 or later, available from 
-            http://www.perl.org/CPAN/ports/win32/
-
-Optional items 
-        CVS, version 1.9 or later, available from
-            http:/download.cyclic.com 
-                  windows-nt  - cvs-1.9.10.tar.gz
-                                patch.exe
-                                win32gnu.dll
-        vim ( Vi IMproved), version 4.5 or later, available from
-           http://www.cygnus.com/misc/gnu-win32/ 
-        
-
-BUILD INSTRUCTIONS
-------------------
-
-
-1) Install the gnu-win32 binary release
----------------------------------------
-    Download the whole release, cdk.exe, to get the developemnt tools 
-
-    First move out of the way any older versions of gnuwin32
-
-    Run cdk.exe and follow the install instructions.
-
-    Don't forget to create a \tmp dir and setup the \bin dir.
-     (Create a \temp dir if you install cvs.)
-        mkdir \tmp
-        mkdir \temp
-        mkdir \bin
-        cd \bin
-        copy C:\cygnus\b19\H-i386-cygwin32\bin\sh.exe sh.exe
-
-   Install the b19.1 bug fix update to the Cygwin32 library.
-
-   (Optional: Install the GNU-WIN32 compiler replacement from
-    the ECGS project)
-
-2) Install the perl distribution
---------------------------------
-        pw32i316.exe    (Execute and follow instructions)
-
-3) Install the epics base distribution
---------------------------------------
-        mkdir <epicsBaseReleaseDir>
-        chdir <epicsBaseReleaseDir>
-        cp <dirname>\<basereleasename>.gz .
-        gunzip -d <basereleasename>.gz
-        chmod +w -R *
-
-4) Set environment variables and path using cygwin32.bat
--------------------------------------------------------------
-        <edit cygwin32.bat changing paths if necessary>
-        cd <epicsBaseReleaseDir>\startup
-        cygwin32.bat
-
-5) Set site specific parms in epics base\config files
------------------------------------------------------
-	cd <epicsBaseReleaseDir>\base\config
-	<edit CONFIG_SITE* files>
-
-6) Build epics base
--------------------
-        cd <epicsBaseReleaseDir>\base
-        make
-
-7) Create an EPICS application area (note forward slashes on perl cmd)
----------------------------------------------------------------------
-        mkdir <epicsappdir>
-        cd <epicsappdir>
-        perl <epicsBaseReleaseDir>/bin/cygwin32/makeBaseApp.pl -l
-        perl <epicsBaseReleaseDir>/bin/cygwin32/makeBaseApp.pl -t example example
-
-

README.hp700_alpha

@@ -1,28 +0,0 @@
-#
-# 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.htm

@@ -0,0 +1,506 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="Author" content="jba">
+   <meta name="GENERATOR" content="Mozilla/4.76 [en] (X11; U; SunOS 5.8 sun4u) [Netscape]">
+</head>
+<body>
+README.htm
+<center>
+<h1>
+Installation Instructions</h1></center>
+
+<center>
+<h2>
+EPICS base</h2></center>
+
+<center>
+<h2>
+Release 3.14.0alpha2</h2></center>
+
+<h3>
+What is EPICS base?</h3>
+
+<blockquote>The Experimental Physics and Industrial Control Systems (EPICS)
+is an extensible set of software components and tools with which application
+developers can create a control system. This control system can be used
+to control accelerators, detectors, telescopes, or other scientific experimental
+equipment. EPICS base is the set of core software, i.e. the components
+of EPICS without which EPICS would not function. EPICS base allows an arbitrary
+number of target systems, IOCs (input/output controllers), and host systems,
+OPIs (operator interfaces) of various types.</blockquote>
+
+<h3>
+What is new in this release?</h3>
+
+<blockquote>This version of EPICS base contains significant changes and
+offers major improvements in functionality over previous versions. Please
+check the RELEASE_NOTES file in the distribution for description of changes
+and release migration details.</blockquote>
+
+<h3>
+Copyright</h3>
+
+<blockquote>Please review the COPYRIGHT* files included in the distribution
+for legal terms of usage.</blockquote>
+
+<h3>
+Supported platforms</h3>
+
+<blockquote>Currently this version of EPICS base has been built on the
+following hosts for the following targets. If you are trying to build EPICS
+base on a different host or for a different target machine you must get
+the proper host/target cross compiler and header files and you will have
+to create and add the appropriate new configure files to the base/configure/os/directory.
+You can start by copying existing configuration files in the configure/os
+directory and then make changes for your new platforms.</blockquote>
+
+<blockquote><b>Host platforms (operating system - architecture - &lt;alternate
+c++ compiler>)</b>
+<blockquote><tt>solaris-sparc</tt>
+<br><tt>solaris-sparc-gnu</tt>
+<br><tt>linux-x86</tt>
+<br><tt>win32-x86</tt>
+<br><tt>win32-x86-borland</tt></blockquote>
+</blockquote>
+
+<blockquote>
+<h4>
+Cross compile target platforms (operating system - architecture)</h4>
+</blockquote>
+
+<blockquote>
+<blockquote><tt>vxWorks-486</tt>
+<br><tt>vxWorks-68040</tt>
+<br><tt>vxWorks-68040lc</tt>
+<br><tt>vxWorks-68060</tt>
+<br><tt>vxWorks-ppc604</tt>
+<br><tt>vxWorks-pentium</tt>
+<br><tt>RTEMS-gen68360</tt>
+<br><tt>RTEMS-mvme167</tt>
+<br><tt>RTEMS-pc386</tt></blockquote>
+</blockquote>
+
+<h3>
+Supported compilers</h3>
+
+<blockquote>This version of EPICS base has been built and tested using
+the host vendor's C and C++ compilers as well as the GNU gcc and g++ compilers.
+The GNU cross-compilers have been used for all cross-compiled targets.
+You may need the host vendor's C++ compiler in your search path to do EPICS
+builds. Check definitions of ACC and CCC in base/configure/os/CONFIG.&lt;host>.&lt;host>
+or the definitions for GCC and G++ if ANSI=GCC and CPLUSPLUS=GCC are specified
+in CONFIG_SITE.</blockquote>
+
+<h3>
+Software requirements</h3>
+
+<blockquote><b>GNU make</b>
+<br>You must use GNU make, gnumake, for any EPICS builds.&nbsp; Set your
+path so that a gnumake version 3.70 or later is available.
+<p><b>Perl</b>
+<br>You must have perl version 5.0 or later installed. The configure files
+do not specify the perl full pathname.&nbsp; You need the perl executable
+in your search path.
+<p><b>Unzip and tar (Winzip on WIN32 systems)</b>
+<br>You must have tools available to unzip and untar the EPICS base distribution
+file.
+<p><b>Tornado 2.0</b>
+<br>You must have Tornado 2.0 installed if any of your target systems are
+vxWorks systems.&nbsp; Tornado 2.0 provides the cross-compiler and header
+files needed to build for these target systems. The full path location
+to Tornado 2.0 must be specified in the base/configure/RELEASE or base/configure/RELEASE.&lt;hostarch>
+file. You will also need one or more board support packages. Consult the
+vxWorks documentation for details.
+<p><b>Optional GNU compiler requirement for solaris-sparc&nbsp; and win32-x86
+hosts</b>
+<br>If you wish to run "gnumake depends"&nbsp; to create header dependancy
+include files for c/c++ source code, g++ must be be in your path. Also,
+if you have state notation language source files (*.st files) which require
+c preprocessing before conversion to c source,&nbsp; gcc must be in your
+path.</blockquote>
+
+<h3>
+Host system storage requirements</h3>
+
+<blockquote>The GNU zipped tar file is approximately 1.4 MB in size. The
+unzipped untarred distribution source tree is approximately 6 MB. The build
+created files for each host take approximately 40 MB and the build created
+files for each target take approximately 10 MB.</blockquote>
+
+<h3>
+Documentation</h3>
+
+<blockquote>EPICS documentation is available on the WWW via the EPICS home
+page at APS:&nbsp; URL <a href="http://www.aps.anl.gov/Epics">http://www.aps.anl.gov/Epics</a></blockquote>
+
+<blockquote>This README.htm is in the base distribution file and will be
+available on the IOC software R3.14 EPICS WWW page which can be accessed
+from the APS EPICS home page.</blockquote>
+
+<h3>
+WWW pages</h3>
+
+<blockquote>
+<h4>
+EPICS home page at APS</h4>
+
+<blockquote><a href="http://www.aps.anl.gov/Epics">http://www.aps.anl.gov/epics</a></blockquote>
+
+<h4>
+Other WWW sites</h4>
+
+<blockquote>Additional information on EPICS can be found at the various
+other WWW links on the EPICS home page at APS.</blockquote>
+
+<h4>
+Mailing Lists</h4>
+
+<blockquote>There are five EPICS mailing lists provided by APS. See The
+EPICS home page for subscription instructions.</blockquote>
+</blockquote>
+
+<h3>
+Directory Structure</h3>
+
+<blockquote>Distribution directory structure:</blockquote>
+<tt>&nbsp;&nbsp;&nbsp;&nbsp; base&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Root directory of the base distribution</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/configure&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Operating system independent build config files</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/configure/os&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Operating system dependent build config files</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/configure/tools&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Perl and shell scripts used in the build</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/config&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+R3.13 compatibility build configuration files</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+All epics base source code in subdirectories</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/as&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Access security</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/bpt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Break point table</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/ca&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Channel access</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/cas&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Channel access server</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/db&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Database access</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/dbStatic&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Static database access</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/dbtools&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Database dbLoadTemplate tools</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/dev&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Device support</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/gdd&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+General data descriptor</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/iocsh&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Ioc shell command interpreter</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+General purpose library code in subdirectories</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/bucketLib&nbsp;&nbsp;&nbsp;
+Hash bucket</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/calc&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Algebraic expression interpreter</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/cvtFast&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Fast number to string conversion</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/cxxTemplates C++ templates</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/dbmf&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Memory management for frequent alloc/free</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/ellLib&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+EPICS double linked list</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/env&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Default EPICS environment settings</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/error&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Error handling definitions and routines</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/fdmgr&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+File descriptor manager</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/freeList&nbsp;&nbsp;&nbsp;&nbsp;
+Memory management using free lists</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/gpHash&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+General purpose hash table</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/logClient&nbsp;&nbsp;&nbsp;
+Logging client</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/macLib&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Macro substitution handler</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/misc&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Miscellaneous utilities</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/osi&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Operating system independent code</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/osi/os&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Operating system dependant code in subdirectories</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/test&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Test tools (timer, semBinary, semMutex,fdmgr, ?)</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/timer&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Timer</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCom/taskwd&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Task watchdog</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/libCompat&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+EPICS base R3.13 compatibility code</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/makeBaseApp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Perl tool+templates to create app dvl tree</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/makeBaseExt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Perl tool+templates to create extension dvl tree</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/misc&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Miscellaneous (coreRelease, iocInit, asSub*)</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/rec&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Record support</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/registry&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+EPICS support function registry</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/rsrv&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Channel access ioc resource server library</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/toolsComm&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Code for the build tools antelope and e_flex</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/util&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Utilities (ca_test, iocLogServer, startCArepeater)</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/src/vxWorks&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+R3.13 compatibility code specific to vxWorks</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/startup&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Scripts for setting up path and environment</tt>
+<p><tt>&nbsp;&nbsp;&nbsp;&nbsp; Install directories created by the build</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/bin&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Installed scripts and executables in subdirs</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/lib&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Installed libraries in arch subdirectories</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/dbd&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Installed data base definitions</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/include&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Installed header files</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/include/os&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Installed os specific header files</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp; base/templates&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Installed templates</tt>
+<h3>
+Build related components</h3>
+
+<blockquote>
+<li>
+base/README* files</li>
+
+<br><tt>README.htm&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Instructions for setup and building epics base</tt>
+<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+(i.e. this document)</tt>
+<br><tt>README.WIN32&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Microsoft
+WIN32 specific instructions</tt>
+<br><tt>README.cxxTemplates&nbsp; Information about C++ templates in EPICS
+base</tt>
+<br><tt>README.niCpu030&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; NI cpu030 specific
+instructions</tt>
+<br>&nbsp;
+<li>
+base/startup directory - contains scripts to set environment and path</li>
+
+<br><tt>EpicsHostArch&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; c shell script
+to set EPICS_HOST_ARCH env variable</tt>
+<br><tt>EpicsHostArch.pl&nbsp;&nbsp;&nbsp; perl script to set EPICS_HOST_ARCH
+env variable</tt>
+<br><tt>Site.profile&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; bourne shell
+script to set path and env variables</tt>
+<br><tt>Site.cshrc&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+c shell script to set path and env variables</tt>
+<br><tt>borland.bat&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; WIN32
+bat file to set path and env variables</tt>
+<br><tt>win32.bat&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+WIN32 bat file to set path and env variables</tt>
+<br>&nbsp;
+<li>
+base/configure&nbsp; directory - contains build definitions and rules</li>
+
+<br><tt>CONFIG.CrossCommon&nbsp;&nbsp;&nbsp; Cross build definitions</tt>
+<br><tt>CONFIG_ADDONS&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Definitions
+for &lt;osclass> and DEFAULT options</tt>
+<br><tt>CONFIG_BASE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+EPICS base tool and location definitions</tt>
+<br><tt>CONFIG_BASE_VERSION&nbsp;&nbsp; Definitions for EPICS base version
+number</tt>
+<br><tt>CONFIG_COMMON&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Definitions
+common to all builds</tt>
+<br><tt>CONFIG_ENV&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Definitions of EPICS environment variables</tt>
+<br><tt>CONFIG_SITE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Site specific make defintions</tt>
+<br><tt>CONFIG_SITE_ENV&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Site defaults
+for EPICS environment variables</tt>
+<br><tt>CONFIG&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Includes configure files and allows variable overrides</tt>
+<br><tt>RELEASE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Location of external products such as Tornado II</tt>
+<br><tt>RULES&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Includes appropriate rules file</tt>
+<br><tt>RULES.Db&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Rules for database and database definition files</tt>
+<br><tt>RULES_ARCHS&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Definitions and rules for building architectures</tt>
+<br><tt>RULES_BUILD&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Build and install rules and definitions</tt>
+<br><tt>RULES_DIRS&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Definitions and rules for building subdirectories</tt>
+<br><tt>RULES_JAVA&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Definitions and rules for java jars and classes</tt>
+<br><tt>RULES_TOP&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Rules specific to a &lt;top> dir (uninstall and tar)</tt>
+<br>&nbsp;
+<li>
+base/configure/os directory - contains os-arch specific definitions</li>
+
+<br><tt>CONFIG.&lt;host>.&lt;target>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Specific
+host-target build definitions</tt>
+<br><tt>CONFIG.Common.&lt;target>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Specific
+target definitions for all hosts</tt>
+<br><tt>CONFIG.&lt;host>.Common&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Specific host definitions for all targets</tt>
+<br><tt>CONFIG.UnixCommon.Common&nbsp;&nbsp;&nbsp; Definitions for Unix
+hosts and all target</tt>
+<br><tt>CONFIG.&lt;host>.vxWorksCommon Specific host definitions for all
+vx targets</tt>
+<br><tt>CONFIG_COMPAT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+R3.13 arch compatibility definitions</tt>
+<br>&nbsp;
+<li>
+base/configure/tools directory - contains Perl scripts used for the build</li>
+
+<br><tt>cp.pl&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+This Perl script copies an existing file</tt>
+<br><tt>installEpics.pl&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Installs built files into install directories.</tt>
+<br><tt>makeConfigAppInclude.pl Generates include,bin, lib dir definitions</tt>
+<br><tt>makeDbDepends.pl&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Generates
+dependencies from substitution files</tt>
+<br><tt>makeIocCdCommands.pl&nbsp;&nbsp;&nbsp; Generates cdCommands file
+for use in IOCs</tt>
+<br><tt>makeMakefile.pl&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Creates a Makefile in O.&lt;arch> dirs</tt>
+<br><tt>makeMakefileInclude.pl&nbsp; Creates file to be included by Makefile</tt>
+<br><tt>mkdir.pl&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Creates a directory (like Unix mkdir)</tt>
+<br><tt>munch.pl&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Creates a ctdt.c file for vxWorks targets</tt>
+<br><tt>mv.pl&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Renames an existing file.</tt>
+<br><tt>replaceVAR.pl&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Changes CapFast VAR(xxx) to $(xxx) notation</tt>
+<br><tt>rm.pl&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Quietly removes an existing file.</tt></blockquote>
+
+<h3>
+Building EPICS base (Unix and Win32)</h3>
+
+<blockquote><b>Unpack file</b>
+<blockquote>Unzip and untar the distribution file. Use WinZip on Windows
+systems.</blockquote>
+S<b>et environment variable</b>
+<blockquote>Before you can build or use EPICS R3.14, the environment variable
+EPICS_HOST_ARCH must be defined. A perl script EpicsHostArch.pl in the
+base/startup directory has been provided to help set EPICS_HOST_ARCH. You
+should have EPICS_HOST_ARCH set to your host operating system followed
+by a dash and then your host architecture, e.g. solaris-sparc.
+<p>On WIN32, some versions of Perl require that&nbsp; the environment variable
+PERLLIB be set to &lt;perl directory location>.</blockquote>
+<b>Check path requirements</b>
+<blockquote>As already mentioned, you must have the perl executable and
+you may need C and C++ compilers in your search path. For building base
+you also must have echo in your search path. For Unix host builds you also
+need touch, cpp, cp, rm, mv, and mkdir in your search path and /bin/chmod
+must exist. On some Unix systems you may also need ar and ranlib in you
+path, and the c compiler may require ld in your path.
+<p>If you plan to build EPICS base shared libraries instead of archive
+libraries, on Unix systems you will need to add&nbsp; fullpathname to $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH)
+to your LD_LIBRARY_PATH&nbsp;environment variable. On WIN32 systems, building
+shared libraries is the default setting and you will need to add&nbsp;
+fullpathname to $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) to your path.
+Building shared libraries is determined by the value of the macro SHARED_LIBRARIES&nbsp;in
+CONFIG_SITE (YES or NO).</blockquote>
+<b>Do site-specific build configuration</b>
+<blockquote><b>Site configuration</b>
+<br>To configure EPICS, you may want to modify the default definitions
+in the following files:
+<blockquote><tt>configure/CONFIG_SITE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </tt>-
+Build choices. Specify your target archs.
+<br><tt>configure/CONFIG_SITE_ENV&nbsp; </tt>- Set your environment variable
+definitions
+<br><tt>configure/RELEASE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </tt>-
+TORNADO 2 full path location</blockquote>
+
+<p><br><b>Host configuration</b>
+<br>To configure each host system, you may override the default definitions
+by adding a new file with override definitions into the configure/os directory.
+The new file should have the same name as the distribution file to be overridden
+except with CONFIG in the name changed to CONFIG_SITE.
+<blockquote><tt>configure/os/CONFIG.&lt;host>.&lt;host></tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+- Host build settings
+<br><tt>configure/os/CONFIG.&lt;host>.Common</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+- Host cross build settings</blockquote>
+<b>Target configuration</b>
+<br>To configure each target system, you may override the default definitions
+by adding a new file with override definitions into the configure/os directory.
+The new file should have the same name as the distribution file to be overridden
+except with CONFIG in the name replaced by CONFIG_SITE.
+<blockquote><tt>configure/os/CONFIG.Common.&lt;target></tt>&nbsp;&nbsp;
+- Target cross settings
+<br><tt>configure/os/CONFIG.&lt;host>.&lt;target>&nbsp;</tt> - Host-target
+settings</blockquote>
+<b>R3.13 compatibility configuration</b>
+<br>To configure EPICS base for building with R3.13 extensions and ioc
+applications , you will want to modify the default definitions in the base/config/CONFIG_SITE*&nbsp;
+files to agree with the definitions in your base/configure files.</blockquote>
+
+<h4>
+<b>Build EPICS base</b></h4>
+
+<blockquote>After configuring the build you should be able to build EPICS
+base by issuing the following commands in the distribution's root directory
+(base)
+<blockquote><tt>gnumake clean uninstall</tt>
+<br><tt>gnumake</tt></blockquote>
+The command "gnumake clean uninstall" will remove all files and directories
+generated by a previous build. The command "gnumake" will build and install
+everything for the configured host and targets.
+<br>It is recommended that you do a "gnumake clean uninstall" at the root
+directory of an EPICS&nbsp; directory structure before each complete rebuild
+to ensure that all components will be rebuilt.</blockquote>
+</blockquote>
+
+<h3>
+Multiple host platforms</h3>
+
+<blockquote>You can build using a single EPICS directory structure on multiple
+host systems and for multiple cross target systems. The intermediate and
+binary files generated by the build will be created in separate subdirectories
+and installed into the appropriate separate host/target install directories.
+EPICS executables and perl scripts are installed into the <tt>$(INSTALL_LOCATION)/bin/&lt;arch></tt>
+directories. Libraries are installed into $<tt><font size=+1>(INSTALL_LOCATION)/lib/&lt;arch></font></tt>.
+The default definition for <tt>$(INSTALL_LOCATION)</tt> is <tt>$(TOP)</tt>
+which is the root directory in the distribution directory structure, base.
+Created object files are stored in O.&lt;arch> source subdirectories, This
+allows objects for multiple cross target architectures to be maintained
+at the same time. To build EPICS base for a specific host/target combination
+you must have the proper host/target c++ cross compiler and target header
+files and the base/configure/os directory must have the appropriate configure
+files.</blockquote>
+
+<h3>
+Examples</h3>
+
+<blockquote>A perl tool, makeBaseApp.pl is included in the distribution
+file. This script will create a sample application that then can be built
+and then executed to try out this release of base. Also, a perl script,
+makeBaseExt.pl, is included in the distribution file. This script will
+create a sample extension that can be built and executed. The makeBaseApp.pl
+and makeBaseExt.pl scripts are installed into the install location bin/&lt;hostarch>
+directory during the base build.</blockquote>
+
+<h3>
+Example base application</h3>
+
+<blockquote>Instructions for building and executing a 3.14 example application
+can be found in the section "Example Application" of Chapter 2, "New Features
+for 3.14", in the&nbsp; "IOC Application Developer's Guide R3.14.0alpha2"
+. The "Example Application"&nbsp; section briefly explains how to create
+and build an example application in a user created &lt;top> directory.
+It also explains how to run the example application on a vxWorks ioc or
+a host system and run an example channel access client on the host system.</blockquote>
+
+</body>
+</html>

README.solaris

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

config/CONFIG.Host.Borland

@@ -0,0 +1,264 @@
+# CONFIG.Host.Borland
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Borland
+ 
+# 	Use std path variables from ms
+HOME = $(HOMEDRIVE)$(HOMEPATH)
+
+BORLAND_LIB = $(BORLAND)\\lib
+BORLAND_INC = $(BORLAND)\\include
+BORLAND_BIN = $(BORLAND)\\bin
+
+#
+#
+ANSI = ACC
+CPLUSPLUS = CCC
+
+#
+# -q supress command line banner
+WINLINK = $(BORLAND_BIN)/ilink32 -q
+
+# -l specifies default language
+# -fo Renames the output .RES file
+RCCMD = $(BORLAND_BIN)/brcc32 $(subst -I,-i,$(INCLUDES)) -l0x409  -fo$@ $<
+
+ARCMD = $(BORLAND_BIN)/tlib $@
+
+#
+# Configure Borland C compiler
+# -q suppress compiler identification banner
+# -tWM generate a 32-bit multi-threaded target
+# -tWD generate a .DLL executable
+# -a8 quad word alignment
+# -D_WIN32 macro defined to be consistant with Microsoft Visual C++
+# -D_RTLDLL macro defined to use Borland C++ RTL library
+CCLINKOPT = -q -tWM -tWD -a8 -D_WIN32 -D_RTLDLL
+ACC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT)
+
+#
+# __STDC__=0 works but not as cleanly as with
+# Microsoft Visual C++.
+# The Borland header files use ifdef __STDC__ 
+# to disable many nice things. This is overridden
+# by defining NO_BORLAND_STDC in the Makefile.Host.
+#
+ifdef NO_BORLAND_STDC
+ACC_ANSI = $(ACC)
+ACC_STRICT = $(ACC)
+else
+ACC_ANSI = $(ACC) -D__STDC__=0
+ACC_STRICT = $(ACC) -D__STDC__=0
+endif
+ACC_TRAD = $(ACC)
+
+# -w display warnings on
+# -g0 no limit to warning messages
+# some warning message here are always disabled because they are 
+# trivial and numerous 
+# -w-8012 Comparing signed and unsigned values
+# -w-8060 Possibly incorrect assignment
+# -w-8071 Conversion may lose significant digits
+ACC_WARN_YES = -w -g0 -w-8012 -w-8060 -w-8071
+# -w- display warnings off
+ACC_WARN_NO =  -w-
+
+#
+# -k- turn off standard stack frame
+# -H- turn off precompiled headers
+# -R- don't include browser info in .obj files
+# -O1 optimization for size
+# -v- turn off source debugging
+# -vi control expansion of inline functions
+ACC_OPT_YES = -k- -H- -R- -O1 -v- -vi
+
+#
+ACC_OPT_NO = 
+
+
+#
+# no special libs for static link
+#
+ACC_SLIBS_YES= 
+ACC_SLIBS_NO=
+
+# Configure OS vendor C++ compiler
+#
+# __STDC__=0 works but not as cleanly as with
+# Microsoft Visual C++.
+# The Borland header files use ifdef __STDC__ 
+# to disable many nice things. This is overridden
+# by defining NO_BORLAND_STDC in the Makefile.Host.
+#
+CCC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT)
+ifdef NO_BORLAND_STDC
+CCC_NORMAL = $(CCC)
+CCC_STRICT = $(CCC)
+else
+CCC_NORMAL = $(CCC) -D__STDC__=0
+CCC_STRICT = $(CCC) -D__STDC__=0
+endif
+CCC_TEMPL_INST_FLAG =
+
+# -w display warnings on
+# -g0 no limit to warning messages
+# -w-8012 Comparing signed and unsigned values
+# -w-8060 Possibly incorrect assignment
+# -w-8071 Conversion may lose significant digits
+CCC_WARN_YES = -w -g0 -w-8012 -w-8060 -w-8071
+# -w- display warnings off
+CCC_WARN_NO = -w-
+
+#
+# -k- turn off standard stack frame
+# -H- Turn off precompiled headers
+# -R- Don't include browser info in .obj files
+# -O1 optimization for size
+# -v- turn off source debugging
+# -vi control expansion of inline functions
+CCC_OPT_YES = -k- -H- -R- -O1 -v- -vi
+
+#
+CCC_OPT_NO = 
+
+#
+# no special libs for static link
+#
+CCC_SLIBS_YES=
+CCC_SLIBS_NO=
+
+PROD_VERSION=3.13
+# -c case sensitive linking
+# -C clear state before linking
+# -Gi generate import library
+# -Gn no state files
+# -Tpd targets a Windows .DLL file
+# -x no map
+# -w display warnings on
+LINK_OPT_FLAGS_YES = -c -C -Gi -Gn -Tpd -x -w
+LINK_OPT_FLAGS_NO = -c -C -Gi -Gn -Tpd -x -w-
+WIN32_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT))
+OPT_LDFLAGS = 
+
+ARCH_DEP_CFLAGS=
+
+#	to identify the general architecture class:
+#	should be BSD, SYSV, WIN32, ...
+#	is: WIN32, sun4, hpux, linux, ...
+#
+ARCH_CLASS=WIN32
+
+#	ifdef WIN32   looks better that  ifeq ($(ARCH_CLASS),WIN32)  ??
+WIN32=1
+BORLANDC=1
+
+EXE=.exe
+OBJ=.obj
+RES=.res
+
+#       Problem: BorlandC does not recognize  *.cc as C++ source,
+#       we have to compile xx.cc  using the flag -P xx.cc,
+SOURCE_CXXFLAG = -P -D__cplusplus
+
+#	Operating system flags 
+OP_SYS_CFLAGS =
+
+#
+# Borland specific include files
+#
+OP_SYS_INCLUDES = -I$(BORLAND_INC)
+#
+OP_SYS_LDLIBS =
+
+#
+# specify dll .def file only if it exists
+#
+#DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(LIBRARY).def))
+DLL_DEF_FLAG = $(subst /,\\,$(wildcard ../$(LIBRARY).def))
+
+#	HOST_OPT_FLAGS is part of CFLAGS/CXXFLAGS,
+#	which in turn are used in COMPILE.c[c]
+#
+#	If we compile a .c, .cc into an $(OBJ),
+#	we test if this object is part of the 
+#	library objects LIBOBJS.
+#	If so, we define _WINDLL so that
+#	e.g. include/shareLib.h works correctly.
+#
+HOST_OPT_FLAGS += $(subst $@, /_WINDLL, $(findstring $@,$(LIBOBJS)))
+
+#
+#	A WIN32 dll has three parts:
+#	x.dll: the real dll (SHRLIBNAME)
+#	x.lib: what you link to progs that use the dll (LIBNAME)
+#	x.exp: what you need to build the dll (in no variable)
+#
+LINK.shrlib = $(WINLINK) $(WIN32_DLLFLAGS) -L$(BORLAND_LIB) -L$(BORLAND_LIB)\\Psdk c0d32.obj
+
+#	adjust names of libraries to build
+#
+#	But: if there are no objects LIBOBJS to include
+#	in this library (may be for e.g. base/src/libCompat
+#	on some archs), don't define (and build) any library!
+SHRLIBNAME = $(LIBRARY).dll
+
+#
+# Under WIN32 we have the unique situation where the DLL link creates the
+# DLL link library xxx.lib and we need to be very careful to avoid replacing
+# the xxx.lib created by the dll link with an xxx.lib created by $(AR).
+# Therefore, the object library is named xxxObj.lib
+#
+# SHARED_LIBRARIES is YES if we are building a DLL and NO if we aren't
+#
+DLL_LINK_LIBNAME_YES = $(LIBRARY).lib
+DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES))
+
+#ifeq ($(strip $(SHARED_LIBRARIES)),NO)
+#LIBNAME = $(LIBRARY).lib
+#else
+LIBNAME = $(LIBRARY)Obj.lib
+#endif
+
+#	dll install location
+INSTALL_SHRLIB = $(INSTALL_BIN)
+
+#--------------------------------------------------
+# Dependancy definitions
+OBJECT_LIB_EXT_YES = Obj.lib # object library extension for static build
+OBJECT_LIB_EXT_NO = .lib # object library extension for dynamic build
+OBJECT_LIB_EXT = $(OBJECT_LIB_EXT_$(STATIC_BUILD))
+
+COND_PROD_DEPLIBS = $(foreach prod,$(PROD), $(foreach lib, $($(basename $(prod))_LIBS),\
+ $(firstword $($(lib)_DIR) $(EPICS_BASE_LIB))/$(lib)$(OBJECT_LIB_EXT)))
+PRODNAME_DEPLIBS = $(foreach lib,$(PRODNAME_LIBS),$(firstword $(wildcard $($(lib)_DIR)/$(lib).lib $($(lib)_DIR)/$(lib)Obj.lib $(EPICS_BASE_LIB)/$(lib).lib $(EPICS_BASE_LIB)/$(lib)Obj.lib ) $(filter $(LIBRARY)$(OBJECT_LIB_EXT), $(lib)$(OBJECT_LIB_EXT)) ))
+PROD_DEPLIBS = $(foreach lib,$(PROD_LIBS),$(firstword $(wildcard $($(lib)_DIR)/$(lib).lib $($(lib)_DIR)/$(lib)Obj.lib $(EPICS_BASE_LIB)/$(lib).lib $(EPICS_BASE_LIB)/$(lib)Obj.lib ) $(filter $(LIBRARY)$(OBJECT_LIB_EXT), $(lib)$(OBJECT_LIB_EXT)) )) 
+
+USR_DEPLIBS = $(foreach lib,$(USR_LIBS),$(firstword $(wildcard $($(lib)_DIR)/$(lib).lib $($(lib)_DIR)/$(lib)Obj.lib $(EPICS_BASE_LIB)/$(lib).lib $(EPICS_BASE_LIB)/$(lib)Obj.lib ) $(filter $(LIBRARY)$(OBJECT_LIB_EXT), $(lib)$(OBJECT_LIB_EXT)) )) 
+
+# by default the libraries used when linking the DLL are just
+# PROD_LIBS ans SYS_PROD_LIBS minus the DLL name
+DLL_LIBS = $(subst $(LIBRARY),, $(PROD_LIBS))
+ 
+#
+#	EPICS libs that we need to link the DLL with
+#	(it isnt necessary to rebuild the dll if these change)
+DLL_DEPLIBS = $(foreach lib,$(DLL_LIBS),$(firstword $(wildcard $($(lib)_DIR)/$(lib).lib $($(lib)_DIR)/$(lib)Obj.lib $(EPICS_BASE_LIB)/$(lib).lib $(EPICS_BASE_LIB)/$(lib)Obj.lib) $(filter $(LIBRARY)$(OBJECT_LIB_EXT), $(lib)$(OBJECT_LIB_EXT)) ))
+
+USR_LDLIBS = $(PRODNAME_DEPLIBS) $(PROD_DEPLIBS) $(USR_DEPLIBS) $(SYS_PROD_LIBS:%=%.lib)
+
+DLL_LDLIBS = $(DLL_DEPLIBS) $(SYS_PROD_LIBS:%=%.lib) $(OP_SYS_LDLIBS)
+
+#multithreaded import library
+LIBSUF=mti
+# -c case sensitive linking
+# -C clear state before linking
+# -Gn no state files
+# -Tpe targets a Windows .EXE file
+# -x no map
+# -w display warnings on
+LDFLAGS += -c -C -Gn -Tpe -x -w -L$(BORLAND_LIB) -L$(BORLAND_LIB)\\Psdk
+LINKSTARTUP = c0x32.obj
+LINKLIBS=import32.lib cw32$(LIBSUF).lib
+
+LINK.c = $(WINLINK) $(LDFLAGS) $(LINKSTARTUP)
+LINK.cc = $(WINLINK) $(LDFLAGS) $(LINKSTARTUP)
+

config/CONFIG.Host.Linux

@@ -22,7 +22,7 @@ ACC_ANSI = $(ACC)
 ACC_STRICT = $(ACC) -pedantic
 #ACC_STRICT = $(ACC)  -ansi -pedantic -D_SVID_SOURCE
 ACC_TRAD = $(ACC)
-ACC_WARN_YES = 
+ACC_WARN_YES =  -Wall
 ACC_WARN_NO =  -w
 ACC_OPT_YES =  -O
 ACC_OPT_NO = -g
@@ -31,7 +31,6 @@ ACC_SFLAGS_NO=
 ACC_SLIBS_YES =
 ACC_SLIBS_NO=
 ACC_SHRLIB_CFLAGS_YES =  -fPIC
-#ACC_SHRLIB_CFLAGS_YES =  -fPIC -D_BSD_SOURCE
 ACC_SHRLIB_LDFLAGS_YES =  -shared -Wl,-soname,$@ 
 
 
@@ -39,8 +38,8 @@ ACC_SHRLIB_LDFLAGS_YES =  -shared -Wl,-soname,$@
 CCC = g++
 CCC_NORMAL = $(CCC)
 CCC_STRICT = $(CCC)
-CCC_TEMPL_INST_FLAG = -DEXPL_TEMPL
-CCC_WARN_YES = 
+#CCC_TEMPL_INST_FLAG = -DEXPL_TEMPL
+CCC_WARN_YES =  -Wall
 CCC_WARN_NO =
 CCC_OPT_YES =  -O
 CCC_OPT_NO = -g
@@ -49,6 +48,8 @@ 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,$@ 
 
 # added smh 6/5/98 : when building fdmgr - seems to use this not ACC
 # in effect this overides orig def in CONFIG_COMMON :
@@ -57,9 +58,9 @@ GCC_STRICT = $(GCC)
 G++_STRICT = $(G++)  -Wtraditional
 
 
-ARCH_DEP_CFLAGS = -D_X86_ -Dlinux -D_USE_BSD
+#ARCH_DEP_CFLAGS = -D_X86_ -Dlinux -D_USE_BSD
 ARCH_DEP_CFLAGS = -D_X86_ -Dlinux
-ARCH_DEP_LDFLAGS =
+ARCH_DEP_LDFLAGS += -lpthread -lreadline -lcurses -lrt
 
 #glibc FAQ
 #	"_GNU_SOURCE:  glibc does not make the GNU extensions available 

config/CONFIG.Host.LynxOS

@@ -0,0 +1,56 @@
+# 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,4 +1,4 @@
-# CONFIG.Host.UnixCommon
+
 #
 #  Contains definitions common to all Unix archs
 #
@@ -19,9 +19,11 @@ LIBNAME = $(LIBRARY:%=lib%.a)
 SHRLIB_SUFFIX = .so
 
 SHRLIBNAME = lib$(LIBRARY)$(SHRLIB_SUFFIX)$(SHRLIB_VERSION:%=.%)
-SHRLIB_LDFLAGS = $($(ANSI)_SHRLIB_LDFLAGS_$(strip $(SHARED_LIBRARIES)))
 
-DLL_LDLIBS = $(PRODNAME_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)
+#For backward compatability only
+DLL_LIBS = $(subst $(LIBRARY),, $(PROD_LIBS))
+
+DLL_LDLIBS = $(PRODNAME_LIBS:%=-l%) $(DLL_LIBS:%=-l%)
 
 INSTALL_SHRLIB = $(INSTALL_LIB)
 
@@ -44,11 +46,10 @@ OBJ = .o
 
 #--------------------------------------------------
 # Dependancy definitions
-COND_PROD_DEPLIBS = $(foreach prod,$(PROD), $(foreach lib, $($(basename $(prod))_LIBS),$(firstword $($(lib)_DIR) $(EPICS_BASE_LIB))/lib$(lib).a))
-PRODNAME_DEPLIBS = $(foreach lib,$(PRODNAME_LIBS),$(firstword $($(lib)_DIR) $(EPICS_BASE_LIB))/lib$(lib).a)
-PROD_DEPLIBS = $(foreach lib,$(PROD_LIBS),$(firstword $($(lib)_DIR) $(EPICS_BASE_LIB))/lib$(lib).a)
-
-USR_DEPLIBS = $(foreach lib,$(USR_LIBS),$(firstword $($(lib)_DIR) $(EPICS_BASE_LIB))/lib$(lib).a)
+COND_PROD_DEPLIBS = $(foreach prod,$(PROD), $(foreach lib, $($(basename $(prod))_LIBS),$(firstword $(wildcard $($(lib)_DIR)/lib$(lib).* $(EPICS_BASE_LIB)/lib$(lib).*))))
+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).*)))
 
 #--------------------------------------------------
 # Determine ld flags
@@ -60,13 +61,11 @@ USR_LDFLAGS += $(sort $(USR_DIRS:%=-L%))
 USR_LDLIBS = $(PRODNAME_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\
  $(SYS_PROD_LIBS:%=-l%)
 
-#USR_LDLIBS = $(PRODNAME_DEPLIBS:%=-L%) $(PROD_DEPLIBS:%=-L%) $(USR_DEPLIBS)\
-# $(USR_XLDLIBS)
-
 #--------------------------------------------------
 # Operating system definitions
 OP_SYS_INCLUDES =
-OP_SYS_CFLAGS = -DUNIX 
+OP_SYS_CFLAGS = -DUNIX
+
 OP_SYS_LDFLAGS =
 OP_SYS_LDLIBS = -lm
 

config/CONFIG.Host.WIN32

@@ -20,7 +20,7 @@ CPLUSPLUS = CCC
 MSVISC = c:\\Program\ Files\\DevStudio\\Vc
 WINLINK = link
 
-RCCMD = rc -l 0x409  -fo $@ $<
+RCCMD = rc -l 0x409 -i . -i .. -I$(INSTALL_INCLUDE)/os/$(OS_CLASS) -I$(INSTALL_INCLUDE) $(INSTALL_INCLUDES) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS) -I$(EPICS_BASE_INCLUDE) -fo $@ $<
 
 ARCMD = lib /nologo /verbose /out:$@
 
@@ -126,7 +126,7 @@ 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\
 /release $(PROD_VERSION:%=/version:%)
 LINK_OPT_FLAGS_NO = /WARN:3 /debug 
@@ -158,7 +158,7 @@ OP_SYS_CFLAGS =
 #
 # WIN32 specific include files
 #
-OP_SYS_INCLUDES = -I$(EPICS_BASE_INCLUDE)\\os\\WIN32
+#OP_SYS_INCLUDES = -I$(EPICS_BASE_INCLUDE)\\os\\WIN32
 
 #
 # These are now added to the individual makefiles that use them in order to

config/CONFIG.Host.alpha

@@ -23,8 +23,8 @@ ACC_SFLAGS_YES= -non_shared
 ACC_SFLAGS_NO= -call_shared
 ACC_SLIBS_YES =
 ACC_SLIBS_NO=
-ACC_SHRLIB_CFLAGS_YES = -shared
-ACC_SHRLIB_LDFLAGS_YES =
+ACC_SHRLIB_CFLAGS_YES =
+ACC_SHRLIB_LDFLAGS_YES = -shared
 
 # Configure OS vendor C++ compiler
 CCC = cxx
@@ -39,8 +39,10 @@ CCC_SFLAGS_YES=
 CCC_SFLAGS_NO=
 CCC_SLIBS_YES =
 CCC_SLIBS_NO=
+CCC_SHRLIB_CFLAGS_YES =
+CCC_SHRLIB_LDFLAGS_YES = -shared
 CCC_DEPENDS_FLAG =
 
 ARCH_DEP_CFLAGS = -D_OSF_SOURCE
-ARCH_DEP_LDLIBS = -lnsl
+ARCH_DEP_LDLIBS =
 

config/CONFIG.Host.cygwin32

@@ -24,5 +24,11 @@ SHARED_LIBRARIES=NO
 #==========================
  
 ARCH_DEP_CFLAGS = -DCYGWIN32 -U_WIN32
-ARCH_DEP_LDLIBS = -lm
+ARCH_DEP_LDLIBS =
+OP_SYS_LDLIBS =
+
+# cygwin32 overrides to eliminate following warning message -
+# -fPIC ignored for target (all code is position independent)
+GCC_DEP_CFLAGS = -D_REENTRANT
+G++_DEP_CFLAGS = -D_REENTRANT
 

config/CONFIG.Host.hp700

@@ -9,7 +9,7 @@ ARCH_CLASS = hp700
 include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
 
 SHRLIB_SUFFIX = .sl
- 
+
 AR = ar
 
 # Configure OS vendor C compiler
@@ -44,8 +44,14 @@ HPCC_SLIBS_NO=
 HPCC_SHRLIB_CFLAGS_YES = +Z
 HPCC_SHRLIB_LDFLAGS_YES = -b
 
-CCC = CC
-CCC_NORMAL = $(CCC) +p
+#Old HP C++ compiler
+#CCC = CC
+#CCC_NORMAL = $(CCC) +p
+
+#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_TEMPL_INST_FLAG =
 CCC_WARN_YES = +w
@@ -56,8 +62,16 @@ CCC_SFLAGS_YES= -Wl,-a,archive
 CCC_SFLAGS_NO=
 CCC_SLIBS_YES =
 CCC_SLIBS_NO=
-CCC_DEPENDS_FLAG =
+CCC_SHRLIB_CFLAGS_YES = +Z
+# shared libs will be found by searching environment variable SHLIB_PATH,
+# then by searching the specified path (see below)
+CCC_SHRLIB_LDFLAGS_YES = -b
+CCC_DEPENDS_FLAG = +m
 
-ARCH_DEP_CFLAGS = -D_HPUX_SOURCE -DHP_UX
+# +DAportable causes portable object code to be created for execution
+# on different PA-Risc machines
+ARCH_DEP_CFLAGS = -D_HPUX_SOURCE -DHP_UX +DAportable
+ARCH_DEP_CXXFLAGS = -D_HPUX_SOURCE -DHP_UX +DAportable
 ARCH_DEP_LDLIBS =
+ARCH_DEP_LDFLAGS = -Wl,+b$(DEFAULT_SHRLIB_SEARCH_PATH),+s
 

config/CONFIG.Host.linux-x86

@@ -0,0 +1,4 @@
+# $Id$
+
+# linux-x86 is the new name for linux
+-include $(EPICS_BASE)/config/CONFIG.Host.Linux

config/CONFIG.Host.sgi

@@ -40,6 +40,8 @@ CCC_SFLAGS_NO=
 CCC_SLIBS_YES =
 CCC_SLIBS_NO=
 CCC_DEPENDS_FLAG =
+CCC_SHRLIB_CFLAGS_YES =  -KPIC
+CCC_SHRLIB_LDFLAGS_YES =  -shared
 
 ####KRCC = ??
 

config/CONFIG.Host.solaris

@@ -23,9 +23,10 @@ SPARCWORKS = /opt/SUNWspro
 
 # Configure OS vendor C compiler
 ACC = $(SPARCWORKS)/bin/cc
-ACC_ANSI = $(ACC) -Xa
+ACC_ANSI = $(ACC) -Xa -v
 ACC_STRICT = $(ACC) -Xc -v
 ACC_TRAD = $(ACC) -Xs
+ACC_DEP_CFLAGS = -KPIC -D_REENTRANT 
 ACC_WARN_YES = 
 ACC_WARN_NO =  -w
 ACC_OPT_YES =  -O
@@ -34,13 +35,14 @@ ACC_SFLAGS_YES= -Bstatic
 ACC_SFLAGS_NO=
 ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
 ACC_SLIBS_NO=
-ACC_SHRLIB_CFLAGS_YES =  -KPIC -D_REENTRANT 
+ACC_SHRLIB_CFLAGS_YES =
 ACC_SHRLIB_LDFLAGS_YES =  -G -h $@
 
 # Configure OS vendor C++ compiler
 CCC = $(SPARCWORKS)/bin/CC
 CCC_NORMAL = $(CCC) +p
 CCC_STRICT = $(CCC) +p
+CCC_DEP_CFLAGS = -KPIC -D_REENTRANT 
 CCC_TEMPL_INST_FLAG =
 CCC_WARN_YES = +w
 CCC_WARN_NO = 
@@ -51,8 +53,12 @@ CCC_SFLAGS_NO=
 CCC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
 CCC_SLIBS_NO=
 CCC_DEPENDS_FLAG = -xM1
+CCC_SHRLIB_CFLAGS_YES =
+CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
  
+
 ARCH_DEP_CFLAGS = -DSOLARIS 
 # socket and nsl needed by libca.a
 ARCH_DEP_LDLIBS = -lsocket -lnsl
+ARCH_DEP_LDLIBS += -lposix4 -lpthread -lthread
 

config/CONFIG.Host.solaris-sparc

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

config/CONFIG.Host.solaris-sparc-gnu

@@ -0,0 +1,8 @@
+# $Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solaris
+
+ANSI=GCC
+CPLUSPLUS=G++
+

config/CONFIG.Host.solaris-x86

@@ -0,0 +1,66 @@
+# CONFIG.Host.solaris-x86
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.solaris-x86
+
+ARCH_CLASS = solaris
+
+# Include 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)
+CCC_AR = $(CCC) -xar -o
+ARCMD = $($(CPLUSPLUS)_AR) $@
+
+RANLIB =
+
+SPARCWORKS = /opt/SUNWspro
+
+# Configure OS vendor C compiler
+ACC = $(SPARCWORKS)/bin/cc
+ACC_ANSI = $(ACC) -Xa
+ACC_STRICT = $(ACC) -Xc -v
+ACC_TRAD = $(ACC) -Xs
+ACC_DEP_CFLAGS = -KPIC -D_REENTRANT 
+ACC_WARN_YES = 
+ACC_WARN_NO =  -w
+ACC_OPT_YES =  -O
+ACC_OPT_NO = -g
+ACC_SFLAGS_YES= -Bstatic
+ACC_SFLAGS_NO=
+ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
+ACC_SLIBS_NO=
+ACC_SHRLIB_CFLAGS_YES =
+ACC_SHRLIB_LDFLAGS_YES =  -G -h $@
+
+# Configure OS vendor C++ compiler
+CCC = $(SPARCWORKS)/bin/CC
+CCC_NORMAL = $(CCC) +p
+CCC_STRICT = $(CCC) +p
+CCC_DEP_CFLAGS = -KPIC -D_REENTRANT 
+CCC_TEMPL_INST_FLAG =
+CCC_WARN_YES = +w
+CCC_WARN_NO = 
+CCC_OPT_YES =  -O
+CCC_OPT_NO = -g
+CCC_SFLAGS_YES= -Bstatic
+CCC_SFLAGS_NO=
+CCC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
+CCC_SLIBS_NO=
+CCC_DEPENDS_FLAG = -xM1
+CCC_SHRLIB_CFLAGS_YES =
+CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
+ 
+GCC = gcc
+G++ = g++
+
+# Solaris on x86
+ARCH_DEP_CFLAGS = -DSOLARIS  -D_X86_
+# socket and nsl needed by libca.a
+ARCH_DEP_LDLIBS = -lsocket -lnsl
+

config/CONFIG.Host.sun4

@@ -68,6 +68,8 @@ CCC_SFLAGS_YES= -Bstatic
 CCC_SFLAGS_NO=
 CCC_SLIBS_YES=
 CCC_SLIBS_NO=
+CCC_SHRLIB_CFLAGS_YES =  -pic
+CCC_SHRLIB_LDFLAGS_YES =  -assert pure-text -h $@
 CCC_DEPENDS_FLAG = -xM1
 
 GCC_ANSI += -D__USE_FIXED_PROTOTYPES__

config/CONFIG.Host.win32-x86

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

config/CONFIG.LynxOS

@@ -0,0 +1,136 @@
+# $Id$
+#
+# This file contains definitions for Vx builds
+
+#--------------------------------------------------
+# operating system class (include/os/<os_class>)
+OS_CLASS = LynxOS
+
+lynx_pc486 =YES
+
+CC = gcc
+CXX = g++
+
+#--------------------------------------------------
+# vxWorks directory definitions
+
+# 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_arch> file with
+# the override definitions.
+ 
+# Tornado directory definitions
+VX_CONFIG_DIR_YES =
+VX_INCLUDE_YES =
+VX_GNU_YES =
+VX_GNU_BIN_YES =
+VX_GNU_LIB_YES =
+
+
+# pre Torando directory definitions
+VX_CONFIG_DIR_NO =
+VX_INCLUDE_NO =
+VX_GNU_NO =
+VX_GNU_BIN_NO =
+ 
+# directory definitions
+VX_DIR =
+VX_CONFIG_DIR =
+VX_INCLUDE =
+VX_GNU = 
+
+GNU_BIN = /usr/local/bin
+GNU_LIB = /usr/local/lib
+
+#--------------------------------------------------
+# VxWorks command definitions
+
+#GCC = $(GNU_BIN)/cc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc
+#AR = $(GNU_BIN)/ar$(CMPLR_SUFFIX)
+#CPP = $(GNU_BIN)/cpp$(CMPLR_SUFFIX) -nostdinc
+#RANLIB = $(GNU_BIN)/ranlib$(CMPLR_SUFFIX)
+#LD = $(GNU_BIN)/ld$(CMPLR_SUFFIX) -r
+
+AR = ar -rc
+ARCMD = $(AR) $@
+RANLIB = ranlib -t
+GCC = gcc 
+CPP = cpp
+LD = ld -r
+
+
+#--------------------------------------------------
+# Tornado C++ crosscompiler definitions
+
+#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)
+#MUNCH = $(GNU_BIN)/munch
+
+CPLUSPLUS_YES = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
+G++ = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
+LD_G++ = ld -r
+NM = nm
+
+#--------------------------------------------------
+# Pre Tornado C++ crosscompiler definitions
+# These are pre tornado definitions for Hideos builds (defined for 68k only)
+
+#CPLUSPLUS_NO = CCC
+#CCC = $(GNU_DIR)/bin/sun3-g++ -B$(GNU_DIR)/lib/gcc-lib/ -nostdinc -DEXPL_TEMPL
+#LD_CCC = $(GNU_DIR)/bin/sun3-ld $(OLD_ARCH_DEP_LDFLAGS) -r
+
+CPLUSPLUS_NO = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
+CCC = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
+LD_CCC = ld -r
+
+CCC_NORMAL = $(CCC) $(OLD_ARCH_DEP_CFLAGS)
+CCC_STRICT = $(CCC) -ansi -pedantic -Wall -traditional $(OLD_ARCH_DEP_CFLAGS)
+CCC_TRAD = $(CCC) -traditional $(OLD_ARCH_DEP_CFLAGS)
+CCC_TEMPL_INST_FLAG = -DEXPL_TEMP
+CCC_WARN_YES = -Wall
+CCC_WARN_NO = -w
+CCC_OPT_YES = -O
+CCC_OPT_NO = -g
+CCC_DEPENDS_FLAG =  -pedantic -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
+CPU = i486
+OS = lynxos
+OLD_ARCH_DEP_CFLAGS = -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
+#	 --no-builtin -Wa,"-m68040" -DOS_EQ_$(OS) \
+#	-DBOARD_EQ_$(BOARD) -DCPU_EQ_$(CPU) -DBOARD=$(BOARD)
+OLD_ARCH_DEP_LDFLAGS = -mposix -lc -lbsd -lnsl -lm -lposix4d9 -llynx
+#	 -Ur -N -T$(EPICS_BASE_BIN)/vxldscript.MRI
+
+#--------------------------------------------------
+# C compiler definitions  
+ANSI = gcc -ansi
+
+#--------------------------------------------------
+# Command definitions
+CPLUSPLUS = g++
+#	 $(CPLUSPLUS_$(TORNADO))
+LD_CXX = ld -r
+#	 $(LD_$(CPLUSPLUS))
+
+#--------------------------------------------------
+# Operating system flags
+OP_SYS_INCLUDES =
+#	 -I$(VX_INCLUDE)
+OP_SYS_CFLAGS =  -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
+#		-DvxWorks -DV5_vxWorks -fno-builtin 
+OP_SYS_LDFLAGS = -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
+OP_SYS_LDLIBS = -lc -lbsd -lnsl -lm -lposix4d9 -llynx
+
+#--------------------------------------------------
+# Optimization flag overrides
+GCC_OPT_YES = -O	
+#	2 -fstrength-reduce
+G++_OPT_YES = -O
+#	2 -fstrength-reduce
+
+#--------------------------------------------------
+# Link definitions
+LINK.c = $(LD) $(LDFLAGS) -o
+LINK.cc = $(LD_CXX) $(LDFLAGS) -o
+

config/CONFIG.Vx

@@ -11,9 +11,9 @@ 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_arch> file with
+# by creating a CONFIG_SITE.Vx.<host_archfile with
 # the override definitions.
- 
+
 # Tornado directory definitions
 VX_CONFIG_DIR_YES = $(VX_DIR)/target/config
 VX_INCLUDE_YES = $(VX_DIR)/target/h
@@ -26,7 +26,7 @@ VX_CONFIG_DIR_NO = $(VX_DIR)/config
 VX_INCLUDE_NO = $(VX_DIR)/h
 VX_GNU_BIN_NO = $(VX_GNU)/$(HOST_ARCH).$(ARCH_CLASS)/bin
 VX_GNU_LIB_NO = $(VX_GNU)/$(HOST_ARCH).$(ARCH_CLASS)/lib
- 
+
 # directory definitions
 VX_DIR = $(VX_DIR_$(TORNADO))
 VX_CONFIG_DIR = $(VX_CONFIG_DIR_$(TORNADO))
@@ -34,13 +34,15 @@ VX_INCLUDE = $(VX_INCLUDE_$(TORNADO))
 VX_GNU = $(VX_GNU_$(TORNADO))
 GNU_BIN = $(VX_GNU_BIN_$(TORNADO))
 GNU_LIB = $(VX_GNU_LIB_$(TORNADO))
+export GCC_EXEC_PREFIX = $(GNU_LIB)/gcc-lib/
+export WIND_BASE = $(VX_DIR)
 
 #--------------------------------------------------
 # VxWorks command definitions
 
 GCC = $(GNU_BIN)/cc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc
 AR = $(GNU_BIN)/ar$(CMPLR_SUFFIX)
-CPP = $(GNU_BIN)/cpp$(CMPLR_SUFFIX) -nostdinc
+CPP = $(GNU_BIN)/cc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc -x c -E
 RANLIB = $(GNU_BIN)/ranlib$(CMPLR_SUFFIX)
 LD = $(GNU_BIN)/ld$(CMPLR_SUFFIX) -r
 
@@ -50,8 +52,7 @@ 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)
-MUNCH = $(GNU_BIN)/munch
+NM = $(GNU_BIN)/nm$(CMPLR_SUFFIX)$(HOSTEXE)
 
 #--------------------------------------------------
 # Pre Tornado C++ crosscompiler definitions
@@ -85,6 +86,11 @@ ANSI = GCC
 CPLUSPLUS = $(CPLUSPLUS_$(TORNADO))
 LD_CXX = $(LD_$(CPLUSPLUS))
 
+#--------------------------------------------------
+# Override flags in CONFIG_COMMON
+GCC_DEP_CFLAGS = -D_REENTRANT
+G++_DEP_CFLAGS = -D_REENTRANT
+
 #--------------------------------------------------
 # Operating system flags
 OP_SYS_INCLUDES = -I$(VX_INCLUDE)
@@ -92,13 +98,47 @@ OP_SYS_CFLAGS = -DvxWorks -DV5_vxWorks -fno-builtin
 OP_SYS_LDFLAGS =
 OP_SYS_LDLIBS =
 
+# Fix for vxWorks headers using macros defined in
+# vxWorks.h but not including vxWorks.h
+ifeq ($(TORNADO), YES)
+	OP_SYS_CFLAGS += -include $(VX_INCLUDE)/vxWorks.h
+endif
+
 #--------------------------------------------------
 # Optimization flag overrides
 GCC_OPT_YES = -O2 -fstrength-reduce
+GCC_OPT_NO = -g
 G++_OPT_YES = -O2 -fstrength-reduce
+G++_OPT_NO = -g
+
+OPT_CFLAGS = $($(ANSI)_OPT_$(VX_OPT))
+OPT_CXXFLAGS = $($(CPLUSPLUS)_OPT_$(VX_OPT))
+
+#--------------------------------------------------
+# Warning flag overrides
+GCC_WARN_YES = -Wall
+GCC_WARN_NO = -w
+G++_WARN_YES = -Wall
+G++_WARN_NO = -w
+
+WARN_CFLAGS = $($(ANSI)_WARN_$(VX_WARN))
+WARN_CXXFLAGS = $($(CPLUSPLUS)_WARN_$(VX_WARN))
 
 #--------------------------------------------------
 # Link definitions
 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.frc40

@@ -10,5 +10,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68040 -m68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CFLAGS = -m68040
 

config/CONFIG.Vx.frc5ce

@@ -8,7 +8,8 @@ CMPLR_SUFFIX = sparc
 ARCH_CLASS = sparc
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=SPARC -DCPU_FAMILY=SPARC
+ARCH_DEP_CPPFLAGS = -DCPU=SPARC -DCPU_FAMILY=SPARC
+ARCH_DEP_CFLAGS =
 # Removed -O2 [24/12/96 PMM]
 OLD_ARCH_DEP_CXXFLAGS = -fno-builtin -ansi -pipe -nostdinc -DCPU=SPARC \
                       -DVXWORKS -Dsigned= -Dvolatile= +V  

config/CONFIG.Vx.hkbaja47

@@ -11,7 +11,8 @@ CMPLR_SUFFIX = mips
 ARCH_CLASS = mips
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -EB -mcpu=r4000 -mips3 -mgp32 -mfp32 -non_shared -G 0 -DCPU=R4000
+ARCH_DEP_CPPFLAGS = -DCPU=R4000
+ARCH_DEP_CFLAGS = -EB -mcpu=r4000 -mips3 -mgp32 -mfp32 -non_shared -G 0
 
 # Arch specific flags
 GCC += -fsigned-char

config/CONFIG.Vx.hkbaja60

@@ -0,0 +1,16 @@
+
+# $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

@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68020 -m68020 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68020
+ARCH_DEP_CFLAGS = -m68020
  

config/CONFIG.Vx.mv147

@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
  
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68030 -m68030 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68030
+ARCH_DEP_CFLAGS = -m68030
  

config/CONFIG.Vx.mv1604

@@ -10,5 +10,6 @@ CMPLR_SUFFIX = ppc
 ARCH_CLASS = ppc
 
 # Architecture specific build flags (TRUE=1 via LBL; needed in camessage.c)
-ARCH_DEP_CFLAGS = -fno-for-scope -DCPU_FAMILY=PPC -DCPU=PPC604 -D_GNU_TOOL -DTRUE=1
+ARCH_DEP_CPPFLAGS = -DCPU_FAMILY=PPC -DCPU=PPC604 -D_GNU_TOOL -DTRUE=1
+ARCH_DEP_CFLAGS = -fno-for-scope
 

config/CONFIG.Vx.mv162

@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68040 -m68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68040
+ARCH_DEP_CFLAGS = -m68040
  

config/CONFIG.Vx.mv162lc

@@ -11,4 +11,5 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68040 -msoft-float -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68LC040
+ARCH_DEP_CFLAGS = -m68040 -msoft-float

config/CONFIG.Vx.mv167

@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68040 -m68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68040
+ARCH_DEP_CFLAGS = -m68040
  

config/CONFIG.Vx.mv177

@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68060 -m68040 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68060
+ARCH_DEP_CFLAGS = -m68040
  

config/CONFIG.Vx.mv2700

@@ -0,0 +1,16 @@
+
+# $Id$
+#
+# 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 = mv2700
+
+# Architecture specific build flags
+ARCH_DEP_CPPFLAGS = -DCPU=PPC604
+ARCH_DEP_CFLAGS = -mcpu=604
+ 

config/CONFIG.Vx.niCpu030

@@ -11,5 +11,6 @@ CMPLR_SUFFIX = 68k
 ARCH_CLASS = 68k
 
 # Architecture specific build flags
-ARCH_DEP_CFLAGS = -DCPU=MC68030 -m68030 -DCPU_FAMILY=MC680X0
+ARCH_DEP_CPPFLAGS = -DCPU=MC68030
+ARCH_DEP_CFLAGS = -m68030
  

config/CONFIG.Vx.pc486

@@ -10,7 +10,8 @@ CMPLR_SUFFIX = 386
 #   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
 ARCH_CLASS = pc486
 
-ARCH_DEP_CFLAGS = -DCPU=I80486 -m486 -DCPU_FAMILY=I80x86 -D_X86_ 
+ARCH_DEP_CPPFLAGS = -DCPU=I80486 -DCPU_FAMILY=I80x86 -D_X86_ 
+ARCH_DEP_CFLAGS = -m486
 ARCH_DEP_CXXFLAGS += -x 'c++' 
-ARCH_DEP_CFLAGS +=   -fno-builtin -fno-defer-pop
+ARCH_DEP_CFLAGS += -fno-defer-pop
 

config/CONFIG.Vx.pcPentium

@@ -0,0 +1,17 @@
+
+# CONFIG.Vx.pentium
+#
+# This file is maintained by the EPICS community.
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = 386
+ 
+# For Vx directories of form:
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+ARCH_CLASS = pcPentium
+
+ARCH_DEP_CPPFLAGS = -DCPU=PENTIUM -D_X86_ 
+ARCH_DEP_CFLAGS = -mpentium
+ARCH_DEP_CXXFLAGS += -x 'c++' 
+ARCH_DEP_CFLAGS += -fno-defer-pop
+

config/CONFIG.Vx.ppc603

@@ -0,0 +1,16 @@
+# $Id$
+#
+# 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 = -DCPU=PPC603 -DTRUE=1
+ARCH_DEP_CFLAGS = -mcpu=603 --no-builtin -mstrict-align
+
+# ARCH_DEP_CFLAGS== -fsigned-char     #May need for calcPerform.c

config/CONFIG.Vx.ppc604

@@ -0,0 +1,17 @@
+# $Id$
+#
+# 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 = -DCPU=PPC604 -D_GNU_TOOL -DTRUE=1
+ARCH_DEP_CFLAGS = -mcpu=604 --no-builtin -mstrict-align
+
+# ARCH_DEP_CFLAGS== -fsigned-char     #May need for calcPerform.c
+

config/CONFIG.Vx.simpc

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

@@ -0,0 +1,4 @@
+# $Id$
+
+# vxWorks-486 is the new R3.14 name for pc486
+include $(EPICS_BASE)/config/CONFIG.Vx.pc486

config/CONFIG.Vx.vxWorks-68040

@@ -0,0 +1,4 @@
+# $Id$
+
+# vxWorks-68040 is the new R3.14 name for mv167
+include $(EPICS_BASE)/config/CONFIG.Vx.mv167

config/CONFIG.Vx.vxWorks-68040lc

@@ -0,0 +1,4 @@
+# $Id$
+
+# vxWorks-68040lc is the new R3.14 name for mv162lc
+include $(EPICS_BASE)/config/CONFIG.Vx.mv162lc

config/CONFIG.Vx.vxWorks-68060

@@ -0,0 +1,4 @@
+# $Id$
+
+# vxWorks-68060 is the new R3.14 name for mv177
+include $(EPICS_BASE)/config/CONFIG.Vx.mv177

config/CONFIG.Vx.vxWorks-ppc604

@@ -0,0 +1,4 @@
+# $Id$
+
+# vxWorks-ppc604 is the new R3.14 name for ppc604
+include $(EPICS_BASE)/config/CONFIG.Vx.ppc604

config/CONFIG.Vx.vxipc

@@ -10,7 +10,8 @@ CMPLR_SUFFIX = 386
 #   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
 ARCH_CLASS = pc486
 
-ARCH_DEP_CFLAGS = -DCPU=I80486 -m486 -DCPU_FAMILY=I80x86 -D_X86_ 
+ARCH_DEP_CPPFLAGS = -DCPU=I80486 -DCPU_FAMILY=I80x86 -D_X86_ 
+ARCH_DEP_CFLAGS = -m486
 ARCH_DEP_CXXFLAGS += -x 'c++' 
-ARCH_DEP_CFLAGS +=   -fno-builtin -fno-defer-pop
+ARCH_DEP_CFLAGS += -fno-defer-pop
 

config/CONFIG_BASE

@@ -49,13 +49,3 @@ endif
 
 EPICS_BASE = $(INSTALL_LOCATION)
 
-#
-# this speeds up the build by turning off implicit rules search
-# for EPICS Makefiles (which are not created from other files)
-.PHONY:: $(TOP)/config/CONFIG
-.PHONY:: $(TOP)/config/CONFIG.* $(TOP)/config/CONFIG_* 
-.PHONY:: $(TOP)/config/RULES.* $(TOP)/config/RULES_* DEPENDS
-.PHONY:: $(HOME)/EPICS_CONFIG $(HOME)/EPICS_CONFIG.$(HOST_ARCH)
-.PHONY:: ../Makefile.Vx ../Makefile.Unix ../Makefile.Host Makefile
-
-

config/CONFIG_BASE_VERSION

@@ -8,12 +8,19 @@
 #
 
 EPICS_VERSION=3
-EPICS_REVISION=13
-EPICS_MODIFICATION=1
-EPICS_UPDATE_NAME=
-EPICS_UPDATE_LEVEL=0
+EPICS_REVISION=14
+EPICS_MODIFICATION=0
+EPICS_UPDATE_NAME=alpha
+EPICS_UPDATE_LEVEL=2
 
-EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}"
+EPICS_LOCAL_NAME=B
+EPICS_LOCAL_VERSION=0
+
+CVS_DATE="\$$Date$$"
+CVS_TAG="\$$Name$$"
+
+EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}.$(EPICS_LOCAL_NAME)$(EPICS_LOCAL_VERSION)"
 
 CVS_DATE="\$$Date$$"
 
+BASE_3_14=YES

config/CONFIG_COMMON

@@ -11,15 +11,15 @@
 
 # CROSS1 will be defined only when CROSS_COMPILER_HOST_ARCHS is NOT defined
 CROSS1 = $(CROSS_COMPILER_TARGET_ARCHS$(word 1,$(CROSS_COMPILER_HOST_ARCHS)))
- 
+
 # CROSS2 will be defined only when CROSS_COMPILER_HOST_ARCHS is defined
 # and HOST_ARCH is one of it's words  
 CROSS2 = $(CROSS_COMPILER_TARGET_ARCHS$(filter-out 1,$(words $(filter $(HOST_ARCH),$(CROSS_COMPILER_HOST_ARCHS)))))
- 
+
 BUILD_ARCHS = $(HOST_ARCH) $(CROSS1) $(CROSS2)
- 
+
 INSTALL_LOCATION = $(TOP)
- 
+
 INSTALL_LOCATION_LIB        = $(INSTALL_LOCATION)/lib
 INSTALL_LOCATION_BIN        = $(INSTALL_LOCATION)/bin
 
@@ -30,6 +30,7 @@ INSTALL_MAN                 = $(INSTALL_LOCATION)/man
 INSTALL_TEMPLATES           = $(INSTALL_LOCATION)/templates
 INSTALL_DBD                 = $(INSTALL_LOCATION)/dbd
 INSTALL_CONFIG              = $(INSTALL_LOCATION)/config
+INSTALL_JAVA                = $(INSTALL_LOCATION)/javalib
 
 EPICS_BASE_INCLUDE      = $(EPICS_BASE)/include
 
@@ -38,6 +39,8 @@ OBJ = .
 RES = .
 
 EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(HOST_ARCH)
+EPICS_BASE_HOST_LIB = $(EPICS_BASE)/lib/$(HOST_ARCH)
+INSTALL_HOST_LIB = $(INSTALL_LOCATION)/lib/$(HOST_ARCH)
 
 
 # private versions of lex/yacc from EPICS
@@ -53,11 +56,12 @@ PERL=perl
 # install from EPICS
 INSTALL = $(PERL) $(EPICS_BASE_HOST_BIN)/installEpics.pl
 INSTALL_PRODUCT = $(INSTALL)
+INSTALL_LIBRARY = $(INSTALL)
 
 # dbtools from EPICS
 
-# state notation language compiler (installed from base/src/sequencer)
-SNC = $(EPICS_BASE_HOST_BIN)/snc$(EXE)
+# state notation language compiler (removed from base for R3.14)
+SNC = $(SEQ)/bin/$(HOST_ARCH)/snc$(EXE)
 
 ifdef T_A
 
@@ -74,6 +78,7 @@ EPICS_BASE_BIN          = $(EPICS_BASE)/bin/$(T_A)
 GCC_ANSI = $(GCC) -ansi
 GCC_STRICT = $(GCC) -ansi -pedantic
 GCC_TRAD = $(GCC) -traditional
+GCC_DEP_CFLAGS = -fPIC -D_REENTRANT
 GCC_WARN_YES = -Wall
 GCC_WARN_NO = -w
 GCC_OPT_YES = -O
@@ -82,13 +87,14 @@ GCC_SFLAGS_YES = -static
 GCC_SFLAGS_NO =
 GCC_SLIBS_YES =
 GCC_SLIBS_NO =
-GCC_SHRLIB_CFLAGS_YES =  -fPIC
+GCC_SHRLIB_CFLAGS_YES =
 GCC_SHRLIB_LDFLAGS_YES =  -shared
 
 G++_NORMAL = $(G++) -ansi -pedantic
 G++_STRICT = $(G++) -ansi -pedantic -Wtraditional
 G++_TRAD = $(G++) -traditional
 G++_TEMPL_INST_FLAG = -DEXPL_TEMPL
+G++_DEP_CFLAGS = -fPIC -D_REENTRANT
 G++_WARN_YES = -Wall \
       -Wmissing-prototypes -Woverloaded-virtual \
       -Wwrite-strings -Wconversion -Wstrict-prototypes\
@@ -101,14 +107,19 @@ G++_SFLAGS_NO =
 G++_SLIBS_YES =
 G++_SLIBS_NO =
 G++_DEPENDS_FLAG = -MM
-G++_SHRLIB_CFLAGS_YES =  -fPIC
+G++_SHRLIB_CFLAGS_YES =
 G++_SHRLIB_LDFLAGS_YES =  -shared
 
 #--------------------------------------------------
 # C compiler
 
 CC = $($(ANSI)_$(CMPLR))
- 
+
+#---------------------------------------------------------------
+# Vendor compiler dependent options
+VENDOR_DEP_CFLAGS = $($(ANSI)_DEP_CFLAGS)
+VENDOR_DEP_CXXFLAGS = $($(CPLUSPLUS)_DEP_CFLAGS)
+
 #--------------------------------------------------
 # C++ compiler
 
@@ -141,6 +152,7 @@ USR_CXXFLAGS =
 USR_LDFLAGS =
 USR_LDLIBS =
 USR_CPPFLAGS =
+USR_DBDFLAGS =
 
 #--------------------------------------------------
 # Target specific options
@@ -155,15 +167,16 @@ TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
 #--------------------------------------------------
 # Depends flag
 DEPENDS_FLAG = $($(CPLUSPLUS)_DEPENDS_FLAG)
- 
+
 #--------------------------------------------------
 # C++ template flag option
 TEMPL_INST_CXXFLAG = $($(CPLUSPLUS)_TEMPL_INST_FLAG)
- 
+
 #--------------------------------------------------
 # Epics includes (CONFIG.Vx will override OS_CLASS)
 OS_CLASS = $(ARCH_CLASS)
 EPICS_INCLUDES = -I$(INSTALL_INCLUDE) -I$(INSTALL_INCLUDE)/os/$(OS_CLASS)
+EPICS_DBDFLAGS = -I $(INSTALL_LOCATION)/dbd
 
 #--------------------------------------------------
 # Warnings flags  (CONFIG.Vx will override)
@@ -175,18 +188,18 @@ WARN_CXXFLAGS = $($(CPLUSPLUS)_WARN_$(HOST_WARN))
 OPT_CFLAGS = $($(ANSI)_OPT_$(HOST_OPT))
 OPT_CXXFLAGS = $($(CPLUSPLUS)_OPT_$(HOST_OPT))
 OPT_LDFLAGS =
- 
+
 #--------------------------------------------------
 # Static build options
 STATIC_CFLAGS = $($(ANSI)_SFLAGS_$(STATIC_BUILD))
 STATIC_CXXCFLAGS = $($(CPLUSPLUS)_SFLAGS_$(STATIC_BUILD))
 STATIC_LDFLAGS = $($(ANSI)_SLDFLAGS_$(STATIC_BUILD))
 STATIC_LDLIBS = $($(ANSI)_SLIBS_$(STATIC_BUILD))
- 
+
 #--------------------------------------------------
 # ar definition default
 ARCMD = $(AR) $(ARFLAGS) $@
- 
+
 #--------------------------------------------------
 # depends definition 
 DEPENDS_RULE = -$(COMPILE.cc) $(DEPENDS_FLAG) $^ > DEPENDS
@@ -195,13 +208,14 @@ DEPENDS_RULE = -$(COMPILE.cc) $(DEPENDS_FLAG) $^ > DEPENDS
 
 # Include files
 
-INCLUDES = -I. -I.. $(USR_INCLUDES) $(TARGET_INCLUDES) $(EPICS_INCLUDES) $(OP_SYS_INCLUDES)
+INCLUDES = -I. -I.. $(USR_INCLUDES) $(EPICS_INCLUDES) $(TARGET_INCLUDES) $(OP_SYS_INCLUDES)
 
 CFLAGS = $(OPT_CFLAGS) $(DEBUG_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS)\
- $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(INCLUDES)
+ $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VENDOR_DEP_CFLAGS) $(STATIC_CFLAGS)\
+ $(OP_SYS_CFLAGS) $(INCLUDES)
 
 CXXFLAGS = $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)\
- $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(STATIC_CXXCFLAGS)\
+ $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(VENDOR_DEP_CXXFLAGS) $(STATIC_CXXCFLAGS)\
  $(OP_SYS_CFLAGS) $(TEMPL_INST_CXXFLAG) $(INCLUDES)
 
 LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\
@@ -210,13 +224,15 @@ LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\
 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS)\
  $(STATIC_LDLIBS) $(OP_SYS_LDLIBS)
 
-CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)
 
 CPPSNCFLAGS = $(INCLUDES)
 
+DBDFLAGS = -I . -I .. $(USR_DBDFLAGS) $(EPICS_DBDFLAGS)
+
 # Build compile line here
-COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c $(SOURCE_FLAG)
-COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(SOURCE_CXXFLAG)
+COMPILE.c = $(CC) $(CPPFLAGS) $(CFLAGS) -c $(SOURCE_FLAG)
+COMPILE.cc = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(SOURCE_CXXFLAG)
 
 endif
 

config/CONFIG_COMPAT

@@ -0,0 +1,24 @@
+#
+# $Id$
+#
+# Convert old HOST_ARCH environment variable 
+
+#Syntax:
+# ARCH_<host_arch> = <epics_host_arch>
+ARCH_solaris = solaris-sparc
+ARCH_sun4 = sun4-sparc
+ARCH_Linux = linux-x86
+ARCH_WIN32 = win32-x86
+ARCH_hp700 = hpux-m68k
+ARCH_hp700 = osf-alpha
+ARCH_Borland = win32-x86-borland
+
+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)

config/CONFIG_HOST_ARCH.Borland

@@ -0,0 +1,20 @@
+#  CONFIG_HOST_ARCH.Borland
+#
+
+EXE=.exe
+HOSTEXE=.exe
+
+CP   =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
+MV   =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl
+RM   =$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -f
+MKDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/mkdir.pl
+RMDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -rf
+FN   =$(PERL) $(EPICS_BASE_HOST_BIN)/fullName.pl
+CHMOD=echo
+ECHO=echo
+
+WIND_HOST_TYPE = x86-win32
+ 
+# 	Use std path variables from ms
+HOME = $(HOMEDRIVE)$(HOMEPATH)
+

config/CONFIG_HOST_ARCH.Linux

@@ -5,5 +5,5 @@
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
 
-WIND_HOST_TYPE = Linux
+WIND_HOST_TYPE = i386-linux2
 

config/CONFIG_HOST_ARCH.LynxOS

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

@@ -10,5 +10,11 @@ MKDIR = mkdir
 RMDIR = rm -rf
 CHMOD = "/bin/chmod"
 
-PERL = /usr/bin/perl 
+# Set LD_LIBRARY_PATH for shared library builds
+ifneq ($(EPICS_BASE),$(INSTALL_LOCATION))
+export LD_LIBRARY_PATH := $(INSTALL_HOST_LIB):$(EPICS_BASE_HOST_LIB):$(LD_LIBRARY_PATH)
+else
+export LD_LIBRARY_PATH := $(EPICS_BASE_HOST_LIB):$(LD_LIBRARY_PATH)
+endif
+
 

config/CONFIG_HOST_ARCH.WIN32

@@ -2,6 +2,7 @@
 #
 
 EXE=.exe
+HOSTEXE=.exe
 
 CP   =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
 MV   =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl
@@ -16,4 +17,3 @@ WIND_HOST_TYPE = x86-win32
 # 	Use std path variables from ms
 HOME = $(HOMEDRIVE)$(HOMEPATH)
 
-PERL = C:\\Perl\\bin\\Perl$(EXE)

config/CONFIG_HOST_ARCH.cygwin32

@@ -6,9 +6,9 @@
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
 
 EXE=.exe
+HOSTEXE=.exe
 
 TORNADO=YES
 
-WIND_HOST_TYPE = cygwin32
+WIND_HOST_TYPE = x86-win32
 
-PERL = C:\\Perl\\bin\\Perl$(EXE)

config/CONFIG_HOST_ARCH.hp700

@@ -5,5 +5,4 @@
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
 
-WIND_HOST_TYPE = hp700
-
+WIND_HOST_TYPE = parisc-hpux10

config/CONFIG_HOST_ARCH.linux-x86

@@ -0,0 +1,4 @@
+# $Id$
+
+# linux-x86 is the new name for linux
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Linux

config/CONFIG_HOST_ARCH.solaris-sparc

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

config/CONFIG_HOST_ARCH.solaris-sparc-gnu

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

config/CONFIG_HOST_ARCH.solaris-x86

@@ -0,0 +1,9 @@
+#  CONFIG_HOST_ARCH.solaris-x86
+#
+# Override values in CONFIG.Vx
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
+
+WIND_HOST_TYPE = x86-solaris2
+

config/CONFIG_HOST_ARCH.win32-x86

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

config/CONFIG_SITE

@@ -13,13 +13,16 @@
 #	i.e.: the arch running DCT/getrel/etc.
 #
 #  Currently Supporting:
-#	sun4
-#	hp700
-#	alpha
-#	solaris
-#	sgi
+#	Borland
 #	Linux
 #	WIN32
+#	alpha
+#	cygwin32
+#	hp700
+#	sgi
+#	solaris
+#	solaris-x86
+#	sun4
 #
 #  HOST_ARCH now an environment variable
 #  HOST_ARCH=$(shell /usr/local/epics/startup/HostArch)
@@ -30,17 +33,23 @@ endif
 #  The architectures to build EPICS for
 #
 #  Currently Supporting:
-#       mv167
+#       frc40
+#       frc5ce
+#       hkbaja47
+#       hkv2f
+#       mv147
+#       mv1604
 #       mv162
 #       mv162lc
-#       mv147
-#       hkv2f
-#	niCpu030
-#	pc486
-#	frc5ce
-#	hkbaja47
+#       mv167
+#       mv177
+#       mv2700
+#       niCpu030
+#       pc486
+#       ppc604
+#       vxipc
 #
-CROSS_COMPILER_TARGET_ARCHS=mv167
+CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040 vxWorks-ppc604
 
 
 #  If only a subset of the host architectures perform
@@ -56,7 +65,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/tornado101
+VX_DIR_YES = /usr/local/vw/tornado20
 
 #  VxWorks directory for TORNADO=NO
 #VX_DIR_NO=$(VW)
@@ -66,7 +76,7 @@ VX_DIR_YES = /usr/local/vw/tornado101
 VX_DIR_NO=/usr/local/vw/vxV52p1/vw
  
 #  Directory for TORNADO=NO gnu gcc crosscompiler
-VX_GNU_NO = $(VX_DIR)/../vxgccV2.2.3.1
+VX_GNU_NO = $(VX_DIR_NO)/../vxgccV2.2.3.1
 
 #  Directory for TORNADO=NO gnu g++ crosscompiler
 #  used by applications for hideos builds only
@@ -77,13 +87,11 @@ GNU_DIR = /usr/local/hideos/gnu_install-2.7.2
 #   GCC     (gcc -ansi) GNU
 #   ACC     (acc)       OS VENDOR
 #   HPACC   (cc -Aa)    OTHER VENDOR 
-#ANSI=HPACC
 ANSI=ACC
  
 #  C++ Compiler (for Host builds)
 #   G++     (g++)   GNU C++
 #   CCC     (CC)    OS VENDOR C++
-#CPLUSPLUS=G++
 #Note: if CPLUSPLUS is empty then C++ src codes are not built
 #CPLUSPLUS=	# use this if site does not have C++ compiler
 CPLUSPLUS=CCC
@@ -101,6 +109,10 @@ CMPLR=STRICT
 #   Individual Makefiles may override
 CXXCMPLR=STRICT
 
+#  Build should install all include files first?
+#	must be either YES or NO
+MAKE_INC_TARGET_FIRST=NO
+
 #  Build shared libraries?
 #  (archive libraries will also be built)
 #        must be either YES or NO
@@ -109,7 +121,7 @@ CXXCMPLR=STRICT
 #     NOTE WIN32: YES results in a DLL. CONFIG_SITE.Host.WIN32
 #                 distribution file contains YES override
 #
-#     NOTE solaris and sun4: If YES then LD_LIBRARY_PATH must
+#     NOTE solaris,Linux, and sun4: If YES then LD_LIBRARY_PATH must
 #     include fullpathname $(INSTALL_LOCATION)/lib/$(HOST_ARCH)
 #     for both the base build and when invoking base executables
 SHARED_LIBRARIES=NO
@@ -152,3 +164,4 @@ E2DB_FLAGS =
 #dbst 
 DBST = $(EPICS_EXTENSIONS)/bin/$(HOST_ARCH)/dbst
 
+include $(EPICS_BASE)/config/CONFIG_COMPAT

config/CONFIG_SITE.Host.Borland

@@ -0,0 +1,10 @@
+#
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+ 
+SHARED_LIBRARIES = YES
+
+BORLAND=C:\\Borland\\bcc55
+

config/CONFIG_SITE.Host.LynxOS

@@ -0,0 +1,15 @@
+#
+# $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.hp700

@@ -0,0 +1,26 @@
+#
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# by default, build and use shared libraries
+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 = /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.
+#However, when a new shared library is built using the above configuration,
+#it should be copied into the location specified by DEFAULT_SHRLIB_SEARCH_PATH
+#which in this specific case is: /cs/lib/R3.13.1.1/
+
+# cal added this so that libraries can be built with position
+# independent code even if shared libraries aren't being built
+ifeq ($(RELOCATABLE), YES)
+    ARCH_DEP_CFLAGS     += +Z
+    ARCH_DEP_CXXFLAGS   += +Z
+endif
+
+

config/CONFIG_SITE.Host.linux-x86

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

config/CONFIG_SITE.Host.solaris-sparc

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

config/CONFIG_SITE.Host.solaris-sparc-gnu

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

config/CONFIG_SITE.Host.win32-x86

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

config/CONFIG_SITE.Vx.Linux

@@ -0,0 +1,10 @@
+# $Id$
+#
+# This file contains overrides for Vx builds
+
+# The definitions VX_DIR, VX_GNU, GNU_DIR, GNU_LIB, etc.
+# can be overridden for specific Linux-target architecture
+# combinations by creating a CONFIG_SITE.Vx.Linux.<T_A>
+# file with the override definitions.
+
+-include $(EPICS_BASE)/config/CONFIG_SITE.$(BUILD_TYPE).$(HOST_ARCH).$(T_A)

config/CONFIG_SITE.Vx.Linux.mv167

@@ -0,0 +1,11 @@
+# $Id$
+#
+# This file contains overrides for Vx builds
+
+# ORNL SNS overrides for cross compilers
+#VX_DIR_YES = /opt/tornado20/
+#VX_CONFIG_DIR_YES = $(VX_DIR)/target/config
+#VX_INCLUDE_YES = /usr/local/crossgcc/m68k/m68k-wrs-vxworks/sys-include
+#VX_GNU_YES = /usr/local/crossgcc/m68k/
+#VX_GNU_BIN_YES = $(VX_GNU)/bin
+#VX_GNU_LIB_YES = /usr/local/crossgcc/m68k/lib/gcc-lib/m68k-wrs-vxworks/2.95.2

config/CONFIG_SITE.Vx.Linux.ppc603

@@ -0,0 +1,11 @@
+# $Id$
+#
+# This file contains overrides for Vx builds
+
+# ORNL SNS overrides for cross compilers
+#VX_DIR_YES = /opt/tornado20/
+#VX_CONFIG_DIR_YES = $(VX_DIR)/target/config
+#VX_INCLUDE_YES = /usr/local/crossgcc/ppc/powerpc-wrs-vxworks/sys-include
+#VX_GNU_YES = /usr/local/crossgcc/ppc/
+#VX_GNU_BIN_YES = $(VX_GNU)/bin
+#VX_GNU_LIB_YES = /usr/local/crossgcc/ppc/lib/gcc-lib/powerpc-wrs-vxworks/2.95.2

config/CONFIG_SITE.Vx.ppc604

@@ -0,0 +1,3 @@
+
+# APS override of tornado directory for ppc
+#VX_DIR_YES = /usr/local/vw/tornado101ppc2

config/Makefile

@@ -4,7 +4,15 @@
 
 TOP=..
 
-include $(TOP)/config/CONFIG_BASE
+include $(TOP)/configure/CONFIG
 
-include $(TOP)/config/RULES_ARCHS
+INSTALL_CONFIG = $(INSTALL_LOCATION)/config
+
+CONFIGS += $(subst ../,,$(wildcard ../CONFIG*))
+CONFIGS += $(subst ../,,$(wildcard ../RULES*))
+
+BIN_INSTALLS += $(wildcard ../tools/*.pl)
+BIN_INSTALLS += ../tools/installEpics
+
+include $(TOP)/configure/RULES
 

config/Makefile.Host

@@ -1,34 +0,0 @@
-#
-# $Id$
-#
-
-TOP = ../..
-include $(TOP)/config/CONFIG_BASE
-
-CONFIGS += CONFIG
-CONFIGS += CONFIG_BASE
-CONFIGS += CONFIG_BASE_VERSION
-CONFIGS += CONFIG_COMMON
-CONFIGS += CONFIG_ENV
-
-CONFIGS += CONFIG.Host.$(HOST_ARCH)
-CONFIGS += CONFIG_HOST_ARCH.$(HOST_ARCH)
-CONFIGS += CONFIG.Host.UnixCommon
-CONFIGS += CONFIG_HOST_ARCH.UnixCommon
-
-CONFIGS += CONFIG.Vx
-CONFIGS += $(CROSS_COMPILER_TARGET_ARCHS:%=CONFIG.Vx.%)
-
-CONFIGS += CONFIG_SITE
-CONFIGS += CONFIG_SITE_ENV
-CONFIGS += $(subst ../,,$(wildcard ../CONFIG_SITE*))
-
-CONFIGS += RULES.Host
-CONFIGS += RULES.Unix
-CONFIGS += RULES.Vx
-CONFIGS += RULES_ARCHS
-CONFIGS += RULES_DIRS
-CONFIGS += RULES_TOP
-
-include $(TOP)/config/RULES.Host
-

config/RULES.Db

@@ -1,6 +1,15 @@
-#RULES.Db
+# $Id$
+#
+#	Rules for making things related to databases
+#
 MAKEBPT		= $(EPICS_BASE_HOST_BIN)/makeBpt$(EXE)
-DBLOADTEMPLATE	= $(EPICS_BASE_HOST_BIN)/dbLoadTemplate$(EXE)
+
+ifndef MSI
+# Tool from R3.14 extensions bin, R3.13 extensions bin, or user path
+MSI = $(firstword $(wildcard $(EPICS_EXTENSIONS_HOST_BIN)/msi$(HOSTEXE) \
+         $(EPICS_EXTENSIONS)/bin/$(HOST_OS_CLASS)/msi$(HOSTEXE)) msi$(HOSTEXE))
+endif
+
 DBEXPAND	= $(EPICS_BASE_HOST_BIN)/dbExpand$(EXE)
 DBST		= dbst
 MAKEDBDEPENDS	= $(PERL) $(TOP)/config/makeDbDepends.pl
@@ -11,20 +20,38 @@ else
 TOUCH		= type NUL >>
 endif
 
+#-----------------------------------------------------------------
+#	if we are not building base add base dbd dirs
+
+ifneq ($(EPICS_BASE),$(TOP))
+ifneq ($(EPICS_BASE),$(INSTALL_LOCATION))
+EPICS_DBDFLAGS += -I $(EPICS_BASE)/dbd
+endif
+endif
+
+#---------------------------------------------------------------
+#	----------------------------------------------------
+#	create names (lists) for installed things
+#	----------------------------------------------------
+
 INSTALL_BPTS = $(BPTS:%= $(INSTALL_DBD)/%)
-INSTALL_DBS = $(DBDINSTALL:%= $(INSTALL_DBD)/%)
+INSTALL_DBDS = $(DBDINSTALL:%= $(INSTALL_DBD)/%)
 INSTALL_DBDNAME = $(DBDNAME:%= $(INSTALL_DBD)/%)
-INSTALL_DATA=$(INSTALLDB:%=$(INSTALL_DB)/%)
+INSTALL_DATA = $(INSTALLDB:%=$(INSTALL_DB)/%)
+INSTALL_TEMPLATES = $(filter %.template,$(INSTALL_DATA))
+
+#---------------------------------------------------------------
+#	Main targets
 
 all::	install
 
-inc::	$(INSTALL_DBS)
+inc::	$(INSTALL_DBDS) $(INSTALL_BPTS) $(INSTALL_TEMPLATES)
 
 rebuild:: clean install
 
 install:: inc buildInstall 
 
-buildInstall:: build $(INSTALL_BPTS) $(INSTALL_DATA)
+buildInstall:: build $(INSTALL_DATA)
 
 clean::
 	@echo "Cleaning"
@@ -47,6 +74,8 @@ $(notdir $(TEMPLATE_LINKS)): %.template:
 ifndef WIN32
 	@$(RM) $(notdir $(TEMPLATE_LINKS))
 	ln -s $(TEMPLATE_LINKS) .
+# Workaround for dbLoadTemplate bug: terminate here if link target doesn't exist
+	@cat $(TEMPLATE_LINKS) > /dev/null
 else
 	@$(RM) $(notdir $(TEMPLATE_LINKS))
 	$(CP) $(TEMPLATE_LINKS) .
@@ -89,11 +118,11 @@ endif
 %.t.db.raw: %.substitutions
 	@echo "Inflating database from $<"
 	@$(RM) $@
-	@$(DBLOADTEMPLATE) $< > $@
+	@$(MSI) $< > $@
 
 ##################################################### CapFast filter
 
-%.edf: ../%.sch $(DEPSCHS)
+%.edf:: ../%.sch $(DEPSCHS)
 	@if [ ! -f cad.rc -a -r ../cad.rc ] ; then ln -s ../cad.rc ; fi
 	$(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) $<
 
@@ -103,11 +132,11 @@ $(INSTALL_DB)/%.substitutions: %.substitutions
 	@echo "Installing $@"
 	@$(INSTALL) -d -m 644 $(@F) $(@D)
 
-%.substitutions: ../%.substitutions
+%.substitutions:: ../%.substitutions
 	@$(CP) $< $@
 
 ifdef CREATESUBSTITUTIONS
-%.substitutions:
+%.substitutions:: $(word $(words $(CREATESUBSTITUTIONS)),$(CREATESUBSTITUTIONS))
 	@$(CREATESUBSTITUTIONS) $*
 endif
 
@@ -121,7 +150,7 @@ $(INSTALL_DB)/%.template: %.template
 	@echo "Installing $@"
 	@$(INSTALL) -d -m 644 $(@F) $(@D)
 
-%.template: ../%.template
+%.template:: ../%.template
 	@$(CP) $< $@
 
 %.template: %.edf
@@ -131,7 +160,7 @@ $(INSTALL_DB)/%.template: %.template
 
 ##################################################### Flat databases
 
-%.db.raw: ../%.db
+%.db.raw:: ../%.db
 	$(CP) $< $@
 
 %.db.raw: %.edf
@@ -145,25 +174,33 @@ $(INSTALL_DBD)/%: %
 	@echo "Installing $@"
 	@$(INSTALL) -d -m 644 $< $(@D)
 
-$(INSTALL_DBD)/%: ../%
+$(INSTALL_DBD)/%:: ../%
 	@echo "Installing $@"
 	@$(INSTALL) -d -m 644 $< $(@D)
 
-bpt%.dbd: ../bpt%.data
+bpt%.dbd: bpt%.data
 	$(RM) $@
 	$(MAKEBPT) $<
 
+bpt%.dbd:: ../bpt%.data
+	$(RM) $@
+	$(MAKEBPT) $<
+
+# Patch for old applications
+ifdef USER_DBDFLAGS
+DBDFLAGS = $(USER_DBDFLAGS)
+endif
+
 ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo "Expanding dbd"
 	@$(RM) $@
-	$(DBEXPAND) $(USER_DBDFLAGS) $< > $@
+	$(DBEXPAND) $(DBDFLAGS) $< > $@
 endif
 
 ##################################################### Dependencies
 
 DEPENDS: $(filter $(patsubst %.db, %.substitutions, $(DB)), $(wildcard *.substitutions))
-	@echo "Making template database dependencies"
 	@$(MAKEDBDEPENDS) $^
 
 -include DEPENDS

config/RULES.Host

@@ -1,8 +1,6 @@
-
 # $Id$
 #
 #	Rules for making things specified in Makefile.Host
-#
 #	Some rules for filename-massage are system specific
 #	and have "ifdefs" here instead of using definitions
 #	from CONFIG.Host.$(ARCH_CLASS)  -  sorry about this,
@@ -31,10 +29,8 @@
 vpath %.h $(USER_VPATH)   
 vpath %.c $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic ..
 vpath %.cc $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic ..
+vpath %.cpp $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic ..
 vpath %.rc $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic ..
-#	This prevents base/src/include/*.h from being installed. Why??
-#vpath %.h ../os/$(ARCH_CLASS) ../os/generic ..
-vpath %.h $(USER_VPATH)   
 
 #	check for add-on CFLAGS and CXXFLAGS
 #
@@ -224,12 +220,13 @@ ifdef PROD
 PROD := $(addsuffix $(EXE), $(PROD))
 endif
 
-#---------------------------------------------------------------
-#	if we are not building base add base includes and ld dirs
+#-----------------------------------------------------------------
+#	if we are not building base add base includes and dbd dirs
 #	(convenience for extensions and applications)
 ifneq ($(EPICS_BASE),$(TOP))
 ifneq ($(EPICS_BASE),$(INSTALL_LOCATION))
 EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS)
+EPICS_DBDFLAGS += -I $(EPICS_BASE)/dbd
 endif
 endif
 
@@ -238,10 +235,6 @@ endif
 #	create names (lists) for installed things
 #	----------------------------------------------------
 
-#	each list starts with the destination directory name(s)
-#	to make sure it's there
-
-
 INCREC +=$(RECTYPES) $(MENUS)
 
 INSTALL_PROD= $(PROD:%= $(INSTALL_BIN)/%)
@@ -288,12 +281,10 @@ endif
 endif
 
 #---------------------------------------------------------------
-# must use c++ linker if linking to shared libs with c++ code
-ifeq ($(strip $(SHARED_LIBRARIES)),YES)
+# always use c++ linker
 ifneq ($(strip $(CPLUSPLUS)),)
 LINK.c = $(LINK.cc)
 endif # CPLUSPLUS
-endif # LIBTYPE
 
 #---------------------------------------------------------------
 # Version number for base shared libraries (and win32 products)
@@ -311,18 +302,25 @@ endif # EPICS_BASE
 ifdef LIBRARY
 ifdef LIBOBJS
 LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS)
-CFLAGS +=  $($(ANSI)_SHRLIB_CFLAGS_YES)
-CXXFLAGS +=  $($(ANSI)_SHRLIB_CFLAGS_YES)
+
+LIBNAME_RCS=$(foreach lib, $(basename $(LIBRARY)), $(RCS) $($(lib)_RCS) $($(lib)_RCS_$(ARCH_CLASS)))
+LIBNAME_RESS=$(addsuffix $(RES), $(basename $(LIBNAME_RCS)))
+
+ifneq ($(words $(DLL_LIBS)), $(words $(DLL_DEPLIBS)))
+#  If invalid library names, don't make DLL file
+SHARED_LIBRARIES = NO
+endif
 
 #  check if shared libraries requested
 ifeq ($(strip $(SHARED_LIBRARIES)),YES)
 
+CFLAGS +=  $($(ANSI)_SHRLIB_CFLAGS_YES)
+CXXFLAGS +=  $($(CPLUSPLUS)_SHRLIB_CFLAGS_YES)
+SHRLIB_LDFLAGS = $($(CPLUSPLUS)_SHRLIB_LDFLAGS_YES)
+
 PROD_VERSION =$(SHRLIB_VERSION)
-ifeq ($(findstring cc,$(suffix $(LIBSRCS))),cc)
+# always use c++ linker
 SHRLIB_LINKER = $(CXX)
-else
-SHRLIB_LINKER = $(CC)
-endif
 LIBTARGETS += $(SHRLIBNAME) $(INSTALL_SHRLIBS) $(INSTALL_DLL_LINK_LIBS)
 
 endif # SHARED_LIBRARIES=YES
@@ -335,14 +333,19 @@ endif # LIBRARY
 
 all::	install
 
-build:: $(LIBTARGETS) $(PROD) $(TESTPROD) \
-	$(MENUS) $(RECTYPES) $(BPTS) $(DBDNAME)
+build:: inc
+
+build:: $(LIBTARGETS) $(PROD) $(TESTPROD) $(INSTALLS) \
+	$(MENUS) $(RECTYPES) $(BPTS)
+ifdef DBDEXPAND
+build::	$(DBDNAME)
+endif
 
 inc:: $(INSTALL_INC) $(INSTALL_OSINC)
 
 rebuild:: clean install
 
-install:: inc buildInstall 
+install:: buildInstall 
 
 buildInstall :: build $(TARGETS) \
 	$(INSTALL_SCRIPTS) $(INSTALL_PROD) \
@@ -357,7 +360,11 @@ buildInstall :: build $(TARGETS) \
 
 clean::
 	@echo "Cleaning"
-	@$(RM) *.i *$(OBJ) *.a $(PROD) $(TESTPROD) $(LIBNAME) $(SHRLIBNAME) $(INC) *$(RES) $(TARGETS)
+	@$(RM) *.i *$(OBJ) *.a $(PROD) $(TESTPROD) $(LIBNAME) $(SHRLIBNAME) $(INC) \
+	*$(RES) $(TARGETS) $(DBDINSTALL) $(MENUS) $(RECTYPES) $(BPTS)
+ifdef DBDEXPAND
+	@$(RM) $(DBDNAME)
+endif
 
 #---------------------------------------------------------------
 #	Products
@@ -368,7 +375,6 @@ ifdef PROD
 
 COND_PROD_SRCS=$(foreach prod, $(basename $(PROD)), $($(prod)_SRCS))
 COND_PROD_RCS=$(foreach prod, $(basename $(PROD)), $($(prod)_RCS) $($(prod)_RCS_$(ARCH_CLASS)))
-COND_PROD_LIBS=$(foreach prod, $(basename $(PROD)), $($(prod)_LIBS))
 
 ifdef PRODNAME
 
@@ -401,10 +407,17 @@ endif
 PRODNAME_OBJS=$(addsuffix $(OBJ), $(basename $(PRODNAME_SRCS)))
 PRODNAME_RESS=$(addsuffix $(RES), $(basename $(PRODNAME_RCS)))
 
+ifeq ($(HOST_ARCH),Borland)
+$(PRODNAME): $(PRODNAME_OBJS) $(PRODNAME_RESS)
+	@$(RM) $@
+	$(PRODNAME_LINKER) $(PRODNAME_OBJS) , $@ ,,$(LINKLIBS) $(subst /,\\,$(LDLIBS)),, $(PRODNAME_RESS)
+
+else
 $(PRODNAME): $(PRODNAME_OBJS) $(PRODNAME_RESS)
 	@$(RM) $@
 	$(PRODNAME_LINKER) $(PRODNAME_OBJS) $(PRODNAME_RESS) $(LDLIBS)
 
+endif
 endif  # ifdef PRODNAME_SRCS
 
 else # PRODNAME not defined
@@ -427,7 +440,7 @@ PROD_MAKE_COMMAND=$(MAKE) $@\
 	PRODNAME_RCS_$(ARCH_CLASS)="$($(basename $@)_RCS_$(ARCH_CLASS))"\
 	PRODNAME_LIBS="$($(basename $@)_LIBS)"
 
-$(PROD): $(PROD_OBJS) $(PROD_RESS) $(PROD_DEPLIBS) $(COND_PROD_DEPLIBS)
+$(PROD): $(SRCS) $(PROD_OBJS) $(COND_PROD_SRCS) $(PROD_RESS) $(PROD_DEPLIBS) $(COND_PROD_DEPLIBS)
 	@$(PROD_MAKE_COMMAND)
 
 endif
@@ -439,8 +452,10 @@ endif  #ifdef PROD
 #     Java classes and packages
 #
 
-INSTALL_JAVA = $(INSTALL_LOCATION)/javalib
-DIRECTORY_TARGETS += $(INSTALL_JAVA) $(INSTALL_JAVA)/$(PACKAGE)
+DIRECTORY_TARGETS += $(INSTALL_JAVA)
+ifdef PACKAGE
+DIRECTORY_TARGETS += $(INSTALL_JAVA)/$(PACKAGE)
+endif
 
 vpath %.class $(INSTALL_JAVA)/$(PACKAGE)
 
@@ -484,6 +499,11 @@ $(INSTALL_JAVA)/%.jar: %.jar
 	@echo "Installing jar file $@"
 	$(INSTALL) -d -m 644 $< $(@D)
 
+$(PACKAGE)_%.h:$(INSTALL_JAVA)/$(PACKAGE)/%.class
+	$(JAVAHCMD) $(PACKAGE).$*
+
+.PRECIOUS: $(INSTALL_CLASSES)
+
 #---------------------------------------------------------------
 #---------------------------------------------------------------
 #	Generic Rules for 'simple' targets that
@@ -502,24 +522,53 @@ $(INSTALL_JAVA)/%.jar: %.jar
 
 depends:: $(LIBSRCS) $(SRCS) $(COND_PROD_SRCS)
 	$(RM) DEPENDS
-	touch DEPENDS
 	$(DEPENDS_RULE)
 
+ifeq ($(HOST_ARCH),Borland)
+%$(EXE): %.c
+	@$(RM) $@
+	$(COMPILE.c)  $<
+	$(LINK.c) $(subst ../,,$(basename $<))$(OBJ) , $@ ,,$(LINKLIBS)  $(subst /,\\,$(LDLIBS))
+
+%$(EXE): %.cc
+	@$(RM) $@
+	$(COMPILE.cc)  $<
+	$(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) , $@ ,,$(LINKLIBS)  $(subst /,\\,$(LDLIBS))
+
+%$(EXE): %.cpp
+	@$(RM) $@
+	$(COMPILE.cc)  $<
+	$(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) , $@ ,,$(LINKLIBS)  $(subst /,\\,$(LDLIBS))
+
+%$(EXE): %.C
+	@$(RM) $@
+	$(COMPILE.cc)  $<
+	$(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) , $@ ,,$(LINKLIBS)  $(subst /,\\,$(LDLIBS))
+
+else
+
 %$(EXE): %.c
 	@$(RM) $@
 	$(COMPILE.c)  $<
-	$(LINK.c)  $(subst ../,,$(basename $<))$(OBJ) $(LDLIBS)
+	$(LINK.c) $(subst ../,,$(basename $<))$(OBJ) $(LDLIBS)
 
 %$(EXE): %.cc
 	@$(RM) $@
 	$(COMPILE.cc)  $<
 	$(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) $(LDLIBS)
 
+%$(EXE): %.cpp
+	@$(RM) $@
+	$(COMPILE.cc)  $<
+	$(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) $(LDLIBS)
+
 %$(EXE): %.C
 	@$(RM) $@
 	$(COMPILE.cc)  $<
 	$(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) $(LDLIBS)
 
+endif
+
 %$(OBJ): %.c
 	@$(RM) $@
 	$(COMPILE.c)  $<
@@ -528,6 +577,10 @@ depends:: $(LIBSRCS) $(SRCS) $(COND_PROD_SRCS)
 	@$(RM) $@
 	$(COMPILE.cc)  $<
 
+%$(OBJ): %.cpp
+	@$(RM) $@
+	$(COMPILE.cc)  $<
+
 %$(OBJ): %.C
 	@$(RM) $@
 	$(COMPILE.cc)  $<
@@ -572,7 +625,7 @@ endif
 	ln -s $< $*.st
 	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $*.st
 	@$(RM) $*.st
-	
+
 # Capfast Rules:
 %.db: %.edf
 	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) $<
@@ -609,12 +662,12 @@ $(INSTALL_DBD)/%: ../%
 %Record.h: %Record.dbd
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \
-	        $(USER_DBDFLAGS)  $<
+	        $(DBDFLAGS)  $<
  
 %Record.h: ../%Record.dbd
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \
-	        $(USER_DBDFLAGS)  $<
+	        $(DBDFLAGS)  $<
  
 menu%.h: menu%.dbd
 	$(RM) $@
@@ -632,14 +685,38 @@ bpt%.dbd: ../bpt%.data
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt$(EXE) $<
  
+# Patch for old applications
+ifdef USER_DBDFLAGS
+DBDFLAGS = $(USER_DBDFLAGS)
+endif
+
+ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
-	@echo expanding dbd
+	@echo Expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbExpand$(EXE) $(USER_DBDFLAGS) $< > $@
+	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbExpand$(EXE) $(DBDFLAGS) $< > $@
 
-$(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS)
-	$(LINK.shrlib) $(LIBOBJS) $(DLL_LDLIBS)
+ifneq (,$(wildcard ../base.dbd))
+$(DBDNAME): ../base.dbd
+endif
+endif
 
+ifeq ($(HOST_ARCH),Borland)
+$(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS) $(LIBNAME_RESS)
+	$(LINK.shrlib) $(LIBOBJS) , $@ ,,$(LINKLIBS) $(subst /,\\,$(DLL_LDLIBS)), $(DLL_DEF_FLAG), $(LIBNAME_RESS)
+
+else
+$(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS) $(LIBNAME_RESS)
+	$(LINK.shrlib) $(LIBOBJS) $(DLL_LDLIBS) $(LIBNAME_RESS)
+
+endif
+ifeq ($(HOST_ARCH),Borland)
+# rule for lib (archive of object files) creation
+$(LIBNAME): $(LIBOBJS)
+	$(RM) $@
+	$(ARCMD) $(foreach lib,$(LIBOBJS),+$(lib))
+
+else
 # rule for lib (archive of object files) creation
 $(LIBNAME): $(LIBOBJS)
 	$(RM) $@
@@ -648,6 +725,8 @@ ifdef RANLIB
 	$(RANLIB) $@;
 endif # RANLIB
 
+endif
+
 $(INSTALL_BIN)/%: ../os/$(ARCH_CLASS)/%
 	@echo "Installing os-specific script $@"
 	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
@@ -662,14 +741,14 @@ $(INSTALL_BIN)/%: ../%
 
 $(INSTALL_LIB)/%.a: %.a
 	@echo "Installing library $@"
-	@$(INSTALL) -d -m 644 $< $(INSTALL_LIB)
+	@$(INSTALL_LIBRARY) -d -m 644 $< $(INSTALL_LIB)
 ifdef RANLIB
 	$(RANLIB) $(RANLIBFLAGS) $@
 endif # RANLIB
 
 $(INSTALL_LIB)/%.lib: %.lib
 	@echo "Installing library $@"
-	@$(INSTALL) -d -m 644 $< $(INSTALL_LIB)
+	@$(INSTALL_LIBRARY) -d -m 644 $< $(INSTALL_LIB)
 
 $(INSTALL_SHRLIB)/lib%: lib%
 	@echo "Installing library $@"

config/RULES.Unix

@@ -57,7 +57,7 @@ buildInstall :: build \
 	$(INSTALL_MAN) $(INSTALL_MANS) $(INSTALL_HTMLS) \
 	$(INSTALL_DOC) $(INSTALL_DOCS) $(INSTALL_TEMPLATES) \
 	$(INSTALL_TEMPLATES)/$(TEMPLATES_DIR) $(INSTALL_TEMPLATE) \
-	$(INSTALL_CONFIG) $(INSTALL_CONFIGS) \ 
+	$(INSTALL_CONFIG) $(INSTALL_CONFIGS) \
 	$(INSTALL_DBD) $(INSTALL_DBS) $(INSTALL_BPTS) \
 	$(INSTALL_DBDNAME) $(INSTALL_INCREC) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX)
@@ -180,12 +180,12 @@ $(INSTALL_DBD)/%: ../%
 %Record.h: %Record.dbd
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH \
-	        $(USER_DBDFLAGS)  $<
+	        $(DBDFLAGS)  $<
  
 %Record.h: ../%Record.dbd
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH \
-	        $(USER_DBDFLAGS)  $<
+	        $(DBDFLAGS)  $<
  
 menu%.h: menu%.dbd
 	$(RM) $@
@@ -203,10 +203,21 @@ bpt%.dbd: ../bpt%.data
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt $<
  
+# Patch for old applications
+ifdef USER_DBDFLAGS
+DBDFLAGS = $(USER_DBDFLAGS)
+endif
+
+ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbExpand $(USER_DBDFLAGS) $< > $@
+	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbExpand $(DBDFLAGS) $< > $@
+
+ifneq (,$(wildcard ../base.dbd))
+$(DBDNAME): ../base.dbd
+endif
+endif
 
 $(LIBNAME): $(LIBOBJS)
 	@echo Building library $@

config/RULES.Vx

@@ -7,10 +7,11 @@ ifdef LIBOBJS_DEFAULT
 LIBOBJS+=$(LIBOBJS_DEFAULT)
 endif
 endif
- 
+
 INCREC +=$(RECTYPES) $(MENUS)
 INSTALL_PROD = $(PROD:%= $(INSTALL_BIN)/%)
 INSTALL_LIBS = $(LIBNAME:%= $(INSTALL_BIN)/%)
+INSTALL_MUNCHES = $(MUNCHNAME:%= $(INSTALL_BIN)/%)
 INSTALL_LIBS_CXX = $(LIBNAME_CXX:%= $(INSTALL_BIN)/%)
 INSTALL_INC = $(INC:%= $(INSTALL_INCLUDE)/%)
 INSTALL_OSINCLUDE = $(INSTALL_INCLUDE)/os/vxWorks
@@ -33,29 +34,36 @@ INSTALL_DBDNAME = $(DBDNAME:%= $(INSTALL_DBD)/%)
 
 MAN_DIRECTORY_TARGETS = $(foreach n, $(MANLIST),$(INSTALL_MAN)/man$(n))
 
-#       if we are not building base add base includes
-#
+#-----------------------------------------------------------------
+#	if we are not building base add base includes and dbd dirs
+#	(convenience for extensions and applications)
 ifneq ($(EPICS_BASE),$(TOP))
 ifneq ($(EPICS_BASE),$(INSTALL_LOCATION))
 EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS)
+EPICS_DBDFLAGS += -I $(EPICS_BASE)/dbd
 endif
 endif
 
 all:: install 
 
+build:: inc
+
 rebuild:: clean install
 
 pre_build:: 
 
 build:: pre_build $(MENUS) $(RECTYPES) $(BPTS)\
-         $(LIBNAME) $(LIBNAME_CXX) $(TARGETS) $(PROD) $(DBDNAME)
+         $(LIBNAME) $(LIBNAME_CXX) $(MUNCHNAME) $(TARGETS) $(PROD)
+ifdef DBDEXPAND
+build::	$(DBDNAME)
+endif
 
 inc:: $(INSTALL_INC) $(INSTALL_OSINC)
- 
-install:: inc buildInstall 
+
+install:: buildInstall 
 
 buildInstall :: build $(INSTALL_INCREC)\
-         $(INSTALL_LIBS) $(INSTALL_LIBS_CXX) \
+         $(INSTALL_LIBS) $(INSTALL_LIBS_CXX) $(INSTALL_MUNCHES) \
 	 $(TARGETS) $(INSTALL_PROD) \
 	 $(INSTALL_MANS) $(INSTALL_DOCS) \
          $(INSTALL_HTMLS) \
@@ -69,24 +77,26 @@ endif
 
 depends:: $(SRCS.c) $(SRCS.cc)
 	$(RM) DEPENDS
-	touch DEPENDS
 	$(DEPENDS_RULE)
 
 clean::
 	@echo "Cleaning"
 	@$(RM) *.i *.o *.a *.out $(TARGETS) $(PROD) $(LIBNAME) $(INC) \
 	$(DBDINSTALL) $(MENUS) $(RECTYPES) $(BPTS) $(DBDNAME)
+ifdef MUNCH
+	@$(RM) $(MUNCHNAME) ctdt.c ctdt.o nm.out
+endif
 
 #  The order of the following dependencies is
 #  VERY IMPORTANT !!!!
 
 %: %.o
 	$(RM) $@
-	$(LINK.c)$@ $< $(LDLIBS)
+	$(LINK.c) $@ $< $(LDLIBS)
 
 #$(PROD): $(OBJS)
 #	$(RM) $@
-#	$(LINK.c)$@ $(OBJS)
+#	$(LINK.c) $@ $(OBJS)
 
 %.o: %.c
 	$(RM) $@
@@ -106,11 +116,19 @@ clean::
 
 # C++ munching
 %.out : %.o
-	@ $(RM) ctct.o ctdt.c
-	$(NM) $< | $(MUNCH) > ctdt.c
+	@ $(RM) ctct.o ctdt.c nm.out
+	$(NM) $<  > nm.out
+	$(PERL) $(EPICS_BASE)/bin/$(HOST_ARCH)/munch.pl < nm.out > ctdt.c
 	$(COMPILE.c) -traditional ctdt.c
-	$(LINK.c) $@ $< ctdt.o
-	@ $(RM) ctdt.c ctdt.o
+	$(LINK.cc) $@ $< ctdt.o
+
+# C++ munching for VxWorks
+$(MUNCHNAME):%.munch : %
+	@ $(RM) ctct.o ctdt.c nm.out
+	$(NM) $<  > nm.out
+	$(PERL) $(EPICS_BASE)/bin/$(HOST_ARCH)/munch.pl < nm.out > ctdt.c
+	$(COMPILE.c) -traditional ctdt.c
+	$(LINK.cc) $@ $(LDFLAGS) $< ctdt.o
 
 #
 # rename the y.tab.h file only if we
@@ -137,7 +155,7 @@ endif
 %.c: ../%.st
 	@echo "preprocessing $*.st"
 	@$(RM) $*.i
-	$(CPP) $(CPPFLAGS) $< $*.i
+	$(CPP) $(CPPFLAGS) $(CPPSNCFLAGS) $< > $*.i
 	@echo "converting $*.i"
 	@$(RM) $@
 	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $*.i
@@ -177,7 +195,6 @@ binInstalls:  $(BIN_INSTALLS)
 	$(INSTALL) -d -m 555 $^ $(INSTALL_BIN)
 
 $(INSTALL_DBD)/%: % 
-	@echo "Installing $@"
 	@echo "Installing $@"
 	@$(INSTALL) -d -m 644 $< $(INSTALL_DBD)
 
@@ -188,12 +205,12 @@ $(INSTALL_DBD)/%: ../%
 %Record.h: %Record.dbd
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \
-		$(USER_DBDFLAGS)  $<
+		$(DBDFLAGS)  $<
 
 %Record.h: ../%Record.dbd
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \
-		$(USER_DBDFLAGS)  $<
+		$(DBDFLAGS)  $<
 
 menu%.h: menu%.dbd
 	$(RM) $@
@@ -211,10 +228,17 @@ bpt%.dbd: ../bpt%.data
 	$(RM) $@
 	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt$(EXE) $<
 
+# Patch for old applications
+ifdef USER_DBDFLAGS
+DBDFLAGS = $(USER_DBDFLAGS)
+endif
+
+ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
-	@echo expanding dbd
+	@echo Expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbExpand$(EXE) $(USER_DBDFLAGS) $< > $@
+	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbExpand$(EXE) $(DBDFLAGS) $< > $@
+endif
 
 $(LIBNAME): $(LIBOBJS)
 	@echo Building library $@
@@ -285,7 +309,13 @@ $(INSTALL_HTML)/$(HTMLS_DIR)/%: ../%
 ifneq (,$(wildcard ../baseLIBOBJS))
 $(LIBNAME): ../baseLIBOBJS
 endif
+
+ifneq (,$(wildcard ../base.dbd))
+$(DBDNAME): ../base.dbd $(RECTYPES:%.h=../%.dbd)
+else
+$(DBDNAME): $(RECTYPES:%.h=../%.dbd)
+endif
+
 #=====> ????  the following line causes a rebuild every time
 #=====> $(LIBNAME): ../Makefile.Vx
-$(DBDNAME): ../base.dbd $(RECTYPES:%.h=../%.dbd)
 

config/RULES_ARCHS

@@ -13,6 +13,7 @@ ACTIONS += install
 ACTIONS += buildInstall 
 ACTIONS += depends 
 ACTIONS += rebuild 
+ACTIONS += browse 
 
 actionPart = $(word 1, $(subst $(DIVIDER), ,$@))
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))

config/RULES_DIRS

@@ -4,35 +4,35 @@
  
 
 ARCHS += $(BUILD_ARCHS) host cross
-ACTIONS += clean inc depends buildInstall
+ACTIONS += clean inc depends build install buildInstall
  
 dirPart = $(word 1, $(subst $(DIVIDER), ,$@))
-actionArchPart = $(subst $(dirPart)$(DIVIDER), ,$@)
+actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$@)), \
+ $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$@))))
  
 dirActionArchTargets = $(foreach dir, $(DIRS), \
-                       $(foreach action, $(ACTIONS) install,\
+                       $(foreach action, $(ACTIONS),\
                        $(foreach arch, $(ARCHS), \
                        $(dir)$(DIVIDER)$(action)$(DIVIDER)$(arch))))
 dirArchTargets += $(foreach dir, $(DIRS), \
                   $(foreach arch, $(ARCHS),\
                   $(dir)$(DIVIDER)$(arch)))
 dirActionTargets += $(foreach dir, $(DIRS), \
-                    $(foreach action, $(ACTIONS) install,\
+                    $(foreach action, $(ACTIONS),\
                     $(dir)$(DIVIDER)$(action)))
-actionArchTargets = $(foreach action, $(ACTIONS) install,\
+actionArchTargets = $(foreach action, $(ACTIONS),\
                     $(foreach arch, $(ARCHS), \
                     $(action)$(DIVIDER)$(arch)))
-
-installArchTargets = $(foreach action, install,\
-                    $(foreach arch, $(ARCHS), \
-                    $(action)$(DIVIDER)$(arch)))
-
+ifeq ($(MAKE_INC_TARGET_FIRST),YES)
 all install :: inc buildInstall 
+$(ARCHS) $(installArchTargets) :: inc
+else
+all install :: buildInstall 
+endif
+
 
 rebuild:: clean all
 
-$(ARCHS) $(installArchTargets) :: inc
-
 $(DIRS) $(dirActionTargets) $(dirArchTargets)$(dirActionArchTargets) ::
 	$(MAKE) -C $(dirPart) $(actionArchPart)
 
@@ -40,11 +40,9 @@ $(ARCHS) $(ACTIONS) $(actionArchTargets) ::%: \
 	$(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
  
 
-.PHONY :: $(DIRS) all install rebuild
+.PHONY :: $(DIRS) all rebuild
 .PHONY :: $(ARCHS) $(ACTIONS)
 .PHONY :: $(dirActionTargets) $(dirArchTargets)
 .PHONY :: $(dirActionArchTargets)
 .PHONY :: $(actionArchTargets)
-.PHONY :: $(installArchTargets)
-
 

config/RULES_TOP

@@ -4,13 +4,27 @@
 
 include $(TOP)/config/RULES_DIRS
 
-uninstall$(DIVIDER)%::
-	@$(RMDIR)  rec.bak rec
-	@$(RMDIR) $(INSTALL_LOCATION_BIN)/$* $(INSTALL_LOCATION_LIB)/$* \
-		$(INSTALL_DBD) $(INSTALL_MAN) $(INSTALL_INCLUDE) \
-		$(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES)
+uninstall$(DIVIDER)%: uninstallDirs
+	@$(RMDIR) $(INSTALL_LOCATION_BIN)/$* $(INSTALL_LOCATION_LIB)/$* 
+
+cleandirs:
+	@echo " " #stops "nothing to be done for cleandirs" message
+ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),)
+	@$(RMDIR) $(INSTALL_LOCATION_BIN)
+endif
+ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
+	@$(RMDIR) $(INSTALL_LOCATION_LIB)
+endif
+
+distclean: clean uninstall
 
 uninstall:: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
+	@$(MAKE) -f Makefile  cleandirs
+
+uninstallDirs:
+	@$(RMDIR)  rec.bak rec
+	@$(RMDIR) $(INSTALL_DBD) $(INSTALL_MAN) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
+		$(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES)
 
 tar:
 	@DIRNAME=$(notdir $(shell pwd)); \
@@ -46,6 +60,5 @@ help:
 	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY :: uninstall tar help
-.PHONY :: $(addprefix uninstall$(DIVIDER), $(BUILDARCHS))
+.PHONY :: uninstall tar help cleandirs distclean uninstallDirs
 

config/tools/installEpics.pl

@@ -34,6 +34,7 @@ Usage ("Nothing to install") if ($num_files < 1);
 $install_dir=$ARGV[$num_files];
 $install_dir =~ s[\\][/]g;	# maybe fix DOS-style path
 $install_dir =~ s[/$][];	# remove trailing '/'
+$install_dir =~ s[//][/]g;	# replace '//' by '/'
 
 #	Do we have to create the directory?
 unless (-d $install_dir)

config/tools/mkdir.pl

@@ -6,7 +6,7 @@
 
 use File::Path;
 use Getopt::Std;
-getopt();
+getopt "";
 
 foreach $dir ( @ARGV )
 {

config/tools/munch.pl

@@ -0,0 +1,51 @@
+eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
+    if $running_under_some_shell; # makeConfigAppInclude.pl
+
+# Creates a ctdt.c file of c++ static constructors and destructors.
+#  $Id$
+
+@ctorlist = ();
+@dtorlist = ();
+
+while ($line = <STDIN>)
+{
+    if ($line =~ /__?GLOBAL_.D.+/) {
+        ($adr,$type,$name) = split ' ',$line,3;
+        chop $name;
+        $name =~ s/^__/_/;
+        @dtorlist = (@dtorlist,$name);
+    };
+    if ($line =~ /__?GLOBAL_.I.+/) {
+        ($adr,$type,$name) = split ' ',$line,3;
+        chop $name;
+        $name =~ s/^__/_/;
+        @ctorlist = (@ctorlist,$name);
+    };
+}
+
+foreach $ctor (@ctorlist)
+{
+    printf "void %s();\n",$ctor;
+}
+
+print "extern void (*_ctors[])();\n";
+print "void (*_ctors[])() = {\n";
+foreach $ctor (@ctorlist)
+{
+    printf "        %s,\n",$ctor;
+}
+print "        0};\n";
+
+
+foreach $dtor (@dtorlist)
+{
+    printf "void %s();\n",$dtor;
+}
+
+print "extern void (*_ctors[])();\n";
+print "void (*_dtors[])() = {\n";
+foreach $dtor (@dtorlist)
+{
+    printf "        %s,\n",$dtor;
+}
+print "        0};\n";

config/tools/rm.pl

@@ -6,7 +6,7 @@ use File::Path;
 use File::Find;
 use Getopt::Std;
 
-getopt();
+getopt "";
 
 foreach $arg ( @ARGV )
 {

configure/CONFIG

@@ -0,0 +1,99 @@
+#
+#  $Id$
+#
+#  The developer may edit this file.
+# assume T_A is the host arch if not specified
+
+#
+#  Common build definitions
+#
+
+ifndef CONFIG
+CONFIG = $(TOP)/configure
+endif
+
+-include $(CONFIG)/os/CONFIG_COMPAT
+
+-include $(CONFIG)/RELEASE
+-include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
+
+include $(CONFIG)/CONFIG_COMMON
+
+#  EPICS-specific build options
+#
+include $(CONFIG)/CONFIG_BASE
+include $(CONFIG)/CONFIG_BASE_VERSION
+
+#  Site-specific build options
+#
+include $(CONFIG)/CONFIG_SITE
+
+#  Host architecture specific definitions
+#
+include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
+-include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+
+
+ifdef T_A
+
+#  Cross compile specific definitions
+#
+ifneq ($(EPICS_HOST_ARCH),$(T_A))
+include $(CONFIG)/CONFIG.CrossCommon
+endif
+
+#  Target architecture specific definitions
+#
+-include $(CONFIG)/os/CONFIG.Common.$(T_A)
+
+#  Host-Target architecture specific definitions
+#
+-include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
+
+#  Site specific target and host-target definitions
+#
+-include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
+-include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
+endif
+
+#  User specific definitions
+#
+-include $(HOME)/configure/CONFIG
+-include $(HOME)/os/configure/CONFIG.Host.$(HOST_ARCH)
+-include $(HOME)/os/configure/CONFIG.Host.$(EPICS_HOST_ARCH)
+-include $(HOME)/os/configure/CONFIG.$(HOST_ARCH).Common
+-include $(HOME)/os/configure/CONFIG.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+-include $(HOME)/configure/CONFIG.$(OS_CLASS)
+-include $(HOME)/configure/CONFIG.Target.$(T_A)
+-include $(HOME)/configure/CONFIG.Common.$(T_A)
+-include $(HOME)/configure/CONFIG.$(HOST_ARCH).$(T_A)
+-include $(HOME)/configure/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
+-include $(HOME)/configure/os/CONFIG.Target.$(T_A)
+-include $(HOME)/configure/os/CONFIG.Common.$(T_A)
+-include $(HOME)/configure/os/CONFIG.$(HOST_ARCH).$(T_A)
+-include $(HOME)/configure/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
+endif
+
+#  All options
+#   may be overridden here.
+#
+# EXAMPLES
+# --------
+#  Build client objects statically ?  must be either YES or NO
+#STATIC_BUILD=NO
+#  Host build optimization,   must be either YES or NO
+#HOST_OPT=YES
+#  Cross build optimization,  must be either YES or NO
+#CROSS_OPT=YES
+#  Generate Verbose Compiler Warnings for host build,  must be either YES or NO
+#HOST_WARN=YES
+#  Generate Verbose Compiler Warnings for cross compile builds,  must be either YES or NO
+#CROSS_WARN=YES
+#etc.
+
+#CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040
+#CMPLR=STRICT
+#CXXCMPLR=STRICT
+

configure/CONFIG.CrossCommon

@@ -0,0 +1,22 @@
+# Cross compiler default definitions
+
+# Build class: either HOST or CROSS
+# Used to determine OPT and WARN compiler flags
+BUILD_CLASS = CROSS
+
+# Cross build: either defined or not
+# Used in os/CONFIG.Common.<arch> files
+#   ifdef CROSS    looks better than  ifeq ($(BUILD_CLASS),CROSS)
+CROSS = YES
+
+GNU_TARGET_INCLUDE_DIR = $(GNU_DIR)/$(GNU_TARGET)/include
+GNU_TARGET_LIB_DIR = $(GNU_DIR)/$(GNU_TARGET)/lib
+
+CROSS_CPPFLAGS = -nostdinc
+CROSS_CFLAGS = -B$(GNU_LIB)/gcc-lib/
+CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
+CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))
+
+
+# All cross builds use the gnu compiler
+include $(CONFIG)/CONFIG.gnuCommon