R3.14.5 Release.

if its a receive thread initiated shutdown

LICENSE

@@ -1,29 +1,19 @@
-Copyright (c) 1991-2003 University of Chicago and The Regents of the
+Copyright (c) 1991-2004 University of Chicago and The Regents of the
 University of California. All rights reserved.
 
-EPICS BASE is distributed subject to the following license agreement:
+EPICS BASE is distributed subject to the following license conditions:
 
  SOFTWARE LICENSE AGREEMENT
  Software: EPICS BASE
  Versions: 3.13.7 and higher
 
-IMPORTANT! READ CAREFULLY: EPICS BASE is NOT distributed as Open Source.
-This is a legal agreement between you (in your capacity as an individual
-and as an agent for your company, institution or other entity) and The
-University of Chicago, as Operator of Argonne National Laboratory under
-Contract W-31-109-ENG-38 with the U.S. Department of Energy ("Argonne"),
-and The Regents of the University of California, as Operator of Los Alamos
-National Laboratory under Contract W-7405-ENG-36 with the U.S. Department
-of Energy ("Los Alamos").
-
  1. The "Software", below, refers to EPICS BASE (in either source code, or
     binary form and accompanying documentation). Each licensee is
     addressed as "you" or "Licensee."
 
- 2. Argonne and Los Alamos are copyright holders in the Software. The
-    copyright holders and their third-party licensors hereby grant
-    Licensee a royalty-free nonexclusive license, subject to the
-    limitations stated herein and U.S. Government license rights.
+ 2. The copyright holders shown above and their third-party licensors
+    hereby grant Licensee a royalty-free nonexclusive license, subject to
+    the limitations stated herein and U.S. Government license rights.
 
  3. You may modify and make a copy or copies of the Software for use
     within your organization, if you meet the following conditions:
@@ -44,39 +34,28 @@ of Energy ("Los Alamos").
          materials provided with the copy;
       c. Modified copies and works based on the Software must carry
          prominent notices stating that you changed specified portions of
-         the Software; and
-      d. Prior to sending a copy or modified copy of the Software to any
-         person or entity outside your organization you must verify with
-         Argonne that the intended recipient of the Software has executed
-         a license with Argonne for EPICS BASE. (See
-         http://www.aps.anl.gov/epics/license/verify.php for information
-         on how to contact Argonne.)
+         the Software.
 
- 5. THE SOFTWARE INCLUDES PORTIONS WHICH MAY REQUIRE SOME FORM OF EXPORT
-    CONTROL LICENSE FROM THE U.S. GOVERNMENT. FAILURE TO OBTAIN SUCH
-    EXPORT CONTROL LICENSE MAY RESULT IN CRIMINAL LIABILITY UNDER U.S.
-    LAWS.
-
- 6. Portions of the Software resulted from work developed under a U.S.
+ 5. Portions of the Software resulted from work developed under a U.S.
     Government contract and are subject to the following license: the
     Government is granted for itself and others acting on its behalf a
     paid-up, nonexclusive, irrevocable worldwide license in this computer
     software to reproduce, prepare derivative works, and perform publicly
     and display publicly.
 
- 7. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY
+ 6. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY
     OF ANY KIND. THE COPYRIGHT HOLDERS, THEIR THIRD PARTY LICENSORS, THE
     UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND THEIR
     EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
     BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-    FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT, (2) DO NOT ASSUME
+    FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME
     ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS,
     OR USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE
     SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT
-    THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR FREE
+    THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR-FREE
     OR THAT ANY ERRORS WILL BE CORRECTED.
 
- 8. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR
+ 7. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR
     THIRD PARTY LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT
     OF ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, INCIDENTAL,
     CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE,
@@ -89,21 +68,17 @@ of Energy ("Los Alamos").
 ________________________________________________________________________
 
 This software is in part copyrighted by the BERLINER SPEICHERRING
-GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY),
-BERLIN, GERMANY.
+GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY), BERLIN, GERMANY.
 
-In no event shall BESSY be liable to any party for direct,
-indirect, special, incidental, or consequential damages arising
-out of the use of this software, its documentation, or any
-derivatives thereof, even if BESSY has been advised of the
-possibility of such damage.
+In no event shall BESSY be liable to any party for direct, indirect,
+special, incidental, or consequential damages arising out of the use of
+this software, its documentation, or any derivatives thereof, even if
+BESSY has been advised of the possibility of such damage.
 
-BESSY specifically disclaims any warranties, including, but not
-limited to, the implied warranties of merchantability, fitness for
-a particular purpose, and non-infringement.  This software is
-provided on an "as is" basis, and BESSY has no obligation to
-provide maintenance, support, updates, enhancements, or
-modifications.
+BESSY specifically disclaims any warranties, including, but not limited
+to, the implied warranties of merchantability, fitness for a particular
+purpose, and non-infringement.  This software is provided on an "as is"
+basis, and BESSY has no obligation to provide maintenance, support,
+updates, enhancements, or modifications.
 ________________________________________________________________________
 
-

Makefile

@@ -14,7 +14,8 @@
 TOP = .
 include $(TOP)/configure/CONFIG
 
-DIRS += config config/tools configure src
+DIRS += config config/tools
+DIRS += configure src
 
 include $(TOP)/configure/RULES_TOP
 

config/CONFIG.Host.Darwin

@@ -29,6 +29,7 @@ RANLIB = ranlib
 ANSI=GCC
 CPLUSPLUS=G++
 
+OP_SYS_CPPFLAGS += -DDarwin
 OP_SYS_CFLAGS += -no-cpp-precomp
 OP_SYS_INCLUDES = -I/sw/include -I/usr/X11R6/include
 OP_SYS_LDFLAGS += -L/sw/lib -L/usr/X11R6/lib

config/CONFIG.Host.hp700

@@ -21,7 +21,8 @@ include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
 
 SHRLIB_SUFFIX = .sl
 
-AR = ar -rc
+AR = ar
+ARFLAGS = -rc
 
 # Configure OS vendor C compiler
 ACC = cc

config/CONFIG.Host.solaris

@@ -45,7 +45,7 @@ ACC_SFLAGS_NO=
 ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic
 ACC_SLIBS_NO=
 ACC_SHRLIB_CFLAGS_YES =
-ACC_SHRLIB_LDFLAGS_YES =  -G -h $@ -z ignore -z combreloc -z lazyload
+ACC_SHRLIB_LDFLAGS_YES =  -G -h $@
 
 # Configure OS vendor C++ compiler
 CCC = $(SPARCWORKS)/bin/CC
@@ -63,7 +63,7 @@ CCC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic
 CCC_SLIBS_NO=
 CCC_DEPENDS_FLAG = -xM1
 CCC_SHRLIB_CFLAGS_YES =
-CCC_SHRLIB_LDFLAGS_YES =  -G -h $@ -z ignore -z combreloc -z lazyload
+CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
 
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
@@ -73,14 +73,18 @@ POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
 ARCH_DEP_LDLIBS += -lsocket -lnsl
 ARCH_DEP_LDLIBS += -lposix4 -lpthread
 ARCH_DEP_LDLIBS_8 = -lCrun
+ARCH_DEP_LDLIBS_9 = -lCrun
 ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
 
 #Allows R3.13 built extensions to load R3.14 shared libs
 SYS_DLL_LIBS_solaris_8 = Crun
+SYS_DLL_LIBS_solaris_9 = Crun
 SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
 
 # Runtime ldflags
 RUNTIME_LDFLAGS =$(addprefix -R,$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
  $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
 
+OP_SYS_LDFLAGS =  -z ignore -z combreloc -z lazyload
+
 

config/CONFIG.Host.solaris-sparc-debug

@@ -7,24 +7,8 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../../..
-include $(TOP)/configure/CONFIG
+# $Id$
 
-INC += camacLib.h
-INC += fast_lock.h
-INC += drvTS.h
-INC += devLib.h
-INC += epicsDynLink.h
-INC += module_types.h
-INC += task_params.h
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solaris
 
-SRCS += drvTS.c
-SRCS += devLib.c
-SRCS += devLibVxWorks.c
-SRCS += veclist.c
-SRCS += epicsDynLink.c
-
-OBJLIB_vxWorks += vxCom
-OBJLIB_SRCS = $(SRCS)
-
-include $(TOP)/configure/RULES

config/CONFIG.Host.solaris-sparc-staticlib

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

config/CONFIG.Host.solarisGnu

@@ -41,10 +41,12 @@ POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
 ARCH_DEP_LDLIBS += -lsocket -lnsl
 ARCH_DEP_LDLIBS += -lposix4 -lpthread
 ARCH_DEP_LDLIBS_8 = -lCrun
+ARCH_DEP_LDLIBS_9 = -lCrun
 ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
 
 #Allows R3.13 built extensions to load R3.14 shared libs
 SYS_DLL_LIBS_solaris_8 = Crun
+SYS_DLL_LIBS_solaris_9 = Crun
 SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
 
 # Runtime ldflags

config/CONFIG.Vx.vxWorks-ppc603_long

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

config/CONFIG.Vx.vxWorks-ppc604_long

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

config/CONFIG_BASE_VERSION

@@ -18,7 +18,7 @@
 
 EPICS_VERSION=3
 EPICS_REVISION=14
-EPICS_MODIFICATION=2
+EPICS_MODIFICATION=5
 EPICS_UPDATE_NAME=
 EPICS_UPDATE_LEVEL=0
 

config/CONFIG_COMPAT

@@ -15,6 +15,8 @@
 #Syntax:
 # ARCH_<host_arch> = <epics_host_arch>
 ARCH_solarisGnu = solaris-sparc-gnu
+#ARCH_solaris = solaris-sparc-static
+#ARCH_solaris = solaris-sparc-debug
 ARCH_solaris = solaris-sparc
 ARCH_sun4 = sun4-sparc
 ARCH_Linux = linux-x86

config/CONFIG_HOST_ARCH.solaris-sparc-debug

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

config/CONFIG_HOST_ARCH.solaris-sparc-gnu

@@ -9,5 +9,5 @@
 #*************************************************************************
 #  $Id$
 
--include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solarisGnu
 

config/CONFIG_HOST_ARCH.solaris-sparc-staticlib

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

config/CONFIG_HOST_ARCH.solaris-x86-gnu

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

config/CONFIG_HOST_ARCH.solarisGnu

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

config/CONFIG_SITE

@@ -24,6 +24,7 @@
 #	solarisGnu  (GNU compiler)
 #	solaris-x86
 #	sun4
+
 #
 #  HOST_ARCH now an environment variable
 #  HOST_ARCH=$(shell /usr/local/epics/startup/HostArch)
@@ -31,29 +32,18 @@ ifndef HOST_ARCH
 	HOST_ARCH=unsupported
 endif
 
-#  The architectures to build EPICS for
+#  The R3.14 architectures to build EPICS for
 #
 #  Currently Supporting:
-#       frc40
-#       frc5ce
-#       hkbaja47
-#       hkv2f
-#       mv147
-#       mv1604
-#       mv162
-#       mv162lc
-#       mv167
-#       mv177
-#       mv2700
-#       niCpu030
-#       pc486
-#       ppc603
-#       ppc604
-#       ppc603_long (over 32MB)
-#       ppc604_long (over 32MB)
-#       sbs_pc6
-#       vxipc
-#
+#       vxWorks-486
+#       vxWorks-68040
+#       vxWorks-68040lc
+#       vxWorks-68060
+#       vxWorks-ppc603
+#       vxWorks-ppc604
+#       vxWorks-ppc603_long
+#       vxWorks-ppc604_long
+
 CROSS_COMPILER_TARGET_ARCHS=
 
 

config/CONFIG_SITE.Host.solaris-sparc-debug

@@ -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-staticlib

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

config/Makefile

@@ -15,10 +15,12 @@ TOP=..
 
 include $(TOP)/configure/CONFIG
 
+ifeq ($(strip $(COMPAT_313)),YES)
 INSTALL_CONFIG = $(INSTALL_LOCATION)/config
 
 CONFIGS += $(subst ../,,$(wildcard ../CONFIG*))
 CONFIGS += $(subst ../,,$(wildcard ../RULES*))
+endif
 
 include $(TOP)/configure/RULES
 

config/RULES.Db

@@ -204,7 +204,7 @@ ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo "Expanding dbd"
 	@$(RM) $@
-	$(DBEXPAND) $(DBDFLAGS) $< > $@
+	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
 endif
 
 ##################################################### Dependencies

config/RULES.Host

@@ -463,10 +463,12 @@ endif  #ifdef PROD
 #     Java classes and packages
 #
 
+ifdef JAVA
 DIRECTORY_TARGETS += $(INSTALL_JAVA)
 ifdef PACKAGE
 DIRECTORY_TARGETS += $(INSTALL_JAVA)/$(PACKAGE)
 endif
+endif
 
 vpath %.class $(INSTALL_JAVA)/$(PACKAGE)
 
@@ -648,8 +650,8 @@ endif
 	@$(RM) $@
 	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $*.i
 
-%.c:	%.stt
-	@echo "converting $<
+%.c: ../%.stt
+	@echo "converting $<"
 	ln -s $< $*.st
 	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $*.st
 	@$(RM) $*.st
@@ -722,7 +724,7 @@ ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo Expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE_HOST_BIN)/dbExpand$(EXE) $(DBDFLAGS) $< > $@
+	$(EPICS_BASE_HOST_BIN)/dbExpand$(EXE) $(DBDFLAGS) -o $@ $<
 
 ifneq (,$(wildcard ../base.dbd))
 $(DBDNAME): ../base.dbd
@@ -782,8 +784,8 @@ $(INSTALL_SHRLIB)/lib%: lib%
 	@echo "Installing library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
 ifdef SHRLIB_VERSION
-	@$(RM) $(@:%.$(SHRLIB_VERSION)=%)
-	ln -s $< $(@:%.$(SHRLIB_VERSION)=%) 
+	$(RM) $(subst .$(SHRLIB_VERSION),,$@)
+	ln -s $< $(subst .$(SHRLIB_VERSION),,$@)
 endif # SHRLIB_VERSION
 
 $(INSTALL_TCLLIB)/%: %

config/RULES.Unix

@@ -148,7 +148,7 @@ $(TARGETS) $(PROD): $(DEPLIBS)
 	@$(RM) $@
 	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $*.i
 
-%.c: %.stt
+%.c: ../%.stt
 	@echo "converting $<
 	@$(RM) $@
 	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $<
@@ -221,7 +221,7 @@ ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE_HOST_BIN)/dbExpand $(DBDFLAGS) $< > $@
+	$(EPICS_BASE_HOST_BIN)/dbExpand $(DBDFLAGS) -o $@ $<
 
 ifneq (,$(wildcard ../base.dbd))
 $(DBDNAME): ../base.dbd

config/RULES.Vx

@@ -248,7 +248,7 @@ ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo Expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE_HOST_BIN)/dbExpand$(EXE) $(DBDFLAGS) $< > $@
+	$(EPICS_BASE_HOST_BIN)/dbExpand$(EXE) $(DBDFLAGS) -o $@ $<
 endif
 
 $(LIBNAME): $(LIBOBJS)

config/RULES_ARCHS

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

config/tools/Makefile

@@ -15,8 +15,10 @@ TOP=../..
 
 include $(TOP)/configure/CONFIG
 
+ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
 SCRIPTS_HOST += $(subst ../,,$(wildcard ../*.pl)) 
 SCRIPTS_HOST += installEpics
+endif
 
 include $(TOP)/configure/RULES
 

configure/CONFIG

@@ -17,14 +17,14 @@
 #  Common build definitions
 #
 
-ifndef CONFIG
-CONFIG = $(TOP)/configure
-endif
+CONFIG ?= $(TOP)/configure
 
 -include $(CONFIG)/os/CONFIG_COMPAT
 
 -include $(CONFIG)/RELEASE
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
+-include $(CONFIG)/RELEASE.Common.$(T_A)
+-include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 
 include $(CONFIG)/CONFIG_COMMON
 

configure/CONFIG_ADDONS

@@ -57,6 +57,8 @@
 #    LIBRARY       products to build and install
 #    LIBRARY_HOST  products to build and install
 #    LIBRARY_IOC   products to build and install
+#    LOADABLE_LIBRARY        module to build and install
+#    LOADABLE_LIBRARY_HOST   module to build and install
 #    SCRIPTS       scripts and install
 #    SCRIPTS_HOST  host system scripts to install
 #    SCRIPTS_IOC   ioc system scripts to install
@@ -169,17 +171,6 @@ LIB_LDFLAGS+=$(LIB_LDFLAGS_DEFAULT)
 endif
 endif
 
-#	check for special includes:
-#
-ifneq ($(strip $(INC_$(OS_CLASS))),)
-#	os-specific includes go to the include/os-directory:
-INC += $(subst -nil-,,$(INC_$(OS_CLASS)))
-else
-ifdef INC_DEFAULT
-INC += $(INC_DEFAULT)
-endif
-endif
-
 #	concat specific library contents (if defined)
 #
 ifneq ($(strip $(LIBSRCS_$(OS_CLASS))),)
@@ -326,6 +317,22 @@ LIBRARY_HOST+=$(LIBRARY_HOST_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(LOADABLE_LIBRARY_$(OS_CLASS))),)
+LOADABLE_LIBRARY+=$(subst -nil-,,$(LOADABLE_LIBRARY_$(OS_CLASS)))
+else
+ifneq (,$(strip $(LOADABLE_LIBRARY_DEFAULT)))
+LOADABLE_LIBRARY+=$(LOADABLE_LIBRARY_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(LOADABLE_LIBRARY_HOST_$(OS_CLASS))),)
+LOADABLE_LIBRARY_HOST+=$(subst -nil-,,$(LOADABLE_LIBRARY_HOST_$(OS_CLASS)))
+else
+ifneq (,$(strip $(LOADABLE_LIBRARY_HOST_DEFAULT)))
+LOADABLE_LIBRARY_HOST+=$(LOADABLE_LIBRARY_HOST_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(PROD_LIBS_$(OS_CLASS))),)
 PROD_LIBS += $(subst -nil-,,$(PROD_LIBS_$(OS_CLASS)))
 else

configure/CONFIG_BASE

@@ -56,15 +56,15 @@ BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
 #---------------------------------------------------------------
 # Epics base build tools and tool flags
 
-MAKEBPT                    = $(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE)
-DBEXPAND                   = $(EPICS_BASE_HOST_BIN)/dbExpand$(HOSTEXE)
-DBTORECORDTYPEH            = $(EPICS_BASE_HOST_BIN)/dbToRecordtypeH$(HOSTEXE)
-DBTOMENUH                  = $(EPICS_BASE_HOST_BIN)/dbToMenuH$(HOSTEXE)
+MAKEBPT                    = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE))
+DBEXPAND                   = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/dbExpand$(HOSTEXE))
+DBTORECORDTYPEH            = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/dbToRecordtypeH$(HOSTEXE))
+DBTOMENUH                  = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/dbToMenuH$(HOSTEXE))
 REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl
 
 # private versions of lex/yacc from EPICS
-EYACC = $(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE)
-ELEX = $(EPICS_BASE_HOST_BIN)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static
+EYACC = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE))
+ELEX = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/e_flex$(HOSTEXE)) -S$(EPICS_BASE)/include/flex.skel.static
 
 YACC  = $(EYACC)
 LEX   = $(ELEX)

configure/CONFIG_BASE_VERSION

@@ -18,7 +18,7 @@
 
 EPICS_VERSION=3
 EPICS_REVISION=14
-EPICS_MODIFICATION=2
+EPICS_MODIFICATION=5
 EPICS_UPDATE_NAME=
 EPICS_UPDATE_LEVEL=0
 
@@ -27,3 +27,4 @@ EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_M
 CVS_DATE="\$$Date$$"
 CVS_TAG="\$$Name$$"
 
+BASE_3_14=YES

configure/CONFIG_COMMON

@@ -240,8 +240,8 @@ STATIC_LDFLAGS = $(STATIC_LDFLAGS_$(STATIC_BUILD))
 STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD))
 
 #--------------------------------------------------
-# cflags for library src file 
-LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY),$($(lib)_OBJS) $(LIBRARY_OBJS)))
+# cflags for shared library src files (from SHRLIB_CFLAGS)
+LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(LOADABLE_LIBRARY),$($(lib)_OBJS) $(LIBRARY_OBJS)))
 LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)
 
 #--------------------------------------------------
@@ -254,24 +254,24 @@ OP_SYS_LDFLAGS += $(LDFLAGS_$(COMMANDLINE_LIBRARY))
 # Flags
 
 INCLUDES = -I. $(GENERIC_SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
- $(TARGET_INCLUDES) $(USR_INCLUDES) $(OP_SYS_INCLUDES) $(CROSS_INCLUDES)
+ $(TARGET_INCLUDES) $(USR_INCLUDES) $(OP_SYS_INCLUDES) $($(BUILD_CLASS)_INCLUDES)
 
-CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
+CFLAGS = $(CONFORM_CFLAGS) $($(BUILD_CLASS)_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
  $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
  $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-CXXFLAGS = $(CONFORM_CXXFLAGS) $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
+CXXFLAGS = $(CONFORM_CXXFLAGS) $($(BUILD_CLASS)_CXXFLAGS) $(OPT_CXXFLAGS)\
  $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
  $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
 
 LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
- $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)\
+ $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $($(BUILD_CLASS)_LDFLAGS)\
  $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
 LDLIBS = $(STATIC_LDLIBS)\
  $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)
 
-CPPFLAGS += $(CONFORM_CPPFLAGS) $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS)\
+CPPFLAGS += $(CONFORM_CPPFLAGS) $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS)\
  $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
  $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
@@ -291,10 +291,15 @@ PATH_FILTER = $(1)
 COMPILE.c = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_FLAG)
 COMPILE.cpp = $(CCC) -c $(CPPFLAGS) $(CXXFLAGS) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_CXXFLAG)
 
+#--------------------------------------------------
+# C preprocessor command
+PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@
+
 #--------------------------------------------------
 # Depends command
 
 HDEPENDS_FLAGS =
+# Use only dependancies from current top tree
 HDEPENDS_INCLUDES = $(filter .%,$(subst -I,,$(INCLUDES)))
 HDEPENDSFLAGS = -m $*$(DEP) $(HDEPENDS_INCLUDES) $@ $<
 HDEPENDS_CMD_YES   = -$(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDSFLAGS)
@@ -319,6 +324,7 @@ INSTALL_PROD= $(PRODNAME:%= $(INSTALL_BIN)/%)
 INSTALL_LIBS= $(LIBNAME:%=$(INSTALL_LIB)/%)
 INSTALL_MUNCHS= $(MUNCHNAME:%=$(INSTALL_BIN)/%)
 INSTALL_SHRLIBS= $(SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
+INSTALL_LOADABLE_SHRLIBS= $(LOADABLE_SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
 INSTALL_DLL_LINK_LIBS=$(DLL_LINK_LIBNAME:%=$(INSTALL_LIB)/%)
 INSTALL_TCLLIBS=$(TCLLIBNAME:%=$(INSTALL_TCLLIB)/%)
 INSTALL_TCLINDEX=$(TCLINDEX:%=$(INSTALL_TCLLIB)/%)
@@ -352,6 +358,7 @@ INSTALL_INC += $(foreach inc, $(INC), \
         $(OS_INSTALL_INC) \
         $(GENERIC_INSTALL_INC) \
         $(GENERATED_INSTALL_INC) ) )
+INSTALL_INC += $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, $(INC_$(OS_CLASS)) )
 
 #
 # Rule 1

configure/CONFIG_SITE

@@ -98,12 +98,15 @@ CXXCMPLR=STRICT
 #     NOTE: os/CONFIG.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files and
 #     os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files may override
 #
-#     NOTE WIN32: YES results in a DLL.
+#     NOTE WIN32: YES results in a DLL.  Valid settings are
+#                   SHARED_LIBRARIES=YES and STATIC_BUILD=NO
+#                   SHARED_LIBRARIES=NO  and STATIC_BUILD=YES
 #
 SHARED_LIBRARIES=YES
 
 #  Build client objects statically ?
 #        must be either YES or NO
+#
 STATIC_BUILD=NO
 
 #  Should header dependancy files be automatically generated
@@ -127,6 +130,22 @@ HOST_WARN=YES
 #	must be either YES or NO
 CROSS_WARN=YES
 
+#  Create and/or install perl build tools for R3.13 extension builds?
+#  must be either YES or NO
+#
+#  NOTE: Set to YES only if you have existing R3.13 extensions to be
+#  built with this base
+#
+COMPAT_TOOLS_313=NO
+
+#  Create and/or install files for R3.13 ioc application and extension builds?
+#  must be either YES or NO
+#
+#  NOTE: Set to YES only if you have existing R3.13 ioc applications
+#  and extensions to be built with this base
+#
+COMPAT_313=NO
+
 #  Installation directory
 #Note: INSTALL_LOCATION definition moved to configure/RELEASE file
 

configure/CONFIG_SITE_ENV

@@ -32,11 +32,15 @@
 # EPICS_TIMEZONE=<name>::<minutesWest>:<start daylight>:<end daylight>
 #NOTE: start and end are mmddhh that bis mounth,day,hour
 # eg EPICS_TIMEZONE=CUS::360:033102:102802
-#  DST for 2003  US: Apr  6 - Oct 26
-#                EU: Mar 30 - Oct 26
+#
+#  DST for 2004  US: Apr  4 - Oct 31
+#                EU: Mar 28 - Oct 31
+#  (see: http://www.worldtimezone.org/daylight.html)
+#
 # EPICS_TS_NTP_INET ntp or Unix time server ip addr.
 
-EPICS_TIMEZONE=CUS::360:040602:102602
+EPICS_TIMEZONE=CUS::360:040402:103102
+#EPICS_TIMEZONE=MET::-60:032802:103102
 EPICS_TS_NTP_INET=
 
 

configure/RELEASE

@@ -7,12 +7,16 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#RELEASE Location of external products
+# RELEASE: Define location of external products
 #
-# NOTE: RELEASE.$(EPICS_HOST_ARCH) files will override
+# NB: Settings in RELEASE files can be overridden in files named
+#   RELEASE.$(EPICS_HOST_ARCH)
+#   RELEASE.Common.$(T_A)
+#   RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 
 #  Tornado directory
-VX_DIR = /usr/local/vw/tornado202
+VX_DIR = /usr/local/vw/tornado202p1
+#VX_DIR = /usr/local/vw/tornado22-$(ARCH_CLASS)
 
 # If you don't want to install into $(TOP) dir then 
 # define INSTALL_LOCATION here

configure/RULES.Db

@@ -211,8 +211,7 @@ $(COMMON_DIR)/%.dbd: %Include.dbd
 	@$(DBDDEPENDS_CMD)
 	@echo "Expanding dbd"
 	@$(RM) $@
-	$(DBEXPAND) $(DBDFLAGS) $< > dbExpand.tmp
-	$(MV) dbExpand.tmp $@
+	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
 
 $(INSTALL_DBD)/%: %
 	@echo "Installing dbd file $@"
@@ -276,8 +275,9 @@ dbInstalls:  $(DB_INSTALLS)
 ##################################################### register record,device,driver support
 
 %_registerRecordDeviceDriver.cpp: %.dbd 
-	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $< > $@
+	@$(RM) $@ temp.cpp
+	$(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) > temp.cpp
+	$(MV) temp.cpp $@
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
 

configure/RULES.ioc

@@ -15,7 +15,7 @@ install: buildInstall
 
 buildInstall: $(TARGETS)
 
-cdCommands: $(wildcard $(TOP)/configure/RELEASE*) \
+envPaths cdCommands: $(wildcard $(TOP)/configure/RELEASE*) \
 	$(TOP)/configure/CONFIG $(TOP)/bin
 	@$(RM) $@
 ifeq ($(IOCS_APPL_TOP),)
@@ -24,6 +24,6 @@ else
 	$(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) -t $(IOCS_APPL_TOP) $@
 endif
 
-clean:
-	@$(RM) cdCommands
+realclean clean:
+	$(RM) cdCommands envPaths
 

configure/RULES_ARCHS

@@ -47,9 +47,21 @@ $(buildDirs):
 O.Common:
 	$(MKDIR) O.Common
 
-checkRelease: $(wildcard $(TOP)/configure/RELEASE*)
+#
+# RELEASE consistency checking
+
+# The RELEASE.$(EPICS_HOST_ARCH) files don't need to be included here:
+targetReleaseFiles = $(wildcard $(foreach arch, $(BUILD_ARCHS), \
+		$(TOP)/configure/RELEASE.Common.$(arch) \
+		$(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(arch)))
+checkReleaseTargets = $(addprefix checkRelease, $(suffix $(targetReleaseFiles)))
+
+checkRelease: $(checkReleaseTargets)
 	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) $@
 
+$(checkReleaseTargets):checkRelease.%:
+	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) -a $* checkRelease
+
 #
 # special clean rule
 #
@@ -66,5 +78,5 @@ realclean ::
 .PHONY : $(cleanArchTargets)
 .PHONY : $(BUILD_ARCHS)
 .PHONY : $(ACTIONS) clean realclean all
-.PHONY : checkRelease
+.PHONY : checkRelease $(checkReleaseTargets)
 

configure/RULES_BUILD

@@ -36,6 +36,7 @@ include $(CONFIG)/CONFIG_ADDONS
 
 ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
 LIBRARY += $(LIBRARY_HOST)
+LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_HOST)
 OBJS += $(OBJS_HOST)
 PROD += $(PROD_HOST)
 SCRIPTS += $(SCRIPTS_HOST)
@@ -74,15 +75,15 @@ endif
 #---------------------------------------------------------------
 # Create included Makefile for prod,testprod, and library targets
 
-ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY)))
+ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY)))
 
 MakefileInclude: ../Makefile
 	@$(RM) $@
-	@$(PERL) $(TOOLS)/makeMakefileInclude.pl $(PROD) $(TESTPROD) $(LIBRARY) $@
+	@$(PERL) $(TOOLS)/makeMakefileInclude.pl $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) $@
 
 -include MakefileInclude
 
-endif # PROD, TESTPROD, or LIBRARY defined
+endif # PROD, TESTPROD, LIBRARY, or LOADABLE_LIBRARY defined
 
 #---------------------------------------------------------------
 #   Products and Object libraries
@@ -93,10 +94,10 @@ PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
 #   Libraries 
 #
 
-LIBTARGETS += $(LIBNAME)
-LIBTARGETS += $(INSTALL_LIBS)
-LIBTARGETS += $(SHRLIBNAME) $(INSTALL_SHRLIBS) \
-              $(DLL_LINK_LIBNAME) $(INSTALL_DLL_LINK_LIBS)
+LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) \
+              $(SHRLIBNAME) $(INSTALL_SHRLIBS) \
+              $(DLL_LINK_LIBNAME) $(INSTALL_DLL_LINK_LIBS) \
+              $(LOADABLE_SHRLIBNAME) $(INSTALL_LOADABLE_SHRLIBS)
 
 #---------------------------------------------------------------
 ifneq ($(CONFIG),$(TOP)/configure)
@@ -137,7 +138,7 @@ clean::
 	@echo "Cleaning"
 	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME)\
 	$(INC) *$(RES) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
-	*.out MakefileInclude \
+	*.out MakefileInclude  $(LOADABLE_SHRLIBNAME) \
 	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS)
 ifdef BAF
 	@$(RM) $(PROD_BAF) $(LIB_BAF) *$(BOF)
@@ -268,6 +269,10 @@ $(SHRLIBNAME):$(LIB_PREFIX)%$(SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(
 	@$(RM) $@
 	$(LINK.shrlib)
 
+$(LOADABLE_SHRLIBNAME):$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+	@$(RM) $@
+	$(LINK.loadable_shrlib)
+
 # C++ munching for VxWorks
 %.nm : %$(EXE)
 	@$(RM) $@
@@ -322,24 +327,27 @@ $(INSTALL_LIB)/%.lib: %.lib
 	@$(INSTALL_LIBRARY) -d -m 644 $< $(INSTALL_LIB)
 
 $(INSTALL_SHRLIB)/lib%: lib%
-	@echo "Installing library $@"
+	@echo "Installing shared library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
 ifdef SHRLIB_VERSION
 	@$(RM) $(subst .$(SHRLIB_VERSION),,$@)
 	ln -s $< $(subst .$(SHRLIB_VERSION),,$@)
-
 endif # SHRLIB_VERSION
 
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
 $(INSTALL_TCLLIB)/%: %
 	@echo "Installing Tcl library $@"
 	@$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB)
- 
+
 $(INSTALL_TCLLIB)/%: ../%
 	@echo "Installing Tcl library $@"
 	@$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB)
 endif
 
+$(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
+	@echo "Installing loadable shared library $@"
+	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
+
 $(INSTALL_CONFIG)/%: %
 	@echo "Installing config file $@"
 	@$(INSTALL) -d -m 644 $< $(@D)
@@ -391,5 +399,3 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD
-
-

configure/RULES_JAVA

@@ -16,11 +16,12 @@
 
 JAVA_INC = $(JAVA_DIR)/include
 JAVA_BIN = $(JAVA_DIR)/bin
-JAVA_INCLUDES += -I${JAVA_INC} -I${JAVA_INC}/${OS_CLASS}
+JAVA_INCLUDES += -I$(JAVA_INC) -I$(JAVA_INC)/$(OS_CLASS) -I$(COMMON_DIR)
+JAVA_INCLUDES += -I$(JAVA_INC) -I$(JAVA_INC)/$(word 1, $(subst -, ,$(T_A))) -I$(COMMON_DIR)
 
 JAVACCMD = $(subst \,/,$(JAVA_BIN)/javac$(EXE) $(CLASSPATH) $(SOURCEPATH) $(JAVACFLAGS))
 JAVAHCMD = $(subst \,/,$(JAVA_BIN)/javah$(EXE) -d $(COMMON_DIR) -force $(CLASSPATH) $(JAVAHFLAGS))
-JARCMD   = $(subst \,/,$(JAVA_BIN)/jar$(EXE) $(JAR_OPTIONS) $(COMMON_JAR) $(JARINPUT))
+JARCMD   = $(subst \,/,$(JAVA_BIN)/jar$(EXE) $(JAR_OPTIONS) $(COMMON_JAR) $(JARINPUT) $(JARPACKAGES))
 
 #-------------------------------------------------------
 vpath %.java .. 
@@ -28,13 +29,20 @@ vpath %.java ..
 CLASSPATH=-classpath $(INSTALL_JAVA)$(addprefix :,$(USR_CLASSPATH))
 SOURCEPATH=-sourcepath .:..:../..
 
+#-------------------------------------------------------
+# Java directory
+
+ifdef JAVA
+JAVA_DIRECTORY_TARGETS += $(INSTALL_JAVA)
+endif
+
 #-------------------------------------------------------
 # Java native method C header files
 
 JAVAHFLAGS += $(USR_JAVAHFLAGS)
-COMMON_JAVAINC += $(addprefix $(COMMON_DIR)/,$(JAVAINC))
 JAVAINC_CLASSFILES += $(addprefix $(INSTALL_JAVA)/,$(subst _,/,$(subst .h,.class,$(JAVAINC))))
 JAVAINC_CLASSNAMES += $(subst _,.,$(subst .h,,$(JAVAINC)))
+COMMON_JAVAINC += $(addprefix $(COMMON_DIR)/,$(JAVAINC))
 
 #-------------------------------------------------------
 # Java class files
@@ -53,9 +61,11 @@ DEPTESTJAVA += $(subst .class,.java,$(TESTCLASSES))
 
 COMMON_JAR += $(addprefix $(COMMON_DIR)/,$(JAR))
 INSTALL_JAR =$(addprefix $(INSTALL_JAVA)/,$(JAR))
-JARMANIFEST += $(firstword $(trim $(MANIFEST) $(JAR_MANIFEST)))
+JARMANIFEST += $(firstword $(MANIFEST) $(JAR_MANIFEST))
 JARINPUT += $(subst .java,.class,$(JAR_INPUT))
-JARDEPFILES +=  $(JARINPUT) $(JARMANIFEST)
+JARDEPFILES += $(addprefix $(INSTALL_JAVA)/,$(subst .java,.class,$(JAVA))) $(JARINPUT)
+JARPACKAGES += $(foreach pkg,$(JAR_PACKAGES),-C $(INSTALL_JAVA) $(subst .,/,$(pkg)))
+
 ifneq ($(JARMANIFEST),)
 JAR_OPTIONS = cvmf $(JARMANIFEST)
 else
@@ -64,10 +74,10 @@ endif
 
 #-------------------------------------------------------
 # Java doc  definitions
-ifeq ($(JAVADOC),YES)
+ifdef JAVADOC
 JAVADOCFLAGS += $(USR_JAVADOCFLAGS)
 JAVADOCCMD = $(subst \,/,$(JAVA_BIN)/javadoc$(EXE) $(CLASSPATH) $(SOURCEPATH) $(JAVADOCFLAGS))
-INSTALL_JAVADOC = $(CLASSES:%.class=$(INSTALL_HTML)/%.html)
+INSTALL_JAVADOC = $(addprefix $(INSTALL_HTML)/,$(JAVADOC))/index.html
 endif
 
 #-------------------------------------------------------
@@ -81,7 +91,7 @@ buildInstall : build
 
 rebuild: clean install
 
-inc:  $(INSTALL_CLASSES) $(COMMON_JAVAINC)
+inc:  $(JAVA_DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(COMMON_JAVAINC)
 
 build: inc
 
@@ -95,8 +105,10 @@ clean::
 	@$(RM) $(INSTALL_JAR) $(INSTALL_JAVADOC)
 	@$(RM) $(COMMON_TESTCLASSES) $(COMMON_JAR) $(COMMON_JAVAINC)
 
-$(INSTALL_JAVA):
+ifdef JAVA_DIRECTORY_TARGETS
+$(JAVA_DIRECTORY_TARGETS):
 	$(MKDIR) -p $@
+endif
 
 $(COMMON_JAVAINC):$(JAVAINC_CLASSFILES)
 	@echo Creating header files $(COMMON_JAVAINC)
@@ -108,23 +120,26 @@ $(COMMON_TESTCLASSES): $(addprefix ../,$(DEPTESTJAVA))
 	@$(RM) $@
 	$(JAVACCMD) -d $(COMMON_DIR) $^
 
-$(INSTALL_CLASSES): $(INSTALL_JAVA) $(addprefix ../,$(DEPJAVA))
+$(INSTALL_CLASSES): $(addprefix ../,$(DEPJAVA))
 	@echo Creating java class files 
 	@$(RM) $@
 	$(JAVACCMD) -d $(INSTALL_JAVA) $^
 
-$(INSTALL_JAVADOC): $(INSTALL_JAVA) $(addprefix ../,$(DEPJAVA))
-	@echo Creating java class files 
+$(INSTALL_JAVADOC): $(addprefix ../,$(JAVA))
+	@echo Creating java doc files 
 	@$(RM) $@
-	$(JAVADOCCMD) -d $(INSTALL_JAVA) $^
+	$(JAVADOCCMD) -d $(addprefix $(INSTALL_HTML)/,$(JAVADOC)) $^
 
 $(COMMON_DIR)/%.jar: $(JARDEPFILES)
 	@echo Creating java jar file $@
 	@$(RM) $@
 	$(JARCMD)
 
-$(INSTALL_JAVA)/%.jar: $(INSTALL_JAVA) $(COMMON_DIR)/%.jar
+$(INSTALL_JAVA)/%.jar: $(COMMON_DIR)/%.jar
 	@echo "Installing java jar file $@"
 	@$(INSTALL) -d -m 644 $< $(@D)
 
 .PHONY: all install buildInstall rebuild clean build inc
+
+.PRECIOUS: $(COMMON_JAVAINC)
+

configure/os/CONFIG.Common.RTEMS

@@ -68,6 +68,7 @@ $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
 # Although RTEMS uses gcc, it wants to use gcc its own way
 CROSS_CPPFLAGS =
 CROSS_LDFLAGS =
+SHRLIB_CFLAGS =
 
 #--------------------------------------------------
 # operating system class (include/os/<os_class>)

configure/os/CONFIG.Common.UnixCommon

@@ -24,6 +24,8 @@ OBJ = .o
 LIB_PREFIX = lib
 LIB_SUFFIX = .a
 SHRLIB_SUFFIX = .so$(addprefix .,$(SHRLIB_VERSION))
+LOADABLE_SHRLIB_SUFFIX = .so
+LOADABLE_SHRLIB_PREFIX = lib
 
 #-------------------------------------------------------
 #	names of libraries to build 
@@ -31,19 +33,18 @@ SHRLIB_SUFFIX = .so$(addprefix .,$(SHRLIB_VERSION))
 LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX))
 # <lib> ->  lib<lib>.so.<version>
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(SHRLIB_SUFFIX))
+LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX))
 
 #-------------------------------------------------------
 # shrlib: DEPLIBS, LDFLAGS, and LDLIBS definitions
 
-LIB_EXT = $(LIB_SUFFIX)
-
 # SHRLIB_LIBS deprecated
 LIB_LIBS += $(SHRLIB_LIBS)
 
 SHRLIB_DEPLIBS=$(foreach lib, $(LIB_LIBS) $(USR_LIBS), \
 	$(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).*, \
     $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
-	$(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+	$(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
     $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
 
 SHRLIB_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS) \
@@ -58,7 +59,7 @@ SHRLIBDIR_LDFLAGS += $(sort $(SHRLIB_DEPLIB_DIRS:%=-L%))
 PROD_DEPLIBS=$(foreach lib,$(PROD_LIBS) $(USR_LIBS), \
 	$(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).*, \
     $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
-	$(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+	$(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
     $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
 
 PROD_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(PROD_LIBS) $(USR_LIBS)\
@@ -78,6 +79,8 @@ LINK.cpp = $(CCC) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
 LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
 LINK.shrlib = $(CCC) -o $@ $(SHRLIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
 LINK.shrlib += $(LIB_LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
+LINK.loadable_shrlib = $(CCC) -o $@ $(LOADABLE_SHRLIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
+LINK.loadable_shrlib += $(LIB_LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
 
 #--------------------------------------------------
 # Operating system definitions

configure/os/CONFIG.Common.aix-ppc

@@ -0,0 +1,25 @@
+# CONFIG.Common.aix-ppc
+#
+# This file is maintained by the build community.
+#
+# Definitions for aix-ppc target builds
+# Sites may override these definitions in CONFIG_SITE.Common.aix-ppc
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+#
+# Set OS-specific information
+#
+OS_CLASS = AIX
+ARCH_CLASS = ppc
+
+CODE_CPPFLAGS = -D_REENTRANT
+
+POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500 -D_ALL_SOURCE
+POSIX_CPPFLAGS_NO =
+POSIX_LDLIBS_YES = -lpthread
+
+#SHARED_LIBRARIES=NO
+

configure/os/CONFIG.Common.aix-ppc-gnu

@@ -0,0 +1,11 @@
+# CONFIG.Common.aix-ppc-gnu
+#
+# This file is maintained by the build community.
+#
+# Definitions for aix-ppc target builds
+# Sites may override these definitions in CONFIG_SITE.Common.aix-ppc
+#-------------------------------------------------------
+
+# Include definitions common to all aix-ppc  target archs
+include $(CONFIG)/os/CONFIG.Common.aix-ppc
+

configure/os/CONFIG.Common.darwin-ppc

@@ -55,3 +55,4 @@ LDLIBS_READLINE = -lreadline
 # line in CONFIG_SITE.darwin-ppc.Common to use GNU readline
 # command-line editing:
 #COMMANDLINE_LIBRARY=READLINE
+

configure/os/CONFIG.Common.hpux-parisc

@@ -21,14 +21,14 @@ OP_SYS_CFLAGS = -D_HPUX_SOURCE
 OP_SYS_CXXFLAGS =
 
 SHRLIB_SUFFIX = .sl$(addprefix .,$(SHRLIB_VERSION))
+LOADABLE_SHRLIB_SUFFIX = .sl
 
 # Set runtime path for shared libraries
 empty:=                                      # trick from the make docs...
 space:= $(empty) $(empty)
-RUNTIME_LDFLAGS_YES = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_DIRS))),+s
-RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
+RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_DIRS))),+s
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=parisc-hp-unix
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))

configure/os/CONFIG.Common.linux-386

@@ -0,0 +1,18 @@
+# CONFIG.Common.linux-386
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-386 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-386
+#-------------------------------------------------------
+
+# Include definitions common to all linux x86 targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+ARCH_DEP_CFLAGS = -march=i386
+
+ifeq ($(BUILD_CLASS),CROSS)
+   GNU_TARGET=i386-pc-linux-gnu
+endif
+

configure/os/CONFIG.Common.linux-486

@@ -0,0 +1,18 @@
+# CONFIG.Common.linux-486
+#
+# $Id
+# This file is maintained by the build community.
+#
+# Definitions for linux-486 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-486
+#-------------------------------------------------------
+
+# Include definitions common to all linux x86 targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+ARCH_DEP_CFLAGS = -march=i486
+
+ifeq ($(BUILD_CLASS),CROSS)
+   GNU_TARGET=i486-pc-linux-gnu
+endif
+

configure/os/CONFIG.Common.linux-586

@@ -0,0 +1,19 @@
+# CONFIG.Common.linux-586
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-586 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-586
+#-------------------------------------------------------
+
+# Include definitions common to all linux x86 targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+# i586 is euivalent to pentiumpro
+ARCH_DEP_CFLAGS = -march=i586
+
+ifeq ($(BUILD_CLASS),CROSS)
+   GNU_TARGET=i586-pc-linux-gnu
+endif
+

configure/os/CONFIG.Common.linux-686

@@ -0,0 +1,19 @@
+# CONFIG.Common.linux-686
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-686 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-686
+#-------------------------------------------------------
+
+# Include definitions common to all linux x86 targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+# i686 is euivalent to pentiumpro
+ARCH_DEP_CFLAGS = -march=i686
+
+ifeq ($(BUILD_CLASS),CROSS)
+   GNU_TARGET=i686-pc-linux-gnu
+endif
+

configure/os/CONFIG.Common.linux-athlon

@@ -0,0 +1,19 @@
+# CONFIG.Common.linux-athlon
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-athlon target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-athlon
+#-------------------------------------------------------
+
+# Include definitions common to all linux x86 targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+ARCH_DEP_CFLAGS += -march=athlon-mp -mfpmath=sse
+
+
+ifeq ($(BUILD_CLASS),CROSS)
+   GNU_TARGET=athlon-pc-linux-gnu
+endif
+

configure/os/CONFIG.Common.linux-mpc82xx

@@ -1,39 +0,0 @@
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for linux-mpc82xx target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-mpc82xx
-#-------------------------------------------------------
-
-# Include definitions common to all Unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-OS_CLASS = Linux
-ARCH_CLASS = mpc82xx
-
-CODE_CPPFLAGS = -D_REENTRANT
-
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES = -lpthread
-POSIX_LDLIBS_NO =
-
-# -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp.
-OP_SYS_CPPFLAGS += -D_BSD_SOURCE
-OP_SYS_CPPFLAGS += -Dlinux
-OP_SYS_LDFLAGS +=
-OP_SYS_LDLIBS = -lrt
-
-#ARCH_DEP_CPPFLAGS += -D_X86_
-
-# Set runtime path for shared libraries
-RUNTIME_LDFLAGS_YES = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
-RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
-
-ifdef CROSS
-   GNU_TARGET=ppc_82xx
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-
-

configure/os/CONFIG.Common.linux-x86

@@ -25,15 +25,28 @@ OP_SYS_CPPFLAGS += -Dlinux
 OP_SYS_LDLIBS += -lrt
 
 ARCH_DEP_CPPFLAGS += -D_X86_
-ARCH_DEP_CFLAGS += -mcpu=pentium
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS_YES = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
-RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
+ifeq ($(EPICS_HOST_ARCH),linux-x86)
+   # Added for 386,486,... cross builds
+   CMPLR_PREFIX=
+   CROSS_INCLUDES=
+   CROSS_LDFLAGS=
+   # Use -w not -Wall
+   #WARN_CFLAGS_YES = -w
+   #WARN_CXXFLAGS_YES = -w
+-include $(CONFIG)/os/CONFIG_SITE.Common.linux-x86
+-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+-include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-x86
+else
    GNU_TARGET=i586-pc-linux-gnu
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
 endif
+endif
+
+LDLIBS_READLINE = -lreadline -lcurses
 

configure/os/CONFIG.Common.linux-x86-borland

@@ -0,0 +1,32 @@
+# CONFIG.Common.linux-x86-borland
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-x86-borland
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = Linux
+ARCH_CLASS = x86
+
+POSIX_CPPFLAGS_NO =
+POSIX_LDLIBS_YES = libpthread.so
+
+OP_SYS_CPPFLAGS += -D_BSD_SOURCE -D_SVID_SOURCE
+OP_SYS_CPPFLAGS += -Dlinux
+OP_SYS_LDLIBS = libc.so libm.so libdl.so librt.so
+
+ARCH_DEP_CPPFLAGS += -D_X86_
+
+RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
+
+ifeq ($(BUILD_CLASS),CROSS)
+   GNU_TARGET=i586-pc-linux-gnu
+   CMPLR_SUFFIX=
+   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
+endif
+

configure/os/CONFIG.Common.lynxos-x86

@@ -1,31 +0,0 @@
-#  CONFIG.Common.lynxos-x86
-#
-# $Id$
-#
-#  This file is maintained by the build community.
-#  Sites may override these definitions in CONFIG_SITE.Common.lynxos-x86
-#-------------------------------------------------------
-
-#Include definitions common to unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-OS_CLASS = lynxos
-ARCH_CLASS = x86
-
-CODE_CPPFLAGS =
-
-POSIX_CPPFLAGS_YES =
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES += -lposix4d9 -lpthread
-POSIX_LDLIBS_NO +=
-
-ARCH_DEP_CPPFLAGS += -D_X86_
-ARCH_DEP_LDFLAGS =
-ARCH_DEP_LDLIBS =
-
-ifdef CROSS
-   GNU_TARGET=x86-lynxos
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-

configure/os/CONFIG.Common.osf-alpha

@@ -1,30 +0,0 @@
-# CONFIG.Common.osf-alpha
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for osf-alpha target archs
-# Sites may override these definitions in CONFIG_SITE.Common.osf-alpha
-#-------------------------------------------------------
-
-# Include definitions common to all Unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-OS_CLASS = osf
-ARCH_CLASS = alpha
-
-CODE_CPPFLAGS =
-
-POSIX_CPPFLAGS_YES =
-POSIX_LDLIBS_YES +=
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_NO +=
-
-OP_SYS_CPPFLAGS = -D_OSF_SOURCE
-
-ifdef CROSS
-   GNU_TARGET=alpha-osf
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-

configure/os/CONFIG.Common.solaris-sparc

@@ -28,10 +28,9 @@ POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION))
 OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION)
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS_YES = $(SHRLIB_SEARCH_DIRS:%=-R%)
-RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=sparc-sun-solaris2
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
@@ -39,6 +38,7 @@ endif
 
 OP_SYS_LDLIBS += -lsocket -lnsl
 OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
+OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE

configure/os/CONFIG.Common.solaris-sparc-gnu

@@ -12,4 +12,6 @@ include $(CONFIG)/os/CONFIG.Common.solaris-sparc
 # CONFIG.Common.solaris-sparc
 
 OP_SYS_LDLIBS_8 = -lc
+OP_SYS_LDLIBS_9 = -lc
 
+OP_SYS_LDFLAGS += -R$(GNU_LIB) -L$(GNU_LIB)

configure/os/CONFIG.Common.solaris-x86

@@ -29,10 +29,9 @@ OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION)
 ARCH_DEP_CPPFLAGS = -D_X86_
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS_YES = $(SHRLIB_SEARCH_DIRS:%=-R%)
-RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=x86-sun-solaris2
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
@@ -40,4 +39,5 @@ endif
 
 OP_SYS_LDLIBS += -lsocket -lnsl
 OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
+OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))

configure/os/CONFIG.Common.sun4-x86

@@ -1,37 +0,0 @@
-# CONFIG.Common.sun4-x86
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for sun4-x86 target archs
-# Sites may override these definitions in CONFIG_SITE.Common.sun4-x86
-#-------------------------------------------------------
-
-# Include definitions common to all Unix target archs
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-OS_CLASS = sun4
-ARCH_CLASS = x86
-
-CODE_CPPFLAGS = -D__EXTENSIONS__
-
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES += -lpthread -lthread
-
-OP_SYS_CPPFLAGS = -DSUNOS4
-
-ARCH_DEP_CPPFLAGS += -D_X86_
-
-# Set runtime path for shared libraries
-RUNTIME_LDFLAGS_YES = $(SHRLIB_SEARCH_DIRS:%=-R%)
-RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
-
-ifdef CROSS
-   GNU_TARGET=x86-sun-sunos4
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-
-OP_SYS_LDLIBS += -lsocket -lnsl
-

configure/os/CONFIG.Common.vxWorksCommon

@@ -21,7 +21,6 @@ EXE =
 OBJ = .o
 LIB_PREFIX =lib
 LIB_SUFFIX = .a
-LIB_EXT = .a
 MUNCH_SUFFIX = .munch
 
 #-------------------------------------------------------
@@ -34,7 +33,7 @@ LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX))
 PROD_DEPLIBS=$(foreach lib,$(PROD_LIBS) $(USR_LIBS), \
     $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).*, \
     $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
-    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
     $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
 
 
@@ -135,6 +134,11 @@ LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
 CFLAGS_ctdt = $(filter-out -pedantic,$(CFLAGS)) -fdollars-in-identifiers
 COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_FLAG)
 
+#--------------------------------------------------
+# C preprocessor command
+VXCPPFLAGS = $(filterout $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
+PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@
+
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.vxWorksCommon

configure/os/CONFIG.aix-ppc-gnu.Common

@@ -0,0 +1,12 @@
+# CONFIG.aix-ppc-gnu.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for aix-ppc gnu compiler host builds
+# Sites may override these definitions in CONFIG_SITE.aix-ppc-gnu.Common
+#-------------------------------------------------------
+
+#Include definitions common to aix-ppc hosts
+include $(CONFIG)/os/CONFIG.aix-ppc.Common
+

configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu

@@ -0,0 +1,22 @@
+#  CONFIG.aix-ppc.aix-ppc
+#
+#
+# Definitions for aix-ppc host - aix-ppc target builds
+# Sites may override these definitions in CONFIG_SITE.aix-ppc.aix-ppc
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
+GNU_DIR = /usr/common/usg/gcc/3.2.1
+
+CC = $(GNU_BIN)/gcc
+CCC = $(GNU_BIN)/g++
+
+AR = ar
+ARFLAGS = rcv
+RANLIB = ranlib -t
+
+SHRLIB_LDFLAGS = -shared 
+LOADABLE_SHRLIB_LDFLAGS = -shared
+

configure/os/CONFIG.aix-ppc.Common

@@ -1,10 +1,10 @@
-# $Id$
+# CONFIG.aix-ppc.Common
+#
 # This file is maintained by the build community.
 #
-# Definitions for linux-mpc82xx host builds
-# Sites may override these definitions in CONFIG_SITE.linux-mpc82xx.Common
+# Definitions for aix-ppc host builds
+# Sites may override these definitions in CONFIG_SITE.aix-ppc.Common
 #-------------------------------------------------------
 
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
-

configure/os/CONFIG.darwin-ppc.darwin-ppc

@@ -21,9 +21,11 @@ SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
        -install_name $(firstword $(SHRLIB_SEARCH_DIRS))/$@ \
        -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \
        -current_version $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
-SHRLIB_SUFFIX = $(addprefix .,$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)).dylib
+SHRLIB_SUFFIX = .$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION).dylib
 SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
 
+LOADABLE_SHRLIB_LDFLAGS = -bundle -flat_namespace -undefined suppress
+
 #
 # Position-independent code is the default on Darwin.
 #

configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu

@@ -16,10 +16,11 @@ AR = ar -rc
 RANLIB=
 LD = ld -r
 
-# Always keep libc shared to force using the one supplied with the
-# target machine (HP system and libc must match - important e.g. for
-# multi-CPU-systems)
-STATIC_LDFLAGS_YES = -static -l:libc.sl
+STATIC_LDFLAGS_YES= -Wl,-a,archive
+STATIC_LDFLAGS_NO =
+
+STATIC_LDLIBS_YES = -Wl,-a,default
+STATIC_LDLIBS_NO =
 
 # Switch explicitly from default DCE threads to posix threads
 POSIX_CPPFLAGS_YES += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L
@@ -27,3 +28,4 @@ USR_SYS_LIBS += pthread
 
 # C++ templates need PIC definition also in link phase
 SHRLIB_LDFLAGS += -shared -fPIC
+LOADABLE_SHRLIB_LDFLAGS += $(SHRLIB_LDFLAGS)

configure/os/CONFIG.hpux-parisc.hpux-parisc

@@ -43,15 +43,13 @@ WARN_CXXFLAGS_NO =
 OPT_CXXFLAGS_YES = +O3
 OPT_CXXFLAGS_NO = -g
 
-# Always keep libc shared to force using the one supplied with the
-# target machine (HP system and libc must match - important e.g. for
-# multi-CPU-systems)
-STATIC_LDFLAGS_YES= -Wl,-a,archive -l:libc.sl
+STATIC_LDFLAGS_YES= -Wl,-a,archive
 STATIC_LDFLAGS_NO =
 
-STATIC_LDLIBS_YES =
+STATIC_LDLIBS_YES = -Wl,-a,default
 STATIC_LDLIBS_NO =
 
 TARGET_LDFLAGS += -AA -mt
 
 SHRLIB_LDFLAGS = -b
+LOADABLE_SHRLIB_LDFLAGS = $(SHRLIB_LDFLAGS)

configure/os/CONFIG.linux-mpc82xx.linux-mpc82xx

@@ -1,13 +0,0 @@
-# $Id$
-#
-# Definitions for linux-mpc82xx host - linux-mpc82xx target builds
-# Sites may override these definitions in CONFIG_SITE.linux-mpc82xx.linux-mpc82xx
-#-------------------------------------------------------
-
-# Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon
-
-GNU_DIR = /usr
-
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++

configure/os/CONFIG.linux-x86-borland.Common

@@ -1,14 +1,13 @@
-# CONFIG.lynxos-68k.Common
+# CONFIG.linux-x86-borland.Common
 #
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for lynxos-68k host archs
-# Sites may override these definitions in CONFIG_SITE.lynxos-68k.Common
+# Definitions for linux-x86-borland host builds
+# Sites may override these definitions in CONFIG_SITE.linux-x86-borland.Common
 #-------------------------------------------------------
 
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = lynxos
-
+WIND_HOST_TYPE = x86-linux

configure/os/CONFIG.linux-x86-borland.linux-x86-borland

@@ -0,0 +1,224 @@
+#  CONFIG.linux-x86-borland.linux-x86-borland
+#
+# $Id$
+#
+# Definitions for linux-x86-borland host - linux-x86-borland target builds
+# Sites may override these definitions in CONFIG_SITE.linux-x86-borland.linux-x86-borland
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+SHRLIB_CFLAGS =
+
+GNU_DIR = /usr
+
+KYLIX=1
+
+BORLAND_INC_STLPORT = $(BORLAND)/include/stlport
+BORLAND_INC = $(BORLAND)/include
+BORLAND_LIB = $(BORLAND)/lib
+BORLAND_BIN = $(BORLAND)/bin
+
+WINLINK = $(BORLAND_BIN)/ilink -q
+#
+# Configure Borland C compiler
+# -q suppress compiler identification banner
+# -a8 quad word alignment
+#CCLINKOPT = -q -a8 -I/usr/include
+CCLINKOPT = -q -a8
+CC = $(BORLAND_BIN)/bc++ $(CCLINKOPT)
+LD = $(BORLAND_BIN)/bc++ -r
+RANLIB = 
+
+#
+# __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.
+#
+ifdef NO_BORLAND_STDC
+CONFORM_CFLAGS_ANSI =
+CONFORM_CFLAGS_STRICT =
+else
+CONFORM_CFLAGS_ANSI = -D__STDC__=0
+CONFORM_CFLAGS_STRICT = -D__STDC__=0
+endif
+CONFORM_CFLAGS_TRAD =
+
+# -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
+WARN_CFLAGS_YES = -w -g0 -w-8012 -w-8060 -w-8071 -w-dup
+# -w- display warnings off
+WARN_CFLAGS_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
+OPT_CFLAGS_YES = -k- -H- -R- -O1 -v- -vi
+#
+OPT_CFLAGS_NO =
+
+# OS vendor c preprocessor
+CPP = $(BORLAND_BIN)/bcpp
+
+# 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.
+#
+CCC = $(BORLAND_BIN)/bc++ $(CCLINKOPT)
+ifndef NO_BORLAND_STDC
+CONFORM_CXXFLAGS_NORMAL = -D__STDC__=0
+CONFORM_CXXFLAGS_STRICT = -D__STDC__=0
+endif
+
+# -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
+# -w-8008 Condition is always true or always false (compile time 
+#           know template parameters causes this to spew garbage)
+# -w-8027 Functions containing reserved words are not expanded inline 
+#           (Some compilers are better than others with inline)
+# -w-8066 Unreachable code (compile time know template parameters
+#           causes this to spew garbage)
+# -w-8080 'identifier' declared but never used
+#           (instantiating unused static const external parameters is 
+#           anachronistic compiler practice)
+# -w-8004 'identifier' is assigned a value that is never used
+#           (compile time know template parameters
+#           causes this to spew garbage)
+# -w-8026  Functions with exception specifications are not expanded inline
+#
+WARN_CXXFLAGS_YES = -w -g0 -w-8012 -w-8060 -w-8071 -w-8008 -w-8027 -w-8066 -w-8080 -w-8004 -w-8026
+# -w- display warnings off
+WARN_CXXFLAGS_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
+OPT_CXXFLAGS_YES = -k- -H- -R- -O1 -v- -vi
+#
+OPT_CXXFLAGS_NO =
+
+# -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-
+#Linux_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
+OPT_LDFLAGS =
+
+ARCH_DEP_CFLAGS=
+
+#	to identify the general architecture class:
+#	should be BSD, SYSV, WIN32, ...
+#	is: WIN32, sun4, hpux, linux, ...
+#
+OS_CLASS=Linux
+
+
+OBJ=.o
+
+#       Problem: BorlandC does not recognize  *.cc as C++ source,
+#       we have to compile xx.cc  using the flag -P xx.cc,
+SOURCE_CXXFLAG = -P
+
+#	Operating system flags 
+OP_SYS_CFLAGS =
+
+#
+# Borland specific include files
+#
+OP_SYS_INCLUDES = -I/usr/include
+#
+
+#-------------------------------------------------------
+# Prod: DEPLIBS, LDFLAGS, and LDLIBS definitions
+
+PROD_DEPLIBS=	$(foreach lib,$(PROD_LIBS) $(USR_LIBS), \
+		$(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).so, \
+    		$($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
+		$(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).a, \
+    		$($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
+		$(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+    		$(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
+
+SHRLIB_DEPLIBS=	$(foreach lib,$(LIB_LIBS) $(USR_LIBS), \
+		$(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).so, \
+    		$($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
+		$(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).a, \
+    		$($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
+		$(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+    		$(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
+
+PROD_SYS_DEPLIBS= 	$(foreach lib,$(PROD_SYS_LIBS), \
+			$(firstword $(wildcard \
+			/lib/$(LIB_PREFIX)$(lib).so \
+			/lib/$(LIB_PREFIX)$(lib).a \
+			/usr/lib/$(LIB_PREFIX)$(lib).so \
+			/usr/lib/$(LIB_PREFIX)$(lib).a) \
+			$(lib)))
+
+PROD_LDLIBS = 	$(addprefix lib, $($*_LDLIBS)) \
+		$(notdir $(PROD_DEPLIBS)) \
+		$(notdir $(PROD_SYS_DEPLIBS)) \
+		$(addprefix lib, $($*_SYS_LIBS) $(USR_SYS_LIBS))
+
+SHRLIB_LDLIBS = $(addprefix lib, $($*_LDLIBS)) \
+		$(notdir $(SHRLIB_DEPLIBS)) \
+		$(addprefix lib, $($*_SYS_LIBS) $(LIB_SYS_LIBS) $(USR_SYS_LIBS)) $(LDLIBS)
+
+LDLIBS_STATIC_YES = LDLIBS
+LDLIBS_SHARED_NO =  LDLIBS
+LDLIBS_SHARED_YES = LDLIBS
+PROD_LDLIBS += 	$($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \
+               	$(LDLIBS_SHARED_$(SHARED_LIBRARIES))))
+
+empty:=
+space:= $(empty) $(empty)
+PROD_DEPLIB_DIRS =   $(dir $($*_DEPLIBS)) $(dir $(PROD_DEPLIBS))
+SHRLIB_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(SHRLIB_DEPLIBS))
+
+PRODDIR_LDFLAGS =   -L$(subst $(space),:,$(sort $(PROD_DEPLIB_DIRS) $(BORLAND_LIB)))
+SHRLIBDIR_LDFLAGS = -L$(subst $(space),:,$(sort $(SHRLIB_DEPLIB_DIRS) $(BORLAND_LIB)))
+
+# -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 -x -w
+LINKLIBS=rtl.a visualclx.a rtle.a libborcrtl.a libborstl.a libborunwind.a
+
+LINK.cpp = $(WINLINK) $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS) -Tpe -w-dup
+LINK.cpp += $(PROD_LDFLAGS) borinit.o /usr/lib/crt1.o $(PROD_LD_OBJS)
+LINK.cpp += , $@ ,,$(LINKLIBS) $(PROD_LDLIBS)
+
+LINK.shrlib = $(WINLINK) $(STATIC_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS) -Tpd -Gi
+LINK.shrlib+= $(LIB_LDFLAGS) borinitso.o $(LIBRARY_LD_OBJS) 
+LINK.shrlib+= , $@ ,,$(LINKLIBS) $(SHRLIB_LDLIBS)
+

configure/os/CONFIG.linux-x86-debug.Common

@@ -10,3 +10,6 @@
 #Include definitions common to linux-x86 hosts
 include $(CONFIG)/os/CONFIG.linux-x86.Common
 
+# Make all crosscompiler builds debug builds
+#CROSS_OPT=NO
+

configure/os/CONFIG.linux-x86-debug.linux-x86-debug

@@ -9,3 +9,6 @@
 
 include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 
+# Removes -O optimization and adds -g compile option
+HOST_OPT=NO
+

configure/os/CONFIG.linux-x86.Common

@@ -10,4 +10,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = i386-linux2
+WIND_HOST_TYPE = x86-linux

configure/os/CONFIG.linux-x86.linux-mpc82xx

@@ -1,17 +0,0 @@
-# $Id$
-#
-# Definitions for linux-x86 host - linux-mpc82xx target builds
-# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-mpc82xx
-#-------------------------------------------------------
-
-# Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon
-
-GNU_DIR = /opt/hardhat/devkit/ppc/82xx
-GNU_TARGET_INCLUDE_DIR = $(GNU_DIR)/target/usr/include/
-
-CC = $(GNU_BIN)/ppc_82xx-gcc
-CCC = $(GNU_BIN)/ppc_82xx-g++
-
-# Override the -nostdinc flag, needed here...
-CROSS_CPPFLAGS =

configure/os/CONFIG.linux-x86.linux-x86

@@ -14,4 +14,11 @@ GNU_DIR = /usr
 CC = $(GNU_BIN)/gcc
 CCC = $(GNU_BIN)/g++
 
+STATIC_LDFLAGS_YES= -Wl,-Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Wl,-Bdynamic
+STATIC_LDLIBS_NO=
+
 SHRLIB_LDFLAGS +=  -shared -z defs
+LOADABLE_SHRLIB_LDFLAGS = -shared
+

configure/os/CONFIG.linux-x86.linux-x86-debug

@@ -0,0 +1,13 @@
+# CONFIG.linux-x86-debug.linux-x86-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86 host - linux-x86-debug target build with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-x86-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86-debug.linux-x86-debug
+
+BUILD_CLASS = HOST
+

configure/os/CONFIG.lynxos-x86.lynxos-x86

@@ -1,13 +0,0 @@
-#  CONFIG.lynxos-x86.lynxos-x86
-#
-# $Id$
-#
-#  This file is maintained by the build community.
-#  Sites may override these definitions in CONFIG_SITE.lynxos-x86.lynxos-x86
-#-------------------------------------------------------
- 
-# Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon
-
-GNU_DIR = /usr
-

configure/os/CONFIG.osf-alpha.Common

@@ -1,14 +0,0 @@
-# CONFIG.osf-alpha.Common
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for osf-alpha host archs
-# Sites may override these definitions in CONFIG_SITE.osf-alpha.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
-
-WIND_HOST_TYPE = osf-alpha
-

configure/os/CONFIG.osf-alpha.osf-alpha

@@ -1,48 +0,0 @@
-# CONFIG.osf-alpha.osf-alpha
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for osf-alpha host archs
-# Sites may override these definitions in CONFIG_SITE.osf-alpha.osf-alpha
-#-------------------------------------------------------
-
-CC = cc
-CCC = cxx 
-CPP = $(CC) -E
-RANLIB =
-AR = ar
-LD = -r
-
-# Configure OS vendor C compiler
-CONFORM_CFLAGS_ANSI = -std
-CONFORM_CFLAGS_STRICT = -std1
-CONFORM_CFLAGS_TRAD = -std0
-CODE_CFLAGS = 
-WARN_CFLAGS_YES =
-WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -O
-OPT_CFLAGS_NO = -g
-
-# Configure OS vendor C++ compiler
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT =
-PROF_CXXFLAGS_YES = +p
-PROF_CXXFLAGS_NO =
-CODE_CXXFLAGS =
-WARN_CXXFLAGS_YES =
-WARN_CXXFLAGS_NO =
-OPT_CXXFLAGS_YES = -O
-OPT_CXXFLAGS_NO = -g
-
-STATIC_LDFLAGS_YES= -Bstatic
-STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Bdynamic
-STATIC_LDLIBS_NO=
-
-SHRLIB_LDFLAGS = -shared
-
-#############  ???????????
-#####ACC_SFLAGS_YES= -non_shared
-#####ACC_SFLAGS_NO= -call_shared
-

configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu

@@ -18,11 +18,13 @@ AR = ar -rc
 RANLIB=
 LD = ld -r
 
-STATIC_LDFLAGS_YES= -Bstatic
+STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Bdynamic
+STATIC_LDLIBS_YES= -Wl,-Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_LDFLAGS = -G -h $@ -z ignore -z combreloc -z lazyload
-SHRLIB_LDFLAGS += -z defs
+SHRLIB_LDFLAGS += -G -h $@  -z ignore -z defs
+LOADABLE_SHRLIB_LDFLAGS += -G -h $@
+
+OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
 

configure/os/CONFIG.solaris-sparc.solaris-sparc

@@ -52,9 +52,9 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_CFLAGS += -KPIC
-SHRLIB_LDFLAGS += -G -h $@ 
-SHRLIB_LDFLAGS += -z defs
+SHRLIB_CFLAGS = -KPIC
+SHRLIB_LDFLAGS += -z defs -G -h $@ -z text
+LOADABLE_SHRLIB_LDFLAGS += -G -h $@ -z text
 
 OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
 

configure/os/CONFIG.solaris-sparc.solaris-sparc-debug

@@ -0,0 +1,15 @@
+# CONFIG.solaris-sparc.solaris-sparc-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc host - solaris-sparc-debug target build with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.solaris-sparc.solaris-sparc
+
+BUILD_CLASS = HOST
+
+GNU = NO
+

configure/os/CONFIG.solaris-sparc.solaris-sparc-gnu

@@ -0,0 +1,13 @@
+# CONFIG.solaris-sparc.solaris-sparc-gnu
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc host - solaris-sparc-gnu target build with gnu compiler
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc-gnu
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu
+
+BUILD_CLASS = HOST
+

configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu

@@ -18,8 +18,8 @@ AR = ar -rc
 RANLIB=
 LD = ld -r
 
-SHRLIB_LDFLAGS = -G -h $@ 
-SHRLIB_LDFLAGS += -z defs
+SHRLIB_LDFLAGS = -z defs -G -h $@
+LOADABLE_SHRLIB_LDFLAGS += -G -h $@
 
 OP_SYS_LDFLAGS = -z ignore -z combreloc -z lazyload
 

configure/os/CONFIG.solaris-x86.solaris-x86

@@ -51,9 +51,8 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_CFLAGS += -KPIC
-SHRLIB_LDFLAGS = -G -h $@
-SHRLIB_LDFLAGS += -z defs
+SHRLIB_LDFLAGS = -z defs -KPIC -G -h $@
+LOADABLE_SHRLIB_LDFLAGS = -KPIC -G -h $@
 
-OP_SYS_LDFLAGS = -z ignore -z combreloc -z lazyload 
+OP_SYS_LDFLAGS = -z ignore -z combreloc -z lazyload
 

configure/os/CONFIG.sun4-68k.Common

@@ -1,14 +0,0 @@
-# CONFIG.sun4-68k.Common
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for sun4-68k host archs
-# Sites may override these definitions in CONFIG_SITE.sun4-68k.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
-
-WIND_HOST_TYPE = sun4-sunos4
-

configure/os/CONFIG.sun4-68k.sun4-68k

@@ -1,48 +0,0 @@
-# CONFIG.sun4-68k.sun4-68k
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for sun4-68k target arch when host arch is sun4-68k
-# Sites may override these definitions in CONFIG_SITE.sun4-68k.sun4-68k
-#-------------------------------------------------------
-
-# Include definitions common to all Unix target archs
-include $(CONFIG)/os/CONFIG.common.UnixCommon
-
-OS_CLASS = sun4
-ARCH_CLASS = 68k
-
-CC = cc
-CCC = CC
-CPP = $(CC) -E
-RANLIB = ranlib -t
-AR = $(CCC) -xar -o
-LD = ld -r
-
-# Configure OS vendor C compilers
-CONFORM_CFLAGS_ANSI = -Xa
-CONFORM_CFLAGS_STRICT = -Xc
-CONFORM_CFLAGS_TRAD = -Xs
-CODE_CFLAGS = -pic
-WARN_CFLAGS_YES = -vc
-WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -O
-OPT_CFLAGS_NO = -g
-
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT =
-CONFORM_CXXFLAGS_TRAD = 
-CODE_CXXFLAGS = -pic
-WARN_CXXFLAGS_YES =
-WARN_CXXFLAGS_NO = -w
-OPT_CXXFLAGS_YES = -O
-OPT_CXXFLAGS_NO = -g
-
-STATIC_LDFLAGS_YES= -Bstatic
-STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Bdynamic
-STATIC_LDLIBS_NO=
-
-SHRLIB_LDFLAGS = -assert pure-text -h $@
-

configure/os/CONFIG.win32-x86-borland.win32-x86-borland

@@ -13,6 +13,8 @@ VALID_BUILDS = Host Ioc
 
 #-------------------------------------------------------
 
+BUILD_LIBRARY += $(LOADABLE_BUILD_LIBRARY)
+
 BORLAND_INC = $(BORLAND)\\include
 BORLAND_LIB = $(BORLAND)\\lib
 BORLAND_BIN = $(BORLAND)\\bin
@@ -41,6 +43,7 @@ ARCMD = $(BORLAND_BIN)/tlib $@   $(foreach lib,$(LIBRARY_LD_OBJS),+$(lib))
 CCLINKOPT = -q -tWM -tWD -a8 -D_WIN32 -D_RTLDLL
 CC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT)
 LD = $(BORLAND_BIN)/bcc32 -r
+RANLIB =
 
 #
 # __STDC__=0 works but not as cleanly as with
@@ -82,7 +85,8 @@ OPT_CFLAGS_YES = -k- -H- -R- -O1 -v- -vi
 OPT_CFLAGS_NO =
 
 # OS vendor c preprocessor
-CPP = $(BORLAND_BIN)/cl  /E
+CPP = $(BORLAND_BIN)/cpp32  -Sr
+PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(subst /,\\,$(INCLUDES)) -o$@ $<
 
 # Configure OS vendor C++ compiler
 #
@@ -150,6 +154,7 @@ LINK_OPT_FLAGS_NO = -c -C -Gi -Gn -Tpd -x -w-
 WIN32_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
 OPT_LDFLAGS =
 
+SHRLIB_CFLAGS=
 ARCH_DEP_CFLAGS=
 
 #	to identify the general architecture class:
@@ -185,12 +190,12 @@ OP_SYS_INCLUDES = -I$(BORLAND_INC)
 # specify dll .def file only if it exists
 #
 #DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$(LIBRARY))))
-DLL_DEF_FLAG = $(subst /,\\,$(wildcard ../$(addsuffix .def,$(LIBRARY))))
+DLL_DEF_FLAG = $(subst /,\\,$(wildcard ../$(addsuffix .def,$*)))
 
 #
 #   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.lib: what you link to progs that use the dll (DLL_LINK_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
@@ -207,29 +212,19 @@ SHRLIB_SUFFIX=.dll
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 
 
-#
-# 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
+# When SHARED_LIBRARIES is YES we are building a DLL link library 
+# and when SHARED_LIBRARIES is NO we are building an object library
 #
 DLL_LINK_LIBNAME_YES = $(BUILD_LIBRARY:%=%.lib)
 DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES))
 LIB_PREFIX=
-LIB_SUFFIX=Obj.lib
-LIBNAME = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX))
+LIB_SUFFIX=.lib
+LIBNAME_NO = $(BUILD_LIBRARY:%=%.lib)
+LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES))
 
 #	dll install location
 INSTALL_SHRLIB = $(INSTALL_BIN)
 
-#--------------------------------------------------
-# Object lib name suffix
-LIB_EXT_YES = Obj.lib # object library extension for static build
-LIB_EXT_NO = .lib # library extension for dynamic build
-LIB_EXT = $(LIB_EXT_$(STATIC_BUILD))
-
 #--------------------------------------------------
 # Products dependancy definitions
 
@@ -237,9 +232,9 @@ LIB_EXT = $(LIB_EXT_$(STATIC_BUILD))
 # Use PROD_SYS_LIBS
 
 PROD_DEPLIBS=$(foreach lib, $(PROD_LIBS) $(USR_LIBS), \
-    $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+    $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
     $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
-    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
     $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
 
 PROD_LDLIBS += $($*_DEPLIBS) $(PROD_DEPLIBS)
@@ -265,9 +260,9 @@ LIB_SYS_LIBS += $(SYS_DLL_LIBS)
 #   (it isnt necessary to rebuild the dll if these change)
 
 SHRLIB_DEPLIBS += $(foreach lib, $(LIB_LIBS) $(USR_LIBS), \
-    $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+    $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
     $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
-    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
     $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
 
 SHRLIB_LDLIBS += $($*_DLL_DEPLIBS) $($*_DEPLIBS) $(SHRLIB_DEPLIBS)

configure/os/CONFIG.win32-x86-debug.win32-x86-debug

@@ -9,3 +9,4 @@
 
 include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
 
+HOST_OPT=NO

configure/os/CONFIG.win32-x86.win32-x86

@@ -16,6 +16,8 @@ PATH_FILTER = $(subst /,\\,$(1))
 
 #-------------------------------------------------------
 
+BUILD_LIBRARY += $(LOADABLE_BUILD_LIBRARY)
+
 #
 # "\ " forces gnu make to keep this as one token
 #
@@ -149,6 +151,8 @@ STATIC_CXXFLAGS_NO= /MD$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
 
 STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib
 STATIC_LDLIBS_NO=
+STATIC_LDFLAGS=
+RANLIB=
 
 # add /profile here to run the ms profiler
 # /LTCG - whole program optimization
@@ -159,6 +163,7 @@ LINK_OPT_FLAGS_NO = /debug /incremental:no /fixed:no
 OPT_LDFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT))
 
 ARCH_DEP_CFLAGS=
+SHRLIB_CFLAGS=
 
 #	to identify the general architecture class:
 #	should be BSD, SYSV, WIN32, ...
@@ -200,12 +205,12 @@ WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_
 #
 # specify dll .def file only if it exists
 #
-DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$(LIBRARY))))
+DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$*)))
 
 #
 #	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.lib: what you link to progs that use the dll (DLL_LINK_LIBNAME)
 #	x.exp: what you need to build the dll (in no variable)
 #
 LINK.shrlib = $(WINLINK) /nologo $(WIN32_DLLFLAGS) /implib:$*.lib /out:$*.dll $(DLL_DEF_FLAG)
@@ -222,27 +227,19 @@ SHRLIB_SUFFIX=.dll
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 
 #
-# 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
+# When SHARED_LIBRARIES is YES we are building a DLL link library 
+# and when SHARED_LIBRARIES is NO we are building an object library
 #
 DLL_LINK_LIBNAME_YES = $(BUILD_LIBRARY:%=%.lib)
 DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES))
 LIB_PREFIX=
-LIB_SUFFIX=Obj.lib
-LIBNAME = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX))
+LIB_SUFFIX=.lib
+LIBNAME_NO = $(BUILD_LIBRARY:%=%.lib)
+LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES))
 
 #	dll install location
 INSTALL_SHRLIB = $(INSTALL_BIN)
 
-#--------------------------------------------------
-# Object lib name suffix
-LIB_EXT_YES = Obj.lib # object library extension for static build
-LIB_EXT_NO = .lib # object library extension for dynamic build
-LIB_EXT = $(LIB_EXT_$(STATIC_BUILD))
 
 #--------------------------------------------------
 # Products dependancy definitions
@@ -251,9 +248,9 @@ LIB_EXT = $(LIB_EXT_$(STATIC_BUILD))
 # Use PROD_SYS_LIBS
 
 PROD_DEPLIBS=$(foreach lib, $(PROD_LIBS) $(USR_LIBS), \
-    $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+    $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
     $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
-    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
     $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
 
 PROD_LDLIBS += $($*_DEPLIBS) $(PROD_DEPLIBS)
@@ -279,9 +276,9 @@ LIB_SYS_LIBS += $(SYS_DLL_LIBS)
 #   (it isnt necessary to rebuild the dll if these change)
 
 SHRLIB_DEPLIBS += $(foreach lib, $(LIB_LIBS) $(USR_LIBS), \
-    $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+    $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
     $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
-    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \
+    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
     $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
 
 SHRLIB_LDLIBS += $($*_DLL_DEPLIBS) $($*_DEPLIBS) $(SHRLIB_DEPLIBS)

configure/os/CONFIG_SITE.Common.linux-x86

@@ -20,4 +20,3 @@
 # If readline is not installed comment the following line
 # to omit command-line editing and history support
 COMMANDLINE_LIBRARY = READLINE
-LDLIBS_READLINE = -lreadline -lncurses

configure/os/CONFIG_SITE.darwin-ppc.Common

@@ -0,0 +1,11 @@
+# CONFIG_SITE.darwin-ppc.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for darwin-ppc host builds
+#-------------------------------------------------------
+
+# JBA test override values
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040

configure/os/CONFIG_SITE.linux-x86-borland.Common

@@ -0,0 +1,12 @@
+# CONFIG_SITE.linux-x86-borland.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for linux-x86-borland host builds
+#-------------------------------------------------------
+
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+
+BORLAND = /share2/kylix3

configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug

@@ -5,5 +5,3 @@
 #Compiles for profiling with the gprof profiler.
 #GPROF=YES
 
-# Removes -O optimization and adds -g compile option
-HOST_OPT=NO

configure/os/CONFIG_SITE.win32-x86-debug.win32-x86-debug

@@ -1,3 +0,0 @@
-
-# Removes optimization and adds debugging options
-HOST_OPT=NO

configure/os/CONFIG_SITE.win32-x86.win32-x86

@@ -1,7 +1,7 @@
 #  $Id$
 
 # Microsoft Visual C++ .NET is the default compiler
-# If you have Visual C++ 6.0, uncomment the following 4 override lines
+# If you have Visual C++ 6.0, uncomment the following override lines
 # This will to eliminate warnings about unknown options /GL, LTCG, and /44355.
 #OPT_CFLAGS_YES = /Ox
 #OPT_CXXFLAGS_YES = /Ox

configure/tools/convertRelease.pl

@@ -14,9 +14,6 @@ eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
 #
 # Parse configure/RELEASE file(s) and generate a derived output file.
 #
-# This tool replaces makeConfigAppInclude.pl, makeIocCdCommands.pl and
-# makeRulesInclude.pl and adds consistency checks for RELEASE files.
-#
 
 use Cwd;
 use Getopt::Std;
@@ -25,7 +22,7 @@ $cwd = cwd();
 $cwd =~ s/\/tmp_mnt//;	# hack for sun4
 $cwd =~ s/\\/\//g;	# hack for win32
 
-getopt "aht";
+getopt "ahtT";
 
 if ($opt_a) {
     $arch = $opt_a;
@@ -37,29 +34,32 @@ if ($opt_a) {
 $hostarch = $arch;
 $hostarch = $opt_h if ($opt_h);
 
-# Find $top from current path; NB only works under iocBoot/* and configure/*
-$top = $cwd;
-$top =~ s/^\/cygdrive\/(\w)\//$1:\//;
-$top =~ s/\/iocBoot.*$//;
-$top =~ s/\/configure.*$//;
+if ($opt_T) {
+    $top = $opt_T;
+} else {		# Find $top from current path
+    # This approach is only possible under iocBoot/* and configure/*
+    $top = $cwd;
+    $top =~ s/\/iocBoot.*$//;
+    $top =~ s/\/configure.*$//;
+    chomp($top = `cygpath -m $top`) if ($^O eq "cygwin");
+}
 
 # The IOC may need a different path to get to $top
 if ($opt_t) {
-    $iocroot = $ioctop = $opt_t;
+    $iocroot = $opt_t;
     $root = $top;
     while (substr($iocroot, -1, 1) eq substr($root, -1, 1)) {
 	chop $iocroot;
 	chop $root;
     }
-} else {
-    $ioctop = $top;
 }
 
 unless (@ARGV == 1) {
-    print "Usage: convertRelease.pl [-a arch] [-h hostarch] [-t ioctop] outfile\n";
+    print "Usage: convertRelease.pl [-a arch] [-h hostarch] [-T top] [-t ioctop] outfile\n";
     print "   where outfile is be one of:\n";
     print "\tcheckRelease - checks consistency with support apps\n";
-    print "\tcdCommands - generate cd path strings for IOC use\n";
+    print "\tcdCommands - generate cd path strings for vxWorks IOCs\n";
+    print "\tenvPaths - generate epicsEnvSet commands for other IOCs\n";
     print "\tCONFIG_APP_INCLUDE - additional build variables\n";
     print "\tRULES_INCLUDE - supports installable build rules\n";
     exit 2;
@@ -73,12 +73,7 @@ $outfile = $ARGV[0];
 # Read the RELEASE file(s)
 $relfile = "$top/configure/RELEASE";
 die "Can't find configure/RELEASE file" unless (-r $relfile);
-&readRelease($relfile, \%macros, \@apps);
-
-if ($hostarch) {
-    $relfile .= ".$hostarch";
-    &readRelease($relfile, \%macros, \@apps) if (-r $relfile);
-}
+&readReleaseFiles($relfile, \%macros, \@apps);
 &expandRelease(\%macros, \@apps);
 
 
@@ -87,12 +82,35 @@ for ($outfile) {
     /CONFIG_APP_INCLUDE/ and do { &configAppInclude;	last; };
     /RULES_INCLUDE/	 and do { &rulesInclude;	last; };
     /cdCommands/	 and do { &cdCommands;		last; };
+    /envPaths/  	 and do { &envPaths;		last; };
     /checkRelease/	 and do { &checkRelease;	last; };
     die "Output file type \'$outfile\' not supported";
 }
 
 #
-# Parse a configure/RELEASE file.
+# Parse all relevent configure/RELEASE* files and includes
+#
+sub readReleaseFiles {
+    my ($relfile, $Rmacros, $Rapps) = @_;
+
+    return unless (-r $relfile);
+    &readRelease($relfile, $Rmacros, $Rapps);
+    if ($hostarch) {
+	my ($hrelfile) = "$relfile.$hostarch";
+	&readRelease($hrelfile, $Rmacros, $Rapps) if (-r $hrelfile);
+    }
+    if ($arch) {
+	my ($crelfile) = "$relfile.Common.$arch";
+	&readRelease($crelfile, $Rmacros, $Rapps) if (-r $crelfile);
+	if ($hostarch) {
+	    my ($arelfile) = "$relfile.$hostarch.$arch";
+	    &readRelease($arelfile, $Rmacros, $Rapps) if (-r $arelfile);
+	}
+    }
+}
+
+#
+# Parse a configure/RELEASE file and its includes.
 #
 # NB: This subroutine also appears in base/src/makeBaseApp/makeBaseApp.pl
 # If you make changes here, they will be needed there as well.
@@ -108,7 +126,7 @@ sub readRelease {
 	s/\r$//;		# Shouldn't need this, but sometimes...
 	s/\s*#.*$//;		# Remove trailing comments
 	s/\s+$//;		# Remove trailing whitespace
-        next if /^\s*$/;	# Skip blank lines
+	next if /^\s*$/;	# Skip blank lines
 	
 	# Expand all already-defined macros in the line:
 	while (($pre,$var,$post) = /(.*)\$\((\w+)\)(.*)/) {
@@ -155,24 +173,28 @@ sub configAppInclude {
     print OUT "# be lost when the application is next rebuilt.\n\n";
     
     if ($arch) {
+	print OUT "export TOP\n";
 	foreach $app (@includes) {
-            $path = $macros{$app};
+	    print OUT "export ${app}\n";
+	}
+	foreach $app (@includes) {
+	    $path = $macros{$app};
 	    next unless (-d "$path/bin/$hostarch");
 	    print OUT "${app}_HOST_BIN = \$(strip \$($app))/bin/\$(EPICS_HOST_ARCH)\n";
 	}
 	foreach $app (@includes) {
-            $path = $macros{$app};
+	    $path = $macros{$app};
 	    next unless (-d "$path/lib/$hostarch");
 	    print OUT "${app}_HOST_LIB = \$(strip \$($app))/bin/\$(EPICS_HOST_ARCH)\n";
 	}
 	foreach $app (@includes) {
-            $path = $macros{$app};
-            next unless (-d "$path/bin/$arch");
+	    $path = $macros{$app};
+	    next unless (-d "$path/bin/$arch");
 	    print OUT "${app}_BIN = \$(strip \$($app))/bin/$arch\n";
 	}
 	foreach $app (@includes) {
-            $path = $macros{$app};
-            next unless (-d "$path/lib/$arch");
+	    $path = $macros{$app};
+	    next unless (-d "$path/lib/$arch");
 	    print OUT "${app}_LIB = \$(strip \$($app))/lib/$arch\n";
 	}
 	# We can't just include TOP in the foreach list:
@@ -182,20 +204,20 @@ sub configAppInclude {
 	print OUT "SHRLIB_SEARCH_DIRS = $path/lib/$arch\n";
 	foreach $app (@includes) {
 	    $path = $macros{$app};
-            next unless (-d "$path/lib/$arch");
+	    next unless (-d "$path/lib/$arch");
 	    print OUT "SHRLIB_SEARCH_DIRS += \$(${app}_LIB)\n";
 	}
     }
     foreach $app (@includes) {
-        $path = $macros{$app};
-        next unless (-d "$path/include");
+	$path = $macros{$app};
+	next unless (-d "$path/include");
 	print OUT "RELEASE_INCLUDES += -I\$(strip \$($app))/include/os/\$(OS_CLASS)\n";
 	print OUT "RELEASE_INCLUDES += -I\$(strip \$($app))/include\n";
     }
     foreach $app (@includes) {
-        $path = $macros{$app};
-        next unless (-d "$path/dbd");
-        print OUT "RELEASE_DBDFLAGS += -I \$(strip \$($app))/dbd\n";
+	$path = $macros{$app};
+	next unless (-d "$path/dbd");
+	print OUT "RELEASE_DBDFLAGS += -I \$(strip \$($app))/dbd\n";
     }
     close OUT;
 }
@@ -209,8 +231,8 @@ sub rulesInclude {
     print OUT "# be lost when the application is next rebuilt.\n\n";
     
     foreach $app (@includes) {
-        $path = $macros{$app};
-        next unless (-r "$path/configure/RULES_BUILD");
+	$path = $macros{$app};
+	next unless (-r "$path/configure/RULES_BUILD");
 	print OUT "-include \$(strip \$($app))/configure/RULES_BUILD\n";
     }
     close OUT;
@@ -224,19 +246,48 @@ sub cdCommands {
     open(OUT,">$outfile") or die "$! creating $outfile";
     
     $startup = $cwd;
-    $startup =~ s/^$root/$iocroot/ if ($opt_t);
+    $startup =~ s/^$root/$iocroot/o if ($opt_t);
     
     print OUT "startup = \"$startup\"\n";
     
+    $ioc = $cwd;
+    $ioc =~ s/^.*\///;	# iocname is last component of directory name
+    
+    print OUT "putenv \"ARCH=$arch\"\n";
+    print OUT "putenv \"IOC=$ioc\"\n";
+    
     foreach $app (@includes) {
 	$iocpath = $path = $macros{$app};
-	$iocpath =~ s/^$root/$iocroot/ if ($opt_t);
+	$iocpath =~ s/^$root/$iocroot/o if ($opt_t);
 	$app_lc = lc($app);
-        print OUT "$app_lc = \"$iocpath\"\n" if (-d $path);
+	print OUT "$app_lc = \"$iocpath\"\n" if (-d $path);
+	print OUT "putenv \"$app=$iocpath\"\n" if (-d $path);
 	print OUT "${app_lc}bin = \"$iocpath/bin/$arch\"\n" if (-d "$path/bin/$arch");
     }
     close OUT;
 }
+
+sub envPaths {
+    die "Architecture not set (use -a option)" unless ($arch);
+    @includes = grep !/^TEMPLATE_TOP$/, @apps;
+    
+    unlink($outfile);
+    open(OUT,">$outfile") or die "$! creating $outfile";
+    
+    $ioc = $cwd;
+    $ioc =~ s/^.*\///;	# iocname is last component of directory name
+    
+    print OUT "epicsEnvSet(ARCH,\"$arch\")\n";
+    print OUT "epicsEnvSet(IOC,\"$ioc\")\n";
+    
+    foreach $app (@includes) {
+	$iocpath = $path = $macros{$app};
+	$iocpath =~ s/^$root/$iocroot/o if ($opt_t);
+	print OUT "epicsEnvSet($app,\"$iocpath\")\n" if (-d $path);
+    }
+    close OUT;
+}
+
 sub checkRelease {
     $status = 0;
     delete $macros{TOP};
@@ -246,11 +297,7 @@ sub checkRelease {
 	%check = (TOP => $path);
 	@order = ();
 	$relfile = "$path/configure/RELEASE";
-	&readRelease($relfile, \%check, \@order) if (-r $relfile);
-	if ($hostarch) {
-	    $relfile .= ".$hostarch";
-	    &readRelease($relfile, \%check, \@order) if (-r $relfile);
-	}
+	&readReleaseFiles($relfile, \%check, \@order);
 	&expandRelease(\%check, \@order);
 	delete $check{TOP};
 	

configure/tools/dos2unix.pl

@@ -0,0 +1,31 @@
+eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
+    if $running_under_some_shell; # makeConfigAppInclude.pl
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# Converts text file in DOS CR/LF format to unix ISO format
+#  $Id$
+
+@files=@ARGV;
+
+$| = 1;
+foreach( @files ) {
+    open(INPUT, "<$_");
+    $backup = "$_.bak";
+    rename( $_, $backup) || die "Unable to rename $_\n$!\n";
+    open(OUTPUT, ">$_");
+    while(<INPUT>) {
+    s/\r\n/\n/;
+    print OUTPUT;
+    }
+    close INPUT;
+    close OUTPUT;
+    unlink ($backup) or die "Cannot remove $backup";
+}

configure/tools/filterWarnings.pl

@@ -1,10 +1,12 @@
 eval 'exec perl -S $0 ${1+"$@"}'      # -*- Mode: perl -*-
-	if $running_under_some_shell; # makeDependsTargets.pl
+	if $running_under_some_shell; # filterWarnings.pl
 #*************************************************************************
 # Copyright (c) 2002 The University of Chicago, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
+# Copyright (c) 2002 Berliner Elektronenspeicherringgesellschaft fuer
+#     Synchrotronstrahlung.
 # EPICS BASE Versions 3.13.7
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
@@ -34,7 +36,7 @@ while ( $errline = <> ) {
     ($errno) = ($errline =~ m/.* ([0-9]+):/);
     $codeline = <>;
     $pointline = <>;
-    next if $codeline =~ m|//\s*X.*aCC[^a-zA-Z]*$errno|;
+    next if $codeline =~ m|/[/*]\s*X.*aCC[^a-zA-Z]*$errno|;
 
     print wrap ("", "    ", $errline);
     print $codeline;

configure/tools/makeMakefileInclude.pl

@@ -68,6 +68,13 @@ foreach $name ( @nameList ) {
 	print OUT "${name}_LDFLAGS+=\$(${name}_LDFLAGS_DEFAULT)\n";
 	print OUT "endif\n";
 	print OUT "endif\n";
+	print OUT "ifneq (\$(strip \$(${name}_OBJLIBS_\$(OS_CLASS))),)\n";
+	print OUT "${name}_OBJLIBS+=\$(subst -nil-,,\$(${name}_OBJLIBS_\$(OS_CLASS)))\n";
+	print OUT "else\n";
+	print OUT "ifdef ${name}_OBJLIBS_DEFAULT\n";
+	print OUT "${name}_OBJLIBS+=\$(${name}_OBJLIBS_DEFAULT)\n";
+	print OUT "endif\n";
+	print OUT "endif\n";
 	print OUT "ifneq (\$(strip \$(${name}_LDOBJS_\$(OS_CLASS))),)\n";
 	print OUT "${name}_LDOBJS+=\$(subst -nil-,,\$(${name}_LDOBJS_\$(OS_CLASS)))\n";
 	print OUT "else\n";
@@ -75,6 +82,7 @@ foreach $name ( @nameList ) {
 	print OUT "${name}_LDOBJS+=\$(${name}_LDOBJS_DEFAULT)\n";
 	print OUT "endif\n";
 	print OUT "endif\n";
+	print OUT "${name}_LDLIBS+=\$(${name}_LIBS)\n";
 	print OUT "ifneq (\$(strip \$(${name}_LIBS_\$(OS_CLASS))),)\n";
 	print OUT "${name}_LDLIBS+=\$(subst -nil-,,\$(${name}_LIBS_\$(OS_CLASS)))\n";
 	print OUT "else\n";
@@ -82,7 +90,6 @@ foreach $name ( @nameList ) {
 	print OUT "${name}_LDLIBS+=\$(${name}_LIBS_DEFAULT)\n";
 	print OUT "endif\n";
 	print OUT "endif\n";
-	print OUT "${name}_LDLIBS+=\$(${name}_LIBS)\n";
 	print OUT "ifneq (\$(strip \$(${name}_SYS_LIBS_\$(OS_CLASS))),)\n";
 	print OUT "${name}_SYS_LIBS+=\$(subst -nil-,,\$(${name}_SYS_LIBS_\$(OS_CLASS)))\n";
 	print OUT "else\n";
@@ -101,12 +108,13 @@ foreach $name ( @nameList ) {
 	print OUT "${name}_DEPLIBS=\$(foreach lib, \$(${name}_LDLIBS),\\\n";
 	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib)\*,\\\n";
 	print OUT " \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS)))\\\n";
-	print OUT " \$(addsuffix /\$(LIB_PREFIX)\$(lib)\$(LIB_EXT),\\\n";
+	print OUT " \$(addsuffix /\$(LIB_PREFIX)\$(lib)\$(LIB_SUFFIX),\\\n";
 	print OUT " \$(firstword \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS))\/)))\n";
 	print OUT "${name}\$(EXE): \$(${name}_OBJSNAME) \$(${name}_RESS) \$(${name}_DEPLIBS)\n";
 	print OUT "endif\n";
 	print OUT "\n";
 	print OUT "ifeq (\$(filter ${name},\$(LIBRARY)),${name})\n";
+	print OUT "ifneq (\$(filter ${name},\$(LOADABLE_LIBRARY)),${name})\n";
 	print OUT "ifneq (,\$(strip \$(${name}_OBJS) \$(LIBRARY_OBJS)))\n";
 	print OUT "BUILD_LIBRARY += ${name}\n";
 	print OUT "endif\n";
@@ -120,7 +128,7 @@ foreach $name ( @nameList ) {
 	print OUT "${name}_DLL_DEPLIBS=\$(foreach lib, \$(${name}_DLL_LIBS),\\\n";
 	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib)\*,\\\n";
 	print OUT " \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS)))\\\n";
-	print OUT " \$(addsuffix /\$(LIB_PREFIX)\$(lib)\$(LIB_EXT),\\\n";
+	print OUT " \$(addsuffix /\$(LIB_PREFIX)\$(lib)\$(LIB_SUFFIX),\\\n";
 	print OUT " \$(firstword \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS))\/)))\n";
 	print OUT "\$(LIB_PREFIX)${name}\$(LIB_SUFFIX):\$(${name}_OBJSNAME) \$(${name}_RESS)\n";
 	print OUT "\$(LIB_PREFIX)${name}\$(LIB_SUFFIX):\$(${name}_DEPLIBS)\n";
@@ -128,6 +136,27 @@ foreach $name ( @nameList ) {
 	print OUT "\$(LIB_PREFIX)${name}\$(SHRLIB_SUFFIX):\$(${name}_DEPLIBS)\n";
 	print OUT "\$(LIB_PREFIX)${name}\$(SHRLIB_SUFFIX):\$(${name}_DLL_DEPLIBS)\n";
 	print OUT "endif\n";
+	print OUT "endif\n";
+	print OUT "ifeq (\$(filter ${name},\$(LOADABLE_LIBRARY)),${name})\n";
+	print OUT "ifneq (,\$(strip \$(${name}_OBJS) \$(LIBRARY_OBJS)))\n";
+	print OUT "LOADABLE_BUILD_LIBRARY += ${name}\n";
+	print OUT "endif\n";
+	print OUT "${name}_RESS+=\$(addsuffix \$(RES),\$(basename \$(${name}_RCS)))\n";
+	print OUT "${name}_OBJSNAME+=\$(addsuffix \$(OBJ),\$(basename \$(${name}_OBJS)))\n";
+	print OUT "${name}_DEPLIBS=\$(foreach lib, \$(${name}_LDLIBS),\\\n";
+	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib)\*,\\\n";
+	print OUT " \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS)))\\\n";
+	print OUT " \$(addsuffix /\$(LIB_PREFIX)\$(lib)\$(LIB_SUFFIX),\\\n";
+	print OUT " \$(firstword \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS))\/)))\n";
+	print OUT "${name}_DLL_DEPLIBS=\$(foreach lib, \$(${name}_DLL_LIBS),\\\n";
+	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib)\*,\\\n";
+	print OUT " \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS)))\\\n";
+	print OUT " \$(addsuffix /\$(LIB_PREFIX)\$(lib)\$(LIB_SUFFIX),\\\n";
+	print OUT " \$(firstword \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS))\/)))\n";
+	print OUT "\$(LOADABLE_SHRLIB_PREFIX)${name}\$(LOADABLE_SHRLIB_SUFFIX):\$(${name}_OBJSNAME) \$(${name}_RESS)\n";
+	print OUT "\$(LOADABLE_SHRLIB_PREFIX)${name}\$(LOADABLE_SHRLIB_SUFFIX):\$(${name}_DEPLIBS)\n";
+	print OUT "\$(LOADABLE_SHRLIB_PREFIX)${name}\$(LOADABLE_SHRLIB_SUFFIX):\$(${name}_DLL_DEPLIBS)\n";
+	print OUT "endif\n";
 	print OUT "\n";
 }
 close OUT or die "Cannot close $outfile: $!";