Updated release to R3.14.3.

Added Release Approval line to checklist.

LICENSE

@@ -1,5 +1,5 @@
-Copyright (c) 2002 University of Chicago and The Regents of the University
-of California. All rights reserved.
+Copyright (c) 1991-2003 University of Chicago and The Regents of the
+University of California. All rights reserved.
 
 EPICS BASE is distributed subject to the following license agreement:
 

README

@@ -2,9 +2,9 @@
 EPICS Base - the central core of a control system toolkit
 ---------------------------------------------------------
 
-Copyright (c) 2002 The University of Chicago, as Operator
+Copyright (c) 1991-2003 The University of Chicago, as Operator
 of Argonne National Laboratory.
-Copyright (c) 2002 The Regents of the University of
+Copyright (c) 1991-2003 The Regents of the University of
 California, as Operator of Los Alamos National Laboratory.
 
 EPICS Base Versions 3.13.7 and higher are distributed

config/CONFIG.Host.Darwin

@@ -18,20 +18,27 @@ ARCH_CLASS = Darwin
 include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
 
 #
-# The config files are a real mess.  The following set of definitions
-# seems to work for all the weird ways in which the extensions makefile
-# fragments use them.
+# The config files are a real mess.  The following definitions seem to work
+# for all the weird ways in which the extensions makefile fragments use them.
 #
-ANSI = GCC
-CPLUSPLUS = c++
-CC = cc
-CXX= c++
-GCC = cc
+AR = ar
+ARCMD = $(AR) -rc $@
+ARFLAGS = rcv
+RANLIB = ranlib
+
+ANSI=GCC
+CPLUSPLUS=G++
 
 OP_SYS_CFLAGS += -no-cpp-precomp
 OP_SYS_INCLUDES = -I/sw/include -I/usr/X11R6/include
 OP_SYS_LDFLAGS += -L/sw/lib -L/usr/X11R6/lib
 
+# Uncomment this if you're using the GNU readline library
+#ARCH_DEP_LDLIBS += -lreadline
+
+# Uncomment this if you're using the libtecla library
+#ARCH_DEP_LDLIBS += -ltecla_r -ltermcap
+
 #
 # Compiler/linker problems prevent the use of shared libraries at the moment
 #
@@ -41,8 +48,8 @@ SHARED_LIBRARIES_Darwin = NO
 # Something like this will be needed once shared libraries are built
 #
 SHRLIB_SUFFIX = .dylib$(SHARED_LIBRARIES)
-GCC_SHRLIB_LDFLAGS_YES += -dynamiclib -flat_namespace
-G++_SHRLIB_LDFLAGS_YES += -dynamiclib -flat_namespace
+GCC_SHRLIB_LDFLAGS_YES += -dynamiclib
+G++_SHRLIB_LDFLAGS_YES += -dynamiclib
 
 #
 # Java

config/CONFIG.Host.Linux

@@ -47,4 +47,9 @@ SYS_DLL_LIBS_Linux += pthread readline curses rt
 #	and see if that makes the problem go away."
 #ARCH_DEP_CFLAGS += -D_GNU_SOURCE
 
+# Runtime ldflags
+RUNTIME_LIBS =$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
+ $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH)
+RUNTIME_LDFLAGS = $(RUNTIME_LIBS:%=-Wl,-rpath,%)
+
 

config/CONFIG.Host.UnixCommon

@@ -83,7 +83,7 @@ OP_SYS_LDLIBS = -lm
 # Link definitions
 LINK.c = $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
 LINK.cc = $(CXX) -o $@ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
- 
+
 #--------------------------------------------------
 # Allow site overrides
 -include $(EPICS_BASE)/config/CONFIG_SITE.Host.UnixCommon

config/CONFIG.Host.WIN32

@@ -32,7 +32,7 @@ ARCMD = lib /nologo /verbose /out:$@
 
 #
 # Configure OS vendor C compiler
-ACC = cl 
+ACC = cl
 
 #
 # __STDC__=0 is a real great idea of Jeff that gives us both:
@@ -60,7 +60,7 @@ ACC_OPT_YES = /Ox
 #
 # /Zi include debugging info in object files
 # /Fr create source browser file
-ACC_OPT_NO = /Zi /Fr
+ACC_OPT_NO = /Zi 
 
 #
 # the following options are required when
@@ -95,7 +95,11 @@ ACC_SLIBS_NO=
 #
 # Use of /Za would dissable DLL import/export keywords which
 # EPICS include/excludes using architecture neutral macros
-CCC = cl 
+#
+# /GX support C++ exceptions
+# /GR generate RTTI information
+#
+CCC = cl /GX /GR
 CCC_NORMAL = $(CCC) /nologo /D__STDC__=0
 CCC_STRICT = $(CCC) /nologo /D__STDC__=0
 CCC_TEMPL_INST_FLAG =
@@ -113,7 +117,7 @@ CCC_OPT_YES = /Ox
 #
 # /Zi include debugging info in object files
 # /Fr create source browser file
-CCC_OPT_NO = /Zi /Fr
+CCC_OPT_NO = /Zi 
 
 #
 # the following options are required when
@@ -135,7 +139,7 @@ CCC_SLIBS_NO=
 
 LINK_OPT_FLAGS_YES = /warn:3 /incremental:no /opt:ref\
 /release $(PROD_VERSION:%=/version:%)
-LINK_OPT_FLAGS_NO = /warn:3 /debug 
+LINK_OPT_FLAGS_NO = /warn:3 /debug /incremental:no
 OPT_LDFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT))
 
 ARCH_DEP_CFLAGS=

config/CONFIG.Host.cygwin32

@@ -42,3 +42,9 @@ GCC_DEP_CFLAGS = -D_REENTRANT
 G++_DEP_CFLAGS = -D_REENTRANT
 
 POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
+
+# Runtime ldflags
+RUNTIME_LIBS =$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
+ $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH)
+RUNTIME_LDFLAGS = $(RUNTIME_LIBS:%=-Wl,-rpath,%)
+

config/CONFIG.Host.hp700

@@ -12,7 +12,9 @@
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Host.hp700
 
-ARCH_CLASS = hp700
+ARCH_CLASS = hpux
+
+SHARED_LIBRARIES=YES
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
@@ -20,70 +22,53 @@ include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
 SHRLIB_SUFFIX = .sl
 
 AR = ar
+ARFLAGS = -rc
 
 # Configure OS vendor C compiler
 ACC = cc
 ACC_ANSI = $(ACC) -Aa
 ACC_STRICT = $(ACC) -Aa
-ACC_TRAD = $(ACC)
+ACC_TRAD = $(ACC) -Ac
 ACC_WARN_YES = 
 ACC_WARN_NO =  -w
 ACC_OPT_YES =  -O
 ACC_OPT_NO = -g
-ACC_SFLAGS_YES= -Wl,-a,archive
-ACC_SFLAGS_NO=
+# 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)
+ACC_SLDFLAGS_YES= -Wl,-a,archive -l:libc.sl
+ACC_SFLAGS_NO =
 ACC_SLIBS_YES =
-ACC_SLIBS_NO=
-ACC_SHRLIB_CFLAGS_YES = +Z
+ACC_SLIBS_NO =
 ACC_SHRLIB_LDFLAGS_YES = -b
-ACC_DEP_CFLAGS=+DAportable
 
-# Configure OS vendor C++ compiler
-HPCC = cc 
-HPCC_ANSI = $(HPCC) -Aa
-HPCC_STRICT = $(HPCC) -Aa
-HPCC_TRAD = $(HPCC) -Ac
-HPCC_WARN_YES = 
-HPCC_WARN_NO =  -w
-HPCC_OPT_YES =  -O
-HPCC_OPT_NO = -g
-HPCC_SFLAGS_YES= -Wl,-a,archive
-HPCC_SFLAGS_NO=
-HPCC_SLIBS_YES =
-HPCC_SLIBS_NO=
-HPCC_SHRLIB_CFLAGS_YES = +Z
-HPCC_SHRLIB_LDFLAGS_YES = -b
-HPCC_DEP_CFLAGS=+DAportable
-
-#Old HP C++ compiler
-#CCC = CC
-#CCC_NORMAL = $(CCC) +p
-
-#New HP C++ compiler
+# aCC HP C++ compiler
 CCC = aCC
-# avoid treating "future errors" as actual errors
-CCC_NORMAL = $(CCC) +W302 +W829 +W818 +W392 +W469 +W495 +W749 +W667 +W392 +W684
-CCC_STRICT = $(CCC) +p
+# Suppress bogus warnings created by the aCC compiler
+CCC_NORMAL = $(CCC) -AA -Aa -mt +W302 +W829 +W818 +W392 +W469 +W495 +W749 +W667 +W392 +W684
+CCC_STRICT = $(CCC) -AA -Aa -mt
 CCC_TEMPL_INST_FLAG =
 CCC_WARN_YES = +w
 CCC_WARN_NO =
-CCC_OPT_YES =  -O
+CCC_OPT_YES = +O3
 CCC_OPT_NO = -g
-CCC_SFLAGS_YES= -Wl,-a,archive
+# 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)
+CCC_SLDFLAGS_YES= -Wl,-a,archive -l:libc.sl
 CCC_SFLAGS_NO=
 CCC_SLIBS_YES =
 CCC_SLIBS_NO=
-CCC_SHRLIB_CFLAGS_YES = +Z
-# shared libs will be found by searching environment variable SHLIB_PATH,
-# then by searching the specified path (see below)
 CCC_SHRLIB_LDFLAGS_YES = -b
 CCC_DEPENDS_FLAG = +m
-CCC_DEP_CFLAGS=+DAportable
 
-# +DAportable causes portable object code to be created for execution
-# on different PA-Risc machines
-ARCH_DEP_CFLAGS = -D_HPUX_SOURCE -DHP_UX 
-ARCH_DEP_CXXFLAGS = -D_HPUX_SOURCE -DHP_UX
-ARCH_DEP_LDLIBS =
-ARCH_DEP_LDFLAGS = -Wl,+b$(DEFAULT_SHRLIB_SEARCH_PATH),+s
+# Portability across different PA-RISC architecture versions, position
+# independent code, "-mt" (s.a.) handles all the posix stuff
+ARCH_DEP_CPPFLAGS = -DHP_UX +DAportable +z
+ARCH_DEP_CFLAGS = -D_HPUX_SOURCE
 
+# 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))

config/CONFIG.Host.hpux-parisc

@@ -9,5 +9,5 @@
 #*************************************************************************
 # $Id$
 
-# hpux-m68k is the new name for hp700
+# hpux-parisc is the new name for hp700
 -include $(EPICS_BASE)/config/CONFIG.Host.hp700

config/CONFIG.Host.hpux-parisc-gnu

@@ -0,0 +1,49 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# CONFIG.Host.hpux-parisc-gnu
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.hpux-parisc-gnu
+
+ARCH_CLASS = hpux
+
+SHARED_LIBRARIES=YES
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+AR = ar -rc
+ARCMD = $(AR) $@
+
+#==========================
+# These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
+ANSI=GCC
+CPLUSPLUS=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)
+GCC_SLDFLAGS_YES = -l:libc.sl
+G++_SLDFLAGS_YES = -l:libc.sl
+
+# socket and nsl needed by libca.a
+#ARCH_DEP_LDLIBS += -lsocket -lnsl
+ARCH_DEP_LDLIBS += -lpthread
+ARCH_DEP_CPPFLAGS += -D_PTHREADS -DOSITHREAD_USE_DEFAULT_STACK
+
+# Allows R3.13 built extensions to load R3.14 shared libs
+SYS_DLL_LIBS_hpux += pthread
+
+# 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))

config/CONFIG.Host.solaris

@@ -35,24 +35,23 @@ ACC = $(SPARCWORKS)/bin/cc
 ACC_ANSI = $(ACC) -Xa -v
 ACC_STRICT = $(ACC) -Xc -v
 ACC_TRAD = $(ACC) -Xs
-ACC_DEP_CFLAGS = -KPIC
-
+ACC_DEP_CFLAGS = -KPIC -D_REENTRANT
 ACC_WARN_YES = 
 ACC_WARN_NO =  -w
 ACC_OPT_YES =  -O
 ACC_OPT_NO = -g
 ACC_SFLAGS_YES= -Bstatic
 ACC_SFLAGS_NO=
-ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
+ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic
 ACC_SLIBS_NO=
 ACC_SHRLIB_CFLAGS_YES =
-ACC_SHRLIB_LDFLAGS_YES =  -G -h $@ -z ignore -z combreloc -z lazyload
+ACC_SHRLIB_LDFLAGS_YES =  -G -h $@
 
 # Configure OS vendor C++ compiler
 CCC = $(SPARCWORKS)/bin/CC
 CCC_NORMAL = $(CCC) +p
 CCC_STRICT = $(CCC) +p
-CCC_DEP_CFLAGS = -KPIC
+CCC_DEP_CFLAGS = -KPIC -D_REENTRANT
 CCC_TEMPL_INST_FLAG =
 CCC_WARN_YES = +w
 CCC_WARN_NO = 
@@ -60,20 +59,30 @@ CCC_OPT_YES =  -O
 CCC_OPT_NO = -g
 CCC_SFLAGS_YES= -Bstatic
 CCC_SFLAGS_NO=
-CCC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
+CCC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic
 CCC_SLIBS_NO=
 CCC_DEPENDS_FLAG = -xM1
 CCC_SHRLIB_CFLAGS_YES =
-CCC_SHRLIB_LDFLAGS_YES =  -G -h $@ -z ignore -z combreloc -z lazyload
- 
+CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
 
-ARCH_DEP_CFLAGS = -DSOLARIS=$(subst 5.,,$(shell uname -r)) 
+SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
+ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
 POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
 
 # socket and nsl needed by libca.a
 ARCH_DEP_LDLIBS += -lsocket -lnsl
 ARCH_DEP_LDLIBS += -lposix4 -lpthread
+ARCH_DEP_LDLIBS_8 = -lCrun
+ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
 
 #Allows R3.13 built extensions to load R3.14 shared libs
-SYS_DLL_LIBS_solaris += posix4 pthread Crun
+SYS_DLL_LIBS_solaris_8 = 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-gnu

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

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.solaris-x86

@@ -15,8 +15,5 @@
 -include $(EPICS_BASE)/config/CONFIG.Host.solaris
 
 # Solaris on x86
-ARCH_DEP_CFLAGS = -DSOLARIS=$(subst 5.,,$(shell uname -r))  -D_X86_  -D__EXTENSIONS__
-
-GCC = gcc
-G++ = g++
+ARCH_DEP_CPPFLAGS += -D_X86_
 

config/CONFIG.Host.solaris-x86-gnu

@@ -12,14 +12,8 @@
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Host.solaris-x86
 
--include $(EPICS_BASE)/config/CONFIG.Host.solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solarisGnu
 
 # Solaris on x86
-ARCH_DEP_CFLAGS = -DSOLARIS  -D_X86_
-
-GCC = gcc
-G++ = g++
-
-ANSI=GCC
-CPLUSPLUS=G++
+ARCH_DEP_CPPFLAGS += -D_X86_
 

config/CONFIG.Host.solarisGnu

@@ -0,0 +1,53 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# CONFIG.Host.solarisGnu
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.solarisGnu
+
+ARCH_CLASS = solaris
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+#
+# required by sun's C++ compiler
+#
+AR = ar
+_AR = $(AR) $(ARFLAGS)
+G++_AR = $(_AR)
+CCC_AR = $(CCC) -xar -o
+ARCMD = $($(CPLUSPLUS)_AR) $@
+RANLIB =
+
+#==========================
+# These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
+ANSI=GCC
+CPLUSPLUS=G++
+#==========================
+
+SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
+ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
+POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
+
+# socket and nsl needed by libca.a
+ARCH_DEP_LDLIBS += -lsocket -lnsl
+ARCH_DEP_LDLIBS += -lposix4 -lpthread
+ARCH_DEP_LDLIBS_8 = -lCrun
+ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
+
+#Allows R3.13 built extensions to load R3.14 shared libs
+SYS_DLL_LIBS_solaris_8 = Crun
+SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
+
+# Runtime ldflags
+RUNTIME_LDFLAGS =$(addprefix -R,$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
+ $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
+

config/CONFIG.Host.sun4

@@ -93,3 +93,6 @@ ARCH_DEP_CFLAGS = -DSUNOS4
 #SPECIAL_LANG = /usr/lang/SC3.0.1
 #SPECIAL_LANG = /usr/lang/lib
 
+# Runtime ldflags
+RUNTIME_LDFLAGS =$(addprefix -R,$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
+ $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))

config/CONFIG.Vx.ppc603

@@ -22,4 +22,4 @@ ARCH_CLASS = ppc
 ARCH_DEP_CPPFLAGS = -DCPU=PPC603 -DTRUE=1
 ARCH_DEP_CFLAGS = -mcpu=603 --no-builtin -mstrict-align
 
-# ARCH_DEP_CFLAGS== -fsigned-char     #May need for calcPerform.c
+# ARCH_DEP_CFLAGS+= -fsigned-char     #May need for calcPerform.c

config/CONFIG.Vx.ppc603_long

@@ -0,0 +1,16 @@
+# $Id$
+#
+# This file is maintained by the EPICS community.
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+ 
+# For Vx directories of form:
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+ARCH_CLASS = ppc
+
+# Architecture specific build flags 
+ARCH_DEP_CPPFLAGS = -DCPU=PPC603 -DTRUE=1
+ARCH_DEP_CFLAGS = -mcpu=603 --no-builtin -mstrict-align -mlongcall
+
+# ARCH_DEP_CFLAGS+= -fsigned-char     #May need for calcPerform.c

config/CONFIG.Vx.ppc604

@@ -22,5 +22,5 @@ ARCH_CLASS = ppc
 ARCH_DEP_CPPFLAGS = -DCPU=PPC604 -D_GNU_TOOL -DTRUE=1
 ARCH_DEP_CFLAGS = -mcpu=604 --no-builtin -mstrict-align
 
-# ARCH_DEP_CFLAGS== -fsigned-char     #May need for calcPerform.c
+# ARCH_DEP_CFLAGS+= -fsigned-char     #May need for calcPerform.c
 

config/CONFIG.Vx.ppc604_long

@@ -0,0 +1,17 @@
+# $Id$
+#
+# This file is maintained by the EPICS community.
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+ 
+# For Vx directories of form:
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+ARCH_CLASS = ppc
+
+# Architecture specific build flags 
+ARCH_DEP_CPPFLAGS = -DCPU=PPC604 -D_GNU_TOOL -DTRUE=1
+ARCH_DEP_CFLAGS = -mcpu=604 --no-builtin -mstrict-align -mlongcall
+
+# ARCH_DEP_CFLAGS+= -fsigned-char     #May need for calcPerform.c
+

config/CONFIG.Vx.sbs_pc6

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

config/CONFIG.Vx.vxWorks-ppc603

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

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,9 +18,9 @@
 
 EPICS_VERSION=3
 EPICS_REVISION=14
-EPICS_MODIFICATION=0
-EPICS_UPDATE_NAME=beta
-EPICS_UPDATE_LEVEL=2
+EPICS_MODIFICATION=3
+EPICS_UPDATE_NAME=
+EPICS_UPDATE_LEVEL=0
 
 EPICS_LOCAL_NAME=B
 EPICS_LOCAL_VERSION=0

config/CONFIG_COMMON

@@ -238,7 +238,7 @@ CXXFLAGS = $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)
  $(OP_SYS_CFLAGS) $(TEMPL_INST_CXXFLAG) $(INCLUDES)
 
 LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\
- $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS)
+ $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS) $(RUNTIME_LDFLAGS)
 
 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS)\
  $(STATIC_LDLIBS) $(OP_SYS_LDLIBS) $(POSIX_LDLIBS)

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.UnixCommon

@@ -25,5 +25,3 @@ export LD_LIBRARY_PATH := $(INSTALL_HOST_LIB):$(EPICS_BASE_HOST_LIB):$(LD_LIBRAR
 else
 export LD_LIBRARY_PATH := $(EPICS_BASE_HOST_LIB):$(LD_LIBRARY_PATH)
 endif
-
-

config/CONFIG_HOST_ARCH.hpux-parisc

@@ -9,5 +9,5 @@
 #*************************************************************************
 # $Id$
 
-# hpux-m68k is the new name for hp700
+# hpux-parisc is the new name for hp700
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.hp700

config/CONFIG_HOST_ARCH.hpux-parisc-gnu

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

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

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

config/CONFIG_SITE

@@ -21,8 +21,10 @@
 #	hp700
 #	sgi
 #	solaris
+#	solarisGnu  (GNU compiler)
 #	solaris-x86
 #	sun4
+
 #
 #  HOST_ARCH now an environment variable
 #  HOST_ARCH=$(shell /usr/local/epics/startup/HostArch)
@@ -30,26 +32,19 @@ 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
-#       ppc604
-#       vxipc
-#
-CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040 vxWorks-ppc604
+#       vxWorks-486
+#       vxWorks-68040
+#       vxWorks-68040lc
+#       vxWorks-68060
+#       vxWorks-ppc603
+#       vxWorks-ppc604
+#       vxWorks-ppc603_long
+#       vxWorks-ppc604_long
+
+CROSS_COMPILER_TARGET_ARCHS=
 
 
 #  If only a subset of the host architectures perform

config/CONFIG_SITE.Host.hp700

@@ -4,23 +4,8 @@
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
 
-# by default, build and use shared libraries
-SHARED_LIBRARIES=YES
-
-# where we expect to find shared libraries if not found elsewhere
-# DEFAULT_SHRLIB_SEARCH_PATH = /home/controls/epics/cdev/lib/hpux-10.20:/home/controls/epics/cdev/lib/hpux-10.XX:/opt/TclTk/lib:/opt/xpm/lib/X11:/usr/lib/pa1.1:/usr/lib:/lib:/opt/csr/installed/HP-UX/lib::/opt/OPI/GUI/lib/hp700:/opt/OPI/MapperApplications/lib/hp700:/opt/OPI/cdevAppl/lib/hp700:/opt/OPI/cmlog/lib/hp700:/opt/OPI/models/lib/hp700:/opt/OPI/sddsAppl/lib/hp700
-DEFAULT_SHRLIB_SEARCH_PATH = /cs/lib/R$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION).$(EPICS_UPDATE_NAME)$(EPICS_UPDATE_LEVEL):$(INSTALL_LIB)
-
-#No special action should be required to build or use shared libraries.
-#However, when a new shared library is built using the above configuration,
-#it should be copied into the location specified by DEFAULT_SHRLIB_SEARCH_PATH
-#which in this specific case is: /cs/lib/R3.13.1.1/
-
-# cal added this so that libraries can be built with position
-# independent code even if shared libraries aren't being built
-ifeq ($(RELOCATABLE), YES)
-    ARCH_DEP_CFLAGS     += +Z
-    ARCH_DEP_CXXFLAGS   += +Z
-endif
-
+# By default, shared libraries are built and used. Override here.
+#SHARED_LIBRARIES=NO
 
+# This is the absolute path to the generic INSTALL_LOCATION, for SHARED_LIBRARY searches.
+SHRLIB_SEARCH_DIRS += /opt/epics/R$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)/support/base/$(EPICS_VERSION)-$(EPICS_REVISION)-$(EPICS_MODIFICATION)-$(EPICS_UPDATE_NAME)$(EPICS_UPDATE_LEVEL)/lib/$(EPICS_HOST_ARCH)

config/CONFIG_SITE.Host.hpux-parisc

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

config/CONFIG_SITE.Host.hpux-parisc-gnu

@@ -0,0 +1,11 @@
+#
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# By default, shared libraries are built and used. Override here.
+#SHARED_LIBRARIES=NO
+
+# This is the absolute path to the generic INSTALL_LOCATION, for SHARED_LIBRARY searches.
+SHRLIB_SEARCH_DIRS += /opt/epics/R$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)/support/base/$(EPICS_VERSION)-$(EPICS_REVISION)-$(EPICS_MODIFICATION)-$(EPICS_UPDATE_NAME)$(EPICS_UPDATE_LEVEL)/lib/$(EPICS_HOST_ARCH)

config/CONFIG_SITE.Host.solaris

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

config/CONFIG_SITE.Host.solaris-sparc-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/CONFIG_SITE.Vx.Linux.ppc603

@@ -4,7 +4,6 @@
 
 # ORNL SNS overrides for cross compilers
 #VX_DIR_YES = /opt/tornado20/
-#VX_CONFIG_DIR_YES = $(VX_DIR)/target/config
 #VX_INCLUDE_YES = /usr/local/crossgcc/ppc/powerpc-wrs-vxworks/sys-include
 #VX_GNU_YES = /usr/local/crossgcc/ppc/
 #VX_GNU_BIN_YES = $(VX_GNU)/bin

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

@@ -40,6 +40,7 @@ vpath %.c $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic ..
 vpath %.cc $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic ..
 vpath %.cpp $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic ..
 vpath %.rc $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic ..
+vpath %.jar $(USER_VPATH) ..
 
 #	check for add-on CFLAGS and CXXFLAGS
 #
@@ -363,7 +364,7 @@ buildInstall :: build $(TARGETS) \
 clean::
 	@echo "Cleaning"
 	@$(RM) *.i *$(OBJ) *.a $(PROD) $(TESTPROD) $(LIBNAME) $(SHRLIBNAME) $(INC) \
-	*$(RES) $(TARGETS) $(DBDINSTALL) $(MENUS) $(RECTYPES) $(BPTS)
+	*$(RES) $(TARGETS) *.dbd $(MENUS) $(RECTYPES) $(BPTS)
 ifdef DBDEXPAND
 	@$(RM) $(DBDNAME)
 endif
@@ -388,6 +389,14 @@ PRODNAME_SRCS += $(PRODNAME_SRCS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(PRODNAME_OBJS_$(ARCH_CLASS))),)
+PRODNAME_OBJS += $(subst -nil-,,$(PRODNAME_OBJS_$(ARCH_CLASS)))
+else
+ifdef PRODNAME_OBJS_DEFAULT
+PRODNAME_OBJS += $(PRODNAME_OBJS_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(PRODNAME_RCS_$(ARCH_CLASS))),)
 PRODNAME_RCS += $(subst -nil-,,$(PRODNAME_RCS_$(ARCH_CLASS)))
 else
@@ -406,8 +415,8 @@ else
 PRODNAME_LINKER = $(LINK.c)
 endif
 
-PRODNAME_OBJS=$(addsuffix $(OBJ), $(basename $(PRODNAME_SRCS)))
-PRODNAME_RESS=$(addsuffix $(RES), $(basename $(PRODNAME_RCS)))
+PRODNAME_OBJS+=$(addsuffix $(OBJ), $(basename $(PRODNAME_SRCS)))
+PRODNAME_RESS+=$(addsuffix $(RES), $(basename $(PRODNAME_RCS)))
 
 ifdef BORLANDC
 $(PRODNAME): $(PRODNAME_OBJS) $(PRODNAME_RESS)
@@ -454,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)
 
@@ -466,6 +477,15 @@ TESTCLASSES += $(subst .java,.class,$(TESTJAVA))
 INSTALL_CLASSES =$(CLASSES:%=$(INSTALL_JAVA)/$(PACKAGE)/%)
 INSTALL_JAR =$(JAR:%=$(INSTALL_JAVA)/%)
 
+ifeq ($(strip $(JAVADOC)),YES)
+DIRECTORY_TARGETS += $(INSTALL_HTML)
+INSTALL_JAVADOC = $(CLASSES:%.class=$(INSTALL_HTML)/%.html)
+ifdef PACKAGE
+DIRECTORY_TARGETS += $(INSTALL_HTML)/$(PACKAGE)
+INSTALL_JAVADOC = $(CLASSES:%.class=$(INSTALL_HTML)/$(PACKAGE)/$(PACKAGE)/%.html)
+endif
+endif
+
 JAR_OPTIONS = cvf
 ifdef MANIFEST
 JAR_OPTIONS = cvmf
@@ -478,10 +498,10 @@ $(DIRECTORY_TARGETS) :
 
 build:: $(TESTCLASSES) $(JAR)
 
-buildInstall :: $(DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(INSTALL_JAR)
+buildInstall :: $(DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(INSTALL_JAR) $(INSTALL_JAVADOC)
 
 clean::
-	@$(RM) $(TESTCLASSES) $(JAR)
+	@$(RM) $(TESTCLASSES) $(JAR) $(INSTALL_CLASSES) $(INSTALL_JAVADOC)
 
 %.class:%.java
 	@echo Creating java class file $@
@@ -493,6 +513,11 @@ $(INSTALL_JAVA)/$(PACKAGE)/%.class:%.java
 	@$(RM) $@
 	$(JAVACCMD) -d $(INSTALL_JAVA) $<
 
+$(INSTALL_JAVADOC):$(JAVA)
+	@echo Creating javadoc html files $@
+	@$(RM) $@
+	$(JAVADOCCMD) -d $(INSTALL_HTML)/$(PACKAGE) $(PACKAGE) 
+
 $(JAR):%.jar:  $(JAR_DEPFILES)
 	@echo Creating java jar file $@
 	@$(RM) $@
@@ -505,7 +530,7 @@ $(INSTALL_JAVA)/%.jar: %.jar
 $(PACKAGE)_%.h:$(INSTALL_JAVA)/$(PACKAGE)/%.class
 	$(JAVAHCMD) $(PACKAGE).$*
 
-.PRECIOUS: $(INSTALL_CLASSES)
+.PRECIOUS: $(INSTALL_CLASSES) $(INSTALL_JAVADOC)
 
 #---------------------------------------------------------------
 #---------------------------------------------------------------
@@ -699,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

config/RULES.Unix

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

@@ -93,7 +93,7 @@ endif
 clean::
 	@echo "Cleaning"
 	@$(RM) *.i *.o *.a *.out $(TARGETS) $(PROD) $(LIBNAME) $(INC) \
-	$(DBDINSTALL) $(MENUS) $(RECTYPES) $(BPTS) $(DBDNAME)
+	$(DBDINSTALL) $(MENUS) $(RECTYPES) $(BPTS) $(DBDNAME) *.c 
 ifdef MUNCH
 	@$(RM) $(MUNCHNAME) ctdt.c ctdt.o nm.out
 endif
@@ -171,8 +171,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
@@ -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/tools/installEpics.pl

@@ -104,7 +104,7 @@ sub Usage
 	print "Usage:\n";
 	print "\t$tool [ -m mode ] file ... directory\n";
 	print "\n";
-	print "\t-d             Create non-exising directories\n";
+	print "\t-d             Create non-existing directories\n";
 	print "\t-m mode        Set the mode for the installed file";
 		print " (0755 by default)\n";
 	print "\tfile           Name of file\n";

configure/CONFIG

@@ -17,14 +17,13 @@
 #  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.$(EPICS_HOST_ARCH).$(T_A)
 
 include $(CONFIG)/CONFIG_COMMON
 
@@ -41,7 +40,7 @@ include $(CONFIG)/CONFIG_SITE
 #
 include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-
+-include $(CONFIG)/O.$(T_A)/CONFIG_APP_INCLUDE
 
 ifdef T_A
 

configure/CONFIG.CrossCommon

@@ -23,7 +23,6 @@ GNU_TARGET_LIB_DIR = $(GNU_DIR)/$(GNU_TARGET)/lib
 
 export GCC_EXEC_PREFIX = $(GNU_LIB)/gcc-lib/
 
-CROSS_CPPFLAGS = -nostdinc
 CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
 CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))
 

configure/CONFIG.gnuCommon

@@ -10,6 +10,8 @@
 #--------------------------------------------------
 # GNU compiler defaults
 
+GNU = YES
+
 GNU_BIN = $(GNU_DIR)/bin
 GNU_LIB = $(GNU_DIR)/lib
 
@@ -20,27 +22,31 @@ LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
 CPP = $(CC) -x c -E
 RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX)
 
-CODE_CFLAGS = -fPIC
 CONFORM_CFLAGS_ANSI = -ansi
-CONFORM_CFLAGS_STRICT = -ansi -pedantic
+CONFORM_CFLAGS_STRICT = -ansi
 CONFORM_CFLAGS_TRAD = -traditional
+PROF_CFLAGS_YES = -p
+GPROF_CFLAGS_YES = -pg
+CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
 WARN_CFLAGS_YES = -Wall
 WARN_CFLAGS_NO = -w
 OPT_CFLAGS_YES = -O3
 OPT_CFLAGS_NO = -g
 
-CODE_CXXFLAGS = -fPIC 
-CONFORM_CXXFLAGS_NORMAL = -ansi -pedantic
-CONFORM_CXXFLAGS_STRICT = -ansi -pedantic
-#WARN_CXXFLAGS_YES = -Wall -Weffc++
+CONFORM_CXXFLAGS_NORMAL = -ansi
+CONFORM_CXXFLAGS_STRICT = -ansi
+PROF_CXXFLAGS_YES = -p
+GPROF_CXXFLAGS_YES = -pg
+CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 WARN_CXXFLAGS_YES = -Wall
 WARN_CXXFLAGS_NO = -w
 OPT_CXXFLAGS_YES = -O3
 OPT_CXXFLAGS_NO = -g
 
+CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
+
 STATIC_LDFLAGS_YES = -static
 STATIC_LDFLAGS_NO =
 
-SHRLIB_LDFLAGS_YES =  -shared
-SHRLIB_LDFLAGS_NO =
+SHRLIB_CFLAGS = -fPIC
 

configure/CONFIG_ADDONS

@@ -23,28 +23,81 @@
 #		USR_CFLAGS_sun4 = -nil-
 #		USR_CFLAGS_DEFAULT = <defines for most systems, not sun4>
 #
-#	These rules apply to these Makefile-variables:
-#	USR_CFLAGS	C flags
-#	USR_CXXFLAGS	C++ flags
-#	USR_CPPFLAGS	c preprocesser flags
-#	INC		include-files to install
-#	LIBSRCS		source files for building library
-#	LIB_SRCS	source files for building library
-#	SHRLIB_LIBS	libs needed by shared LIBRARY
-#	PROD_LIBS	libs needed by PROD and TESTPROD
-#	USR_LIBS	libs needed by PROD and TESTPROD
-#	USR_LDFLAGS	ld flags
-#	SYS_PROD_LIBS	system libs needed by PROD and TESTPROD
-#	PROD		products to build and install
-#	SCRIPTS		scripts to install
-#	USR_INCLUDES	include directories
+#    These rules apply to these Makefile-variables:
+#    USR_CFLAGS    C flags
+#    USR_CXXFLAGS  C++ flags
+#    USR_CPPFLAGS  c preprocesser flags
+#    INC           include-files to install
+#    SRCS          source files for building libraries and prods
+#    USR_SRCS      source files for building libraries and prods
+#    PROD_SRCS     source files for building prods
+#    LIB_SRCS      source files for building libraries
+#    LIBSRCS       source files for building libraries (deprecated)
+#    PROD_OBJS     object files for building prods
+#    LIB_OBJS      object files for building libraries
+#    USR_LIBS      libs needed by PROD and TESTPROD and LIBRARY
+#    PROD_LIBS     libs needed by PROD and TESTPROD
+#    LIB_LIBS      libs needed by shared LIBRARY
+#    SHRLIB_LIBS   libs needed by shared LIBRARY
+#    USR_OBJLIBS   R3.13 vxWorks object libs needed building libraries and prods
+#    PROD_OBJLIBS  R3.13 vxWorks object    libs needed for building prods
+#    LIB_OBJLIBS   R3.13 vxWorks object libs needed for building libraries
+#    USR_SYS_LIBS  system libs needed building libraries and prods
+#    PROD_SYS_LIBS system libs needed for building prods
+#    LIB_SYS_LIBS  system libs needed for building libraries
+#    USR_LDFLAGS   ld flags for building libraries and prods
+#    PROD_LDFLAGS  ld flags for building prods
+#    LIB_LDFLAGS   ld flags for building libraries
+#    PROD          products to build and install
+#    PROD_HOST     products to build and install
+#    PROD_IOC      products to build and install
+#    TESTPROD      products to build and install
+#    TESTPROD_HOST products to build and install
+#    TESTPROD_IOC  products to build and install
+#    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
+#    OBJS          object files to build and install
+#    OBJS_HOST     host system object files to build and install
+#    OBJS_IOC      ioc system object files to build and install
+#    USR_INCLUDES  include directories
+#    BIN_INSTALLS  binaries to install
+#    RCS           win32 resource files for building libraries and prods
+#    PROD_RCS      win32 resource files for building prods
+#    LIB_RCS       win32 resource files for building libraries
 #
 #	Remark:
 #	If you define INC, e.g. INC = getopt.h, the source
 #	(getopt.h) must be in the source directory (..) and/or
 #	in one or more ../os/<OS_CLASS> directories.
-#	The INC source files cannot be created by the build.
 #
+#	Additional target architecture, T_A, Rules for USR_CFLAGS, USR_CXXFLAGS,
+#	and USR_CPPFLAGS which are applied before the above os_class Rules:
+#	1) USR_CFLAGS_$(OS_CLASS) is used
+#	2) if there is a special $(USR_CFLAGS_$(T_A)), it's
+#	   appended to 1)
+#	3) if there is no special defined, but a generic USR_CFLAGS_$(OS_CLASS)_DEFAULT,
+#	   this one is appended
+#	4) if you have the special case that your $(USR_CFLAGS_$(T_A)) is
+#	   empty but you don't want 3), you have to define it as '-nil-', e.g.:
+#		USR_CFLAGS_vxWorks = <defines for all OS_CLASS=vxWorks target systems>
+#		USR_CFLAGS_vxWorks-68040 = -nil-
+#		USR_CFLAGS_vxWorks_DEFAULT = <defines for most vxWorks systems, not 68040>
+#
+#
+
+ifneq ($(strip $(USR_CFLAGS_$(T_A))),)
+USR_CFLAGS_$(OS_CLASS)+=$(subst -nil-,,$(USR_CFLAGS_$(T_A)))
+else
+ifdef USR_CFLAGS_$(OS_CLASS)_DEFAULT
+USR_CFLAGS_$(OS_CLASS)+=$(USR_CFLAGS_$(OS_CLASS)_DEFAULT)
+endif
+endif
 
 ifneq ($(strip $(USR_CFLAGS_$(OS_CLASS))),)
 USR_CFLAGS+=$(subst -nil-,,$(USR_CFLAGS_$(OS_CLASS)))
@@ -62,6 +115,14 @@ USR_INCLUDES+=$(USR_INCLUDES_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(USR_CXXFLAGS_$(T_A))),)
+USR_CXXFLAGS_$(OS_CLASS)+=$(subst -nil-,,$(USR_CXXFLAGS_$(T_A)))
+else
+ifdef USR_CXXFLAGS_$(OS_CLASS)_DEFAULT
+USR_CXXFLAGS_$(OS_CLASS)+=$(USR_CXXFLAGS_$(OS_CLASS)_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(USR_CXXFLAGS_$(OS_CLASS))),)
 USR_CXXFLAGS+=$(subst -nil-,,$(USR_CXXFLAGS_$(OS_CLASS)))
 else
@@ -70,6 +131,14 @@ USR_CXXFLAGS+=$(USR_CXXFLAGS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(USR_CPPFLAGS_$(T_A))),)
+USR_CPPFLAGS_$(OS_CLASS)+=$(subst -nil-,,$(USR_CPPFLAGS_$(T_A)))
+else
+ifdef USR_CPPFLAGS_$(OS_CLASS)_DEFAULT
+USR_CPPFLAGS_$(OS_CLASS)+=$(USR_CPPFLAGS_$(OS_CLASS)_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(USR_CPPFLAGS_$(OS_CLASS))),)
 USR_CPPFLAGS+=$(subst -nil-,,$(USR_CPPFLAGS_$(OS_CLASS)))
 else
@@ -86,14 +155,19 @@ USR_LDFLAGS+=$(USR_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)))
+ifneq ($(strip $(PROD_LDFLAGS_$(OS_CLASS))),)
+PROD_LDFLAGS+=$(subst -nil-,,$(PROD_LDFLAGS_$(OS_CLASS)))
 else
-ifdef INC_DEFAULT
-INC += $(INC_DEFAULT)
+ifdef PROD_LDFLAGS_DEFAULT
+PROD_LDFLAGS+=$(PROD_LDFLAGS_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(LIB_LDFLAGS_$(OS_CLASS))),)
+LIB_LDFLAGS+=$(subst -nil-,,$(LIB_LDFLAGS_$(OS_CLASS)))
+else
+ifdef LIB_LDFLAGS_DEFAULT
+LIB_LDFLAGS+=$(LIB_LDFLAGS_DEFAULT)
 endif
 endif
 
@@ -123,6 +197,14 @@ SRCS+=$(SRCS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(USR_SRCS_$(OS_CLASS))),)
+USR_SRCS += $(subst -nil-,,$(USR_SRCS_$(OS_CLASS)))
+else
+ifdef USR_SRCS_DEFAULT
+USR_SRCS+=$(USR_SRCS_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(PROD_SRCS_$(OS_CLASS))),)
 PROD_SRCS += $(subst -nil-,,$(PROD_SRCS_$(OS_CLASS)))
 else
@@ -147,6 +229,14 @@ PROD_OBJS+=$(PROD_OBJS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(USR_OBJS_$(OS_CLASS))),)
+USR_OBJS+=$(subst -nil-,,$(USR_OBJS_$(OS_CLASS)))
+else
+ifneq (,$(strip $(USR_OBJS_DEFAULT)))
+USR_OBJS+=$(USR_OBJS_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(OBJS_$(OS_CLASS))),)
 OBJS+=$(subst -nil-,,$(OBJS_$(OS_CLASS)))
 else
@@ -171,11 +261,27 @@ OBJS_HOST+=$(OBJS_HOST_DEFAULT)
 endif
 endif
 
-ifneq ($(strip $(LDOBJS_$(OS_CLASS))),)
-LDOBJS+=$(subst -nil-,,$(LDOBJS_$(OS_CLASS)))
+ifneq ($(strip $(PROD_OBJLIBS_$(OS_CLASS))),)
+PROD_OBJLIBS+=$(subst -nil-,,$(PROD_OBJLIBS_$(OS_CLASS)))
 else
-ifneq (,$(strip $(LDOBJS_DEFAULT)))
-LDOBJS+=$(LDOBJS_DEFAULT)
+ifdef PROD_OBJLIBS_DEFAULT
+PROD_OBJLIBS+=$(PROD_OBJLIBS_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(LIB_OBJLIBS_$(OS_CLASS))),)
+LIB_OBJLIBS+=$(subst -nil-,,$(LIB_OBJLIBS_$(OS_CLASS)))
+else
+ifdef LIB_OBJLIBS_DEFAULT
+LIB_OBJLIBS+=$(LIB_OBJLIBS_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(USR_OBJLIBS_$(OS_CLASS))),)
+USR_OBJLIBS+=$(subst -nil-,,$(USR_OBJLIBS_$(OS_CLASS)))
+else
+ifdef USR_OBJLIBS_DEFAULT
+USR_OBJLIBS+=$(USR_OBJLIBS_DEFAULT)
 endif
 endif
 
@@ -211,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
@@ -219,6 +341,7 @@ PROD_LIBS += $(PROD_LIBS_DEFAULT)
 endif
 endif
 
+# SHRLIB_LIBS deprecated
 ifneq ($(strip $(SHRLIB_LIBS_$(OS_CLASS))),)
 SHRLIB_LIBS += $(subst -nil-,,$(SHRLIB_LIBS_$(OS_CLASS)))
 else
@@ -227,6 +350,14 @@ SHRLIB_LIBS += $(SHRLIB_LIBS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(LIB_LIBS_$(OS_CLASS))),)
+LIB_LIBS += $(subst -nil-,,$(LIB_LIBS_$(OS_CLASS)))
+else
+ifdef LIB_LIBS_DEFAULT
+LIB_LIBS += $(LIB_LIBS_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(USR_LIBS_$(OS_CLASS))),)
 USR_LIBS += $(subst -nil-,,$(USR_LIBS_$(OS_CLASS)))
 else
@@ -238,6 +369,7 @@ endif
 #
 #	concat specific library contents (if defined) to SYS_PROD_LIBS
 #
+# SYS_PROD_LIBS deprecated
 ifneq ($(strip $(SYS_PROD_LIBS_$(OS_CLASS))),)
 SYS_PROD_LIBS += $(subst -nil-,,$(SYS_PROD_LIBS_$(OS_CLASS)))
 else
@@ -245,6 +377,31 @@ ifdef SYS_PROD_LIBS_DEFAULT
 SYS_PROD_LIBS += $(SYS_PROD_LIBS_DEFAULT)
 endif
 endif
+PROD_SYS_LIBS+=$(SYS_PROD_LIBS)
+
+ifneq ($(strip $(PROD_SYS_LIBS_$(OS_CLASS))),)
+PROD_SYS_LIBS += $(subst -nil-,,$(PROD_SYS_LIBS_$(OS_CLASS)))
+else
+ifdef PROD_SYS_LIBS_DEFAULT
+PROD_SYS_LIBS += $(PROD_SYS_LIBS_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(LIB_SYS_LIBS_$(OS_CLASS))),)
+LIB_SYS_LIBS += $(subst -nil-,,$(LIB_SYS_LIBS_$(OS_CLASS)))
+else
+ifdef LIB_SYS_LIBS_DEFAULT
+LIB_SYS_LIBS += $(LIB_SYS_LIBS_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(USR_SYS_LIBS_$(OS_CLASS))),)
+USR_SYS_LIBS += $(subst -nil-,,$(USR_SYS_LIBS_$(OS_CLASS)))
+else
+ifdef USR_SYS_LIBS_DEFAULT
+USR_SYS_LIBS += $(USR_SYS_LIBS_DEFAULT)
+endif
+endif
 
 #
 #	concat specific products
@@ -338,3 +495,19 @@ RCS += $(RCS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(PROD_RCS_$(OS_CLASS))),)
+PROD_RCS += $(subst -nil-,,$(PROD_RCS_$(OS_CLASS)))
+else
+ifdef PROD_RCS_DEFAULT
+PROD_RCS+=$(PROD_RCS_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(LIB_RCS_$(OS_CLASS))),)
+LIB_RCS += $(subst -nil-,,$(LIB_RCS_$(OS_CLASS)))
+else
+ifdef LIB_RCS_DEFAULT
+LIB_RCS+=$(LIB_RCS_DEFAULT)
+endif
+endif
+

configure/CONFIG_BASE

@@ -21,28 +21,18 @@ ifdef T_A
 EPICS_BASE_LIB      = $(EPICS_BASE)/lib/$(T_A)
 endif
 
-#Definitions for extensions convenience
-Com_DIR             = $(EPICS_BASE_LIB)
-asHost_DIR          = $(EPICS_BASE_LIB)
-asIoc_DIR           = $(EPICS_BASE_LIB)
-ca_DIR              = $(EPICS_BASE_LIB)
-cas_DIR             = $(EPICS_BASE_LIB)
-dbIoc_DIR           = $(EPICS_BASE_LIB)
-dbStaticHost_DIR    = $(EPICS_BASE_LIB)
-dbStaticIoc_DIR     = $(EPICS_BASE_LIB)
-dbtoolsIoc_DIR      = $(EPICS_BASE_LIB)
-gdd_DIR             = $(EPICS_BASE_LIB)
-iocsh_DIR           = $(EPICS_BASE_LIB)
-miscIoc_DIR         = $(EPICS_BASE_LIB)
-registryIoc_DIR     = $(EPICS_BASE_LIB)
-rsrvIoc_DIR         = $(EPICS_BASE_LIB)
-recIoc_DIR          = $(EPICS_BASE_LIB)
-softDevIoc_DIR      = $(EPICS_BASE_LIB)
-testDevIoc_DIR      = $(EPICS_BASE_LIB)
-recIocObj_DIR       = $(EPICS_BASE_LIB)
-softDevIocObj_DIR   = $(EPICS_BASE_LIB)
-testDevIocObj_DIR   = $(EPICS_BASE_LIB)
-iocCore_DIR         = $(EPICS_BASE_LIB)
+#---------------------------------------------------------------
+# Epics base Ioc libraries 
+
+EPICS_BASE_IOC_LIBS += recIoc softDevIoc testDevIoc iocsh 
+EPICS_BASE_IOC_LIBS += miscIoc rsrvIoc dbtoolsIoc asIoc
+EPICS_BASE_IOC_LIBS += dbIoc registryIoc dbStaticIoc ca Com 
+
+#---------------------------------------------------------------
+# Epics base Host libraries 
+
+EPICS_BASE_HOST_LIBS += cas gdd iocsh asHost dbStaticHost
+EPICS_BASE_HOST_LIBS += ca Com
 
 #---------------------------------------------------------------
 # Version number for base shared libraries (and win32 products)
@@ -66,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,9 +18,9 @@
 
 EPICS_VERSION=3
 EPICS_REVISION=14
-EPICS_MODIFICATION=0
-EPICS_UPDATE_NAME=beta
-EPICS_UPDATE_LEVEL=2
+EPICS_MODIFICATION=3
+EPICS_UPDATE_NAME=
+EPICS_UPDATE_LEVEL=0
 
 EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}"
 

configure/CONFIG_COMMON

@@ -16,6 +16,10 @@
 #
 # Common Configuration Information
 
+#-------------------------------------------------------
+# Divider symbol
+DIVIDER = .
+
 #-------------------------------------------------------
 # Build architectures
 
@@ -29,58 +33,19 @@ CROSS2 = $(CROSS_COMPILER_TARGET_ARCHS$(filter-out 1,$(words $(filter $(EPICS_HO
 BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 
 #-------------------------------------------------------
-# Ext, app, and module configure dir targets
-CONFIG_TARGETS += CONFIG_APP_INCLUDE RULES_INCLUDE
-CONFIG_INSTALLS += ../RULES_BUILD
+# Default for perl if it's on the PATH,
+# otherwise override this in os/CONFIG_SITE.<host_arch>.Common
+PERL=perl
 
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
 CHECK_RELEASE_NO =
 
-#-------------------------------------------------------
-# Cross compile default, HOST or CROSS, CONFIG.crossCommon will override
-BUILD_CLASS = HOST
-
-#-------------------------------------------------------
-# Build defaults, CONFIG_SITE, CONFIG, or os/CONFIG* will override
-CMPLR=STRICT
-CXXCMPLR=STRICT
-STATIC_BUILD=NO
-SHARED_LIBRARIES=NO
-HDEPENDS=YES
-HOST_OPT=YES
-CROSS_OPT=YES
-HOST_WARN=YES
-CROSS_WARN=YES
-
-#-------------------------------------------------------
-# Prefix and suffix
-DEP=.depends
-DIVIDER = .
-OBJ = .
-RES = .
-
-#-------------------------------------------------------
-# Default for perl if it's on the PATH,
-# otherwise override this in os/CONFIG_SITE.<host_arch>.Common
-PERL=perl
-
-#-------------------------------------------------------
-# tools for installing libraries and products
-INSTALL = $(PERL) $(TOOLS)/installEpics.pl
-INSTALL_PRODUCT = $(INSTALL)
-INSTALL_LIBRARY = $(INSTALL)
-
-#---------------------------------------------------------------
-# tools for making header dependancies and variable replacement
-MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
-REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
-
 #-------------------------------------------------------
 # Directories
 
-INSTALL_LOCATION            = $(TOP)
+INSTALL_LOCATION            ?= $(TOP)
 TOOLS                       = $(CONFIG)/tools
 
 INSTALL_LOCATION_LIB        = $(INSTALL_LOCATION)/lib
@@ -108,6 +73,45 @@ INSTALL_SHRLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_TCLLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_BIN                 = $(INSTALL_LOCATION_BIN)/$(T_A)
 
+#-------------------------------------------------------
+# Ext, app, and module configure dir targets
+CONFIG_TARGETS += CONFIG_APP_INCLUDE RULES_INCLUDE
+CONFIG_INSTALLS += ../RULES_BUILD
+
+#-------------------------------------------------------
+# Cross compile default, HOST or CROSS, CONFIG.crossCommon will override
+BUILD_CLASS = HOST
+
+#-------------------------------------------------------
+# Build defaults, CONFIG_SITE, CONFIG, or os/CONFIG* will override
+CMPLR=STRICT
+CXXCMPLR=STRICT
+STATIC_BUILD=NO
+SHARED_LIBRARIES=YES
+HDEPENDS=YES
+HOST_OPT=YES
+CROSS_OPT=YES
+HOST_WARN=YES
+CROSS_WARN=YES
+GNU=NO
+
+#-------------------------------------------------------
+# Prefix and suffix
+DEP=.depends
+OBJ = .
+RES = .
+
+#-------------------------------------------------------
+# tools for installing libraries and products
+INSTALL = $(PERL) $(TOOLS)/installEpics.pl
+INSTALL_PRODUCT = $(INSTALL)
+INSTALL_LIBRARY = $(INSTALL)
+
+#---------------------------------------------------------------
+# tools for making header dependancies and variable replacement
+MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
+REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
+
 #--------------------------------------------------
 # vpath directories
 GENERIC_SRC_DIRS = .. $(SRC_DIRS)
@@ -136,13 +140,13 @@ JAR =
 #--------------------------------------------------
 # obj files
 
-TARGET_OBJS =  $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS)))
+TARGET_OBJS =  $($*_OBJLIBS) $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS)))
 
-PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(PROD_SRCS) $(PROD_OBJS)))
-PROD_LD_OBJS = $(LDOBJS) $(TARGET_OBJS) $(PRODUCT_OBJS)
+PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
+PROD_LD_OBJS = $(USR_OBJLIBS) $(PROD_OBJLIBS) $(TARGET_OBJS) $(PRODUCT_OBJS)
 
-LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(LIB_SRCS) $(LIBSRCS) $(LIB_OBJS)))
-LIBRARY_LD_OBJS = $(LDOBJS) $(TARGET_OBJS) $(LIBRARY_OBJS)
+LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS)))
+LIBRARY_LD_OBJS = $(USR_OBJLIBS) $(LIB_OBJLIBS) $(TARGET_OBJS) $(LIBRARY_OBJS)
 
 #--------------------------------------------------
 # WIN95/NT resource files
@@ -152,7 +156,7 @@ TARGET_RESS = $(addsuffix $(RES),$(basename $($*_RCS)))
 PROD_RESS = $(addsuffix $(RES),$(basename $(RCS) $(PROD_RCS)))
 PROD_LD_RESS = $(TARGET_RESS) $(PROD_RESS)
 
-LIBRARY_RESS = $(addsuffix $(RES),$(basename $(RCS) $(LIBRARY_RCS)))
+LIBRARY_RESS = $(addsuffix $(RES),$(basename $(RCS) $(LIB_RCS) $(LIBRARY_RCS)))
 LIBRARY_LD_RESS = $(TARGET_RESS) $(LIBRARY_RESS)
 
 #--------------------------------------------------
@@ -176,7 +180,6 @@ OP_SYS_CFLAGS =
 OP_SYS_CXXFLAGS = $(OP_SYS_CFLAGS)
 OP_SYS_LDFLAGS =
 OP_SYS_INCLUDES =
-OP_SYS_LDLIBS =
 
 # SOURCE* used by WIN32 only
 SOURCE_CFLAG =
@@ -192,38 +195,38 @@ USR_CPPFLAGS =
 USR_DBDFLAGS =
 USR_ARFLAGS =
 
+# Debug specific options
+DEBUG_CPPFLAGS =
+DEBUG_CFLAGS =
+DEBUG_CXXFLAGS = $(DEBUG_CFLAGS)
+DEBUG_LDFLAGS =
+DEBUG_LDLIBS =
+
 # Target specific options
-TARGET_INCLUDES = $($(basename $@)_INCLUDES_$(T_A)) $($(basename $@)_INCLUDES)
-TARGET_CFLAGS = $($(basename $@)_CFLAGS_$(T_A)) $($(basename $@)_CFLAGS)
-TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS_$(T_A)) $($(basename $@)_CXXFLAGS)
-TARGET_LDFLAGS = $($(basename $@)_LDFLAGS_$(T_A)) $($(basename $@)_LDFLAGS)
-TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS_$(T_A)) $($(basename $@)_CPPFLAGS)
+TARGET_INCLUDES = $($(basename $@)_INCLUDES_$(T_A))
+TARGET_CFLAGS = $($(basename $@)_CFLAGS_$(T_A))
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS_$(T_A))
+TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS_$(T_A))
 
 TARGET_INCLUDES += $($(basename $@)_INCLUDES_$(OS_CLASS)) $($(basename $@)_INCLUDES)
 TARGET_CFLAGS += $($(basename $@)_CFLAGS_$(OS_CLASS)) $($(basename $@)_CFLAGS)
 TARGET_CXXFLAGS += $($(basename $@)_CXXFLAGS_$(OS_CLASS)) $($(basename $@)_CXXFLAGS)
-TARGET_LDFLAGS += $($(basename $@)_LDFLAGS_$(OS_CLASS)) $($(basename $@)_LDFLAGS)
 TARGET_CPPFLAGS += $($(basename $@)_CPPFLAGS_$(OS_CLASS)) $($(basename $@)_CPPFLAGS)
 
+TARGET_LDFLAGS = $($*_LDFLAGS)
+
 # Level of ansi conformance flags
-CONFORM_CPPFLAGS = $(CONFORM_CPPFLAGS_$(firstword $($(basename $@)_CMPLR_$(T_A)) \
- $($(basename $@)_CMPLR_$(OS_CLASS)) $($(basename $@)_CMPLR) $(CMPLR)))
-CONFORM_CFLAGS = $(CONFORM_CFLAGS_$(firstword $($(basename $@)_CMPLR_$(T_A)) \
- $($(basename $@)_CMPLR_$(OS_CLASS)) $($(basename $@)_CMPLR) $(CMPLR)))
-CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_$(firstword $($(basename $@)_CMPLR_$(T_A)) \
- $($(basename $@)_CMPLR_$(OS_CLASS)) $($(basename $@)_CMPLR) $(CXXCMPLR)))
+CONFORM_CPPFLAGS = $(CONFORM_CPPFLAGS_$(CMPLR))
+CONFORM_CFLAGS = $(CONFORM_CFLAGS_$(CMPLR))
+CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_$(CMPLR))
 
 # Warnings flags
-WARN_CFLAGS = $(WARN_CFLAGS_$(firstword $($(basename $@)_WARN_$(T_A)) \
- $($(basename $@)_WARN_$(OS_CLASS)) $($(basename $@)_WARN) $($(BUILD_CLASS)_WARN)))
-WARN_CXXFLAGS = $(WARN_CXXFLAGS_$(firstword $($(basename $@)_WARN_$(T_A)) \
- $($(basename $@)_WARN_$(OS_CLASS)) $($(basename $@)_WARN) $($(BUILD_CLASS)_WARN)))
+WARN_CFLAGS = $(WARN_CFLAGS_$($(BUILD_CLASS)_WARN))
+WARN_CXXFLAGS = $(WARN_CXXFLAGS_$($(BUILD_CLASS)_WARN))
 
 # Optimization flags
-OPT_CFLAGS = $(OPT_CFLAGS_$(firstword $($(basename $@)_OPT_$(T_A)) \
- $($(basename $@)_OPT_$(OS_CLASS)) $($(basename $@)_OPT) $($(BUILD_CLASS)_OPT)))
-OPT_CXXFLAGS = $(OPT_CXXFLAGS_$(firstword $($(basename $@)_OPT_$(T_A)) \
- $($(basename $@)_OPT_$(OS_CLASS)) $($(basename $@)_OPT) $($(BUILD_CLASS)_OPT)))
+OPT_CFLAGS = $(OPT_CFLAGS_$($(BUILD_CLASS)_OPT))
+OPT_CXXFLAGS = $(OPT_CXXFLAGS_$($(BUILD_CLASS)_OPT))
 
 # Posix flags
 POSIX=YES
@@ -236,6 +239,17 @@ STATIC_CXXCFLAGS = $(STATIC_CXXFLAGS_$(STATIC_BUILD))
 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)))
+LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)
+
+#--------------------------------------------------
+# Command-line input support default
+COMMANDLINE_LIBRARY = EPICS
+OP_SYS_LDLIBS += $(LDLIBS_$(COMMANDLINE_LIBRARY))
+OP_SYS_LDFLAGS += $(LDFLAGS_$(COMMANDLINE_LIBRARY))
+
 #--------------------------------------------------
 # Flags
 
@@ -244,17 +258,18 @@ INCLUDES = -I. $(GENERIC_SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
 
 CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
  $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
- $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS)
+ $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
 CXXFLAGS = $(CONFORM_CXXFLAGS) $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
  $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
- $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS)
+ $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(PROD_LDFLAGS)\
- $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)
+LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
+ $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)\
+ $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
-LDLIBS = $(PROD_LDLIBS) $(STATIC_LDLIBS)\
- $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(OP_SYS_LDLIBS)
+LDLIBS = $(STATIC_LDLIBS)\
+ $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)
 
 CPPFLAGS += $(CONFORM_CPPFLAGS) $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS)\
  $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
@@ -290,7 +305,7 @@ HDEPENDS_CMD  = $(HDEPENDS_CMD_$(HDEPENDS))
 # depends definition
 
 TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(LIBRARY), $($(name)_SRCS))
-SRC_FILES =  $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(PROD_SRCS) $(TARGET_SRCS)
+SRC_FILES =  $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(TARGET_SRCS)
 HDEPENDS_FILES_YES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES))))
 HDEPENDS_FILES  = $(HDEPENDS_FILES_$(HDEPENDS))
 
@@ -304,6 +319,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)/%)
@@ -337,6 +353,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
@@ -364,5 +381,5 @@ COMMON_INC += $(filter $(COMMON_DIR)/%, $(foreach file, $(INC), \
 SOURCE_INC = $(wildcard $(file) $(SOURCE_INC_bbb) )
 SOURCE_INC_bbb = $(foreach dir, $(ALL_SRC_DIRS), $(SOURCE_INC_aaa)  )
 SOURCE_INC_aaa = $(addsuffix /$(file), $(dir) )
-
+ 
 endif

configure/CONFIG_ENV

@@ -29,140 +29,22 @@
 #  Default environment settings
 
 # Channel Access:
-# EPICS_CA_ADDR_LIST 
-#   Augment beacon/search dest ip addr list
-#   from white space separated ip addresses in this
-#   environment variable. "Quote" if more than one addr.
-#
-# EPICS_CA_AUTO_ADDR_LIST 
-#   YES = augment beacon/search dest ip
-#   addr list from network interfaces found; NO = only use
-#   EPICS_CA_ADDR_LIST to create this list.
-#
-# EPICS_CA_CONN_TMO 
-#   after not seeing a server beacon for this number
-#   of seconds the clients will send an echo request over
-#   tcp/ip to verify the connection.
-#
-# EPICS_CA_REPEATER_PORT CA repeater port number.
-#
-# EPICS_CA_SERVER_PORT CA server port number.
-#
-# EPICS_CA_MAX_ARRAY_BYTES
-#   This parameter specifies the size (in bytes) of the largest array 
-#   that will transport through CA. It must be specified for both the 
-#   client and the server library. 
-#
-
+# Details are in the CA reference manual 
+# (see CAref.html in this distribution)
 EPICS_CA_ADDR_LIST=""
 EPICS_CA_AUTO_ADDR_LIST=YES
 EPICS_CA_CONN_TMO=30.0
 EPICS_CA_REPEATER_PORT=5065
 EPICS_CA_SERVER_PORT=5064
 EPICS_CA_MAX_ARRAY_BYTES=16384
-
-#
-# These parameters are only used by the CA server library
-#
-# EPICS_CA_BEACON_PERIOD 
-#   The quiescent sec between server beacons.
-#
-# EPICS_CAS_INTF_ADDR_LIST
-#   This specifies a list of IP addresses identifying
-#   a limited set of network interfaces for server communication. 
-#
-#   Specifically, this parameter specifies the interfaces from
-#   which the server will accept TCP/IP connections. It also 
-#   specifies that UDP search messages addressed to both
-#   the IP addresses in EPICS_CAS_INTF_ADDR_LIST and also to
-#   the broadcast addresses of corresponding LAN interfaces
-#   will be accepted by the server. If this parameter is empty 
-#   then all UDP search messages and TCP connection requests
-#   addressed to the host are accepted. 
-#
-#   If EPICS_CA_AUTO_ADDR_LIST is NO, then the beacon address list
-#   is not auto configured.
-#
-#   If EPICS_CA_AUTO_ADDR_LIST is YES and EPICS_CAS_INTF_ADDR_LIST
-#   has _not_ been specified then beacons are sent to the broadcast 
-#   addresses of all LAN interfaces and the destination addresses of 
-#   all point-to-point serial interfaces. 
-#
-#   If EPICS_CA_AUTO_ADDR_LIST is YES and EPICS_CAS_INTF_ADDR_LIST
-#   _has_ been specified then beacons are sent to the broadcast address 
-#   of each LAN interface corresponding to an IP address in 
-#   EPICS_CAS_INTF_ADDR_LIST or the destination address of 
-#   a point-to-point serial interfaces corresponding to an IP
-#   address in EPICS_CAS_INTF_ADDR_LIST. 
-#
-#   Beacons may be sent to additional hand configured addresses 
-#   (see the notes below under EPICS_CAS_BEACON_ADDR_LIST).
-#
-# EPICS_CAS_BEACON_ADDR_LIST
-#   If this parameter is specified, or if EPICS_CAS_INTF_ADDR_LIST 
-#   isnt empty, then this parameter is used by the server library to 
-#   augment the list of addresses beacons are sent to. Otherwise
-#   EPICS_CA_ADDR_LIST is used to augment the list of addresses 
-#   beacons are sent to.
-#
-# EPICS_CAS_SERVER_PORT
-#   If this parameter is specified then it
-#   and not EPICS_CA_SERVER_PORT is used to determine the server's
-#   port number. It is possible to have multiple servers on the
-#   same host on the same EPICS_CAS_SERVER_PORT port if the IP
-#   kernel is modern (if it has multicast enhancements). In this
-#   situation all servers will share the same user specified 
-#   UDP port number and will be assigned unique TCP port numbers. 
-#
-#   The fact that the servers may not be using the user specified
-#   port number for TCP will be nearly transparent to EPICS 
-#   3.13 or higher clients that will be locating the servers
-#   using the user specified UDP port number, but will be connecting 
-#   to the servers using whatever TCP port has been assigned.
-#   Unfortunately, a severe limitation exists in most IP
-#   kernels: if multiple servers are listening for search requests 
-#   addressed to the same UDP port then they will all receive a copy 
-#   of each UDP message received by the IP kernel that has a broadcast
-#   destination address. Unfortunately, in many IP kernel 
-#   implementations only one of the servers will receive UDP
-#   messages with a single host (unicast) destination address.
-#
-#   If experiencing trouble getting clients to connect
-#   --------------------------------------------------
-#
-#   o Make sure that the broadcast addresses are identical on the
-#   server's host and on the client's host. This can be checked 
-#   on UNIX with "netstat -i" or "ifconfig -a"; on vxWorks with
-#   ifShow; and on windows with ipconfig.
-#   
-#   o Make sure that the client and server are using the same UDP
-#   port. Check the server's port by running "netstat -a | grep nnn"
-#   where nnn is the port number involved. If you do not set 
-#   EPICS_CA_SERVER_PORT or EPICS_CAS_SERVER_PORT then the default port 
-#   will be 5064.
-#   
-#   o Two servers can run on the same host with the same server port number
-#   if the following restrictions are understood (good luck). If the host has a
-#   modern IP kernel it is possible to have two servers on the same UDP port.
-#   It is not possible for two servers to run on the same host using the same 
-#   TCP IP server port. If the CA server library detects that a 2nd server is 
-#   attempting to start on the same port as an existing CA server then both 
-#   servers will use the same UDP port if it is a modern IP kernel, and the 2nd 
-#   server will be allocated a new TCP port. In this situation the clients will 
-#   still be configured to use the same port number for both servers. The clients
-#   will find the 2nd server via the shared UDP port, and transparently connect 
-#   to the 2nd server's allocated TCP port. Be aware that If there are two server's 
-#   running on the same host on the same UDP port then they will both receive all 
-#   UDP search requests sent as broadcasts, but will unfortunately (due to a common
-#   weakness of most IP kernel implementations) only one of the servers will 
-#   typically receive UDP search requests sent to unicast addresses (i.e. a specific 
-#   host's ip address). 
-#
-
 EPICS_CA_BEACON_PERIOD=15.0
-EPICS_CAS_INTF_ADDR_LIST=""
+EPICS_CAS_BEACON_PERIOD=
+EPICS_CAS_BEACON_PORT=
+EPICS_CAS_AUTO_BEACON_ADDR_LIST=""
 EPICS_CAS_BEACON_ADDR_LIST=""
 EPICS_CAS_SERVER_PORT=
+EPICS_CAS_INTF_ADDR_LIST=""
+EPICS_CAS_IGNORE_ADDR_LIST=""
 
 # Log Server:
 # EPICS_IOC_LOG_PORT Log server port number etc.

configure/CONFIG_SITE

@@ -23,7 +23,8 @@
 #       <operating system>-<architecture>[-<alternate compiler>]
 #
 #  Currently Supporting:
-#	hpux-parisc
+#	hpux-parisc            (HP compiler used for host builds)
+#	hpux-parisc-gnu        (GNU compiler used for host builds)
 #	osf-alpha
 #	solaris-sparc          (sun compiler used for host builds)
 #	solaris-sparc-gnu      (GNU compiler used for host builds)
@@ -34,10 +35,19 @@
 #	win32-x86              (MS Visual C++ compiler used for host builds)
 #	win32-x86-borland      (Borland C++ compiler used for host builds)
 #	lynxos-x86
-#
-#  EPICS_HOST_ARCH is an environment variable
-#  EPICS_HOST_ARCH=$(shell /usr/local/epics/startup/EpicsHostArch)
+#	darwin-ppc
+#	linux-mpc82xx
 
+#  Debugging builds 
+#	linux-x86-debug			(GNU compiler with -g option for host builds)
+#	solaris-sparc-debug		(sun compiler with -g option for host builds)
+#	win32-x86-debug			(MS Visual C++ compiler with debug option for host builds)
+
+
+#  EPICS_HOST_ARCH is a required environment variable
+#  Do not set EPICS_HOST_ARCH in this file. 
+#  Use base/startup files to set EPICS_HOST_ARCH or 
+#  set EPICS_HOST_ARCH on the GNU make command line.
 
 #  The cross-compiler architectures to build EPICS for
 #
@@ -48,18 +58,21 @@
 #       vxWorks-68060
 #       vxWorks-pentium
 #       vxWorks-ppc603
+#       vxWorks-ppc603_long
 #       vxWorks-ppc604
+#       vxWorks-ppc604_long
 #       RTEMS-gen68360
 #       RTEMS-mvme167
 #       RTEMS-pc386
+#       RTEMS-mcp750
+#       RTEMS-psim
 #
 # Definitions of CROSS_COMPILER_TARGET_ARCHS in
 # configure/os/CONFIG_SITE.<host>.Common files will
 # override 
 #
-#CROSS_COMPILER_TARGET_ARCHS=
-CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040 vxWorks-ppc604
-
+CROSS_COMPILER_TARGET_ARCHS=
+#CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040
 
 #  If only a subset of the host architectures perform
 #  the build for the CROSS_COMPILER_TARGET_ARCHS
@@ -81,21 +94,19 @@ CMPLR=STRICT
 CXXCMPLR=STRICT
 
 #  Build shared libraries?
-#  (archive libraries will also be built)
 #        must be either YES or NO
 #     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. CONFIG_SITE.Host.WIN32
-#                 distribution file contains YES override
+#     NOTE WIN32: YES results in a DLL.  Valid settings are
+#                   SHARED_LIBRARIES=YES and STATIC_BUILD=NO
+#                   SHARED_LIBRARIES=NO  and STATIC_BUILD=YES
 #
-#     NOTE solaris,Linux, and sun4: If YES then LD_LIBRARY_PATH must
-#     include fullpathname to $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH)
-#     for both the base build and when invoking base executables
-SHARED_LIBRARIES=NO
+SHARED_LIBRARIES=YES
 
 #  Build client objects statically ?
 #        must be either YES or NO
+#
 STATIC_BUILD=NO
 
 #  Should header dependancy files be automatically generated
@@ -120,4 +131,5 @@ HOST_WARN=YES
 CROSS_WARN=YES
 
 #  Installation directory
-INSTALL_LOCATION=$(TOP)
+#Note: INSTALL_LOCATION definition moved to configure/RELEASE file
+

configure/CONFIG_SITE_ENV

@@ -30,10 +30,13 @@
 # Time service:
 # EPICS_TIMEZONE needed for vxWorks
 # 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
 # EPICS_TS_NTP_INET ntp or Unix time server ip addr.
 
-EPICS_TIMEZONE=CUS::360:033102:102802
+EPICS_TIMEZONE=CUS::360:040602:102602
 EPICS_TS_NTP_INET=
 
 

configure/Makefile

@@ -23,4 +23,6 @@ CONFIGS += $(subst ../,,$(wildcard ../RULES*))
 
 CONFIGS += $(subst ../,,$(wildcard ../tools/*.pl))
 
+TARGETS = CONFIG_APP_INCLUDE
+
 include $(TOP)/configure/RULES

configure/RELEASE

@@ -13,3 +13,7 @@
 
 #  Tornado directory
 VX_DIR = /usr/local/vw/tornado202
+
+# If you don't want to install into $(TOP) dir then 
+# define INSTALL_LOCATION here
+#INSTALL_LOCATION=<fullpathname>

configure/RULES.Db

@@ -13,9 +13,9 @@
 
 vpath %.dbd $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DBD)) $(COMMON_DIR)
 vpath %.db $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB)) $(COMMON_DIR)
+vpath %.vdb $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB)) $(COMMON_DIR)
 vpath %.substitutions $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 vpath %.template $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
-vpath %.edf $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 vpath bpt%.data $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 
 ##################################################### dbdflags
@@ -51,7 +51,22 @@ SOURCE_DB_aaa = $(addsuffix /$(file), $(dir) )
 COMMONS = $(COMMON_DIR)/*.dbd $(COMMON_DIR)/*.db $(COMMON_DIR)/*.h \
           $(COMMON_DIR)/*.substitutions $(COMMON_DIR)/*.template
 
-PREFIX=$(shell echo $* | sed -e 's-[0-9]--g' | sed -e 's-\.db--g')
+# Remove trailing numbers (to 99) on stem
+TEMPLATE1=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(patsubst %4,%, \
+          $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
+          $*))))))))))
+TEMPLATE2=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(patsubst %4,%, \
+          $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
+          $(TEMPLATE1)))))))))))
+TEMPLATE3=$(addsuffix .template,$(addprefix ../,$(TEMPLATE2)))
+TEMPLATE_FILENAME=$(firstword $(wildcard $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3)) $(TEMPLATE3))
+
+# dbst based database optimization
+ifeq '$(DB_OPT)' 'YES'
+RAW=.raw
+COMMON_DBS = $(addprefix $(COMMON_DIR)/,$(filter %.db,$(DB)))
+COMMON_DBS += $(addsuffix $(RAW),$(addprefix $(COMMON_DIR)/,$(filter %.db,$(DB))))
+endif
 
 #####################################################  dependancies
 
@@ -79,10 +94,10 @@ COMMONS = $(DBD) $(DB)
 
 all:    install
 
-buildInstall : build
-
 install: buildInstall
 
+buildInstall : build
+
 rebuild: clean install
 
 .PHONY: all inc build install clean rebuild buildInstall
@@ -97,16 +112,26 @@ $(DBDDEPENDS_FILES):
 
 #####################################################  build dependancies, clean rule
 
+ifdef DBD_INSTALLS
+buildInstall : dbdInstalls
+endif
+
+ifdef DB_INSTALLS
+buildInstall : dbInstalls
+endif
+
+.PHONY: dbdInstalls dbInstalls
+
 inc : $(COMMON_INC) $(INSTALL_INC)
 
 build : $(COMMON_DBDS) $(COMMON_DBS) \
 	$(INSTALL_DBDS) $(INSTALL_DBS) \
-	$(DBDDEPENDS_FILES) $(INDDBFROMTEMPLATE) $(TARGETS)
+	$(DBDDEPENDS_FILES) $(TARGETS)
 
 clean:: 
 	@$(RM) $(COMMONS) $(DBDDEPENDS_FILES)
 	@$(RM) *_registerRecordDeviceDriver.cpp
-	@$(RM) $(INDDBFROMTEMPLATE) $(TARGETS)
+	@$(RM) $(TARGETS)
 
 ##################################################### "Foreign" templates
 
@@ -133,7 +158,7 @@ endif
 $(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS) 
 	@$(RM) $@
 	@if [ ! -f cad.rc -a -r ../cad.rc ] ; then ln -s ../cad.rc ; fi
-	$(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) $<
+	$(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) -o $@  $<
 
 ##################################################### Substitution files
 
@@ -145,17 +170,25 @@ $(COMMON_DIR)/%.substitutions:
 	@$(CREATESUBSTITUTIONS) $(COMMON_DIR)/$*
 endif
 
-.PRECIOUS: $(DB:%.db=$(COMMON_DIR)/%.substitutions)
+$(INSTALL_DB)/%.substitutions: %.substitutions
+	@echo "Installing db file $@"
+	@$(INSTALL) -d -m 644 $< $(@D)
+
+.PRECIOUS: $(COMMON_DIR)/%.substitutions
 
 ##################################################### Template files
 
-$(COMMON_DIR)/%.template: %.edf 
+$(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf 
 	@$(RM) $@
 	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $@.VAR $<
 	@$(REPLACEVAR) < $@.VAR > $@
 	@$(RM) $@.VAR
 
-.PRECIOUS: $(DB:%.db=$(COMMON_DIR)/%.template)
+$(INSTALL_DB)/%.template: %.template
+	@echo "Installing db file $@"
+	@$(INSTALL) -d -m 644 $< $(@D)
+
+.PRECIOUS: $(COMMON_DIR)/%.template
 
 ##################################################### INC files
 
@@ -178,32 +211,39 @@ $(COMMON_DIR)/%.dbd: %Include.dbd
 	@$(DBDDEPENDS_CMD)
 	@echo "Expanding dbd"
 	@$(RM) $@
-	$(DBEXPAND) $(DBDFLAGS) $< > $@
+	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
 
 $(INSTALL_DBD)/%: %
 	@echo "Installing dbd file $@"
 	@$(INSTALL) -d -m 644 $< $(@D)
 
+dbdInstalls:  $(DBD_INSTALLS)
+	@echo "Installing $(^F)"
+	@$(INSTALL) -d -m 555 $^ $(INSTALL_DBD)
+
 .PRECIOUS: $(COMMON_DBDS)
 
 ##################################################### DB files
 
-$(COMMON_DIR)/%.db$(RAW): %.edf 
+$(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf 
 	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $@.VAR $<
 	@$(REPLACEVAR) < $@.VAR > $@
 	@$(RM) $@.VAR
 
-$(COMMON_DIR)/%.db$(RAW): %.substitutions %.template
+# dbst based database optimization
+$(COMMON_DIR)/%.db$(RAW): %.substitutions
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
+	@echo "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
 	@echo "Inflating database from $<"
 	@$(RM) $@
-	$(MSI) -S $^  > $@
+	$(MSI) -S$< $(TEMPLATE_FILENAME) > msi.tmp
+	$(MV) msi.tmp $@
 
 # dbst based database optimization
 ifeq '$(DB_OPT)' 'YES'
 
-$(COMMON_DIR)/%.db$(RAW): %.db 
+$(COMMON_DIR)/%.db$(RAW): ../%.db
 	@$(RM) $@
 	$(CP) $< $@
 
@@ -212,28 +252,31 @@ $(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
 	@$(RM) $@
 	$(DBST) . $< -d > $@
 
-$(INDDBFROMTEMPLATE):%.db: %.substitutions
-	$(RM) $@
-ifndef WIN32
-	$(MSI) -S$*.substitutions $(PREFIX).template > $@
-endif
-
-RAW=.raw
+$(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
+	@echo "Installing db file $@"
+	@$(INSTALL) -d -m 644 $< $(@D)
 
+.PRECIOUS: $(COMMON_DIR)/%.db
 .PRECIOUS: $(DB:%=$(COMMON_DIR)/%$(RAW))
-endif
+else
 
 $(INSTALL_DB)/%: %
 	@echo "Installing db file $@"
 	@$(INSTALL) -d -m 644 $< $(@D)
+endif
 
+dbInstalls:  $(DB_INSTALLS)
+	@echo "Installing $(^F)"
+	@$(INSTALL) -d -m 555 $^ $(INSTALL_DB)
+
+.PRECIOUS: $(COMMON_DIR)/%.edf
 .PRECIOUS: $(COMMON_DBS)
 
 ##################################################### register record,device,driver support
 
 %_registerRecordDeviceDriver.cpp: %.dbd 
 	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $< > $@
+	$(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) > $@
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
 

configure/RULES.ioc

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

configure/RULES_ARCHS

@@ -15,7 +15,7 @@ all: install
 
 build install buildInstall: $(CHECK_RELEASE_$(CHECK_RELEASE))
 
-rebuild: clean all
+rebuild: clean install
 
 ACTIONS = inc
 ACTIONS += build
@@ -29,6 +29,8 @@ archPart = $(word 2, $(subst $(DIVIDER), ,$@))
 actionArchTargets = $(foreach x, $(ACTIONS),\
 		$(foreach arch,$(BUILD_ARCHS), $(x)$(DIVIDER)$(arch)))
 
+cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch))
+
 buildDirs = $(addprefix O.,$(BUILD_ARCHS))
 
 $(actionArchTargets) : $(buildDirs) O.Common
@@ -54,15 +56,15 @@ checkRelease: $(wildcard $(TOP)/configure/RELEASE*)
 clean ::
 	$(RMDIR) $(addprefix O.,$(BUILD_ARCHS)) O.Common
 
-clean$(DIVIDER)% :: 
-	$(RMDIR) O.$*
+$(cleanArchTargets) ::
+	$(RMDIR) O.$(archPart)
 
 realclean :: 
 	$(RMDIR) O.*
 
-.PHONY : $(buildActionTargets)
-.PHONY : $(buildActionArchTargets)
-.PHONY : $(buildArchs)
+.PHONY : $(actionArchTargets)
+.PHONY : $(cleanArchTargets)
+.PHONY : $(BUILD_ARCHS)
 .PHONY : $(ACTIONS) clean realclean all
 .PHONY : checkRelease
 

configure/RULES_BUILD

@@ -11,31 +11,8 @@
 #
 #	Rules for making things specified in Makefile
 #
-#	Some rules for filename-massage are system specific
-#	and have "ifdefs" here instead of using definitions
-#	from CONFIG.Target.<arch>  -  sorry about this,
-#	but so far the rules are quite similar on all systems
-#	except WIN32 has some specials.
-#
-#	Maybe there is a way to use indentation to make it
-#	easier to read this file?
-#
-#	Most things may also work if you say e.g.
-#		VAR+=ADD
-#	even if ADD is not there, but this way "VAR" would
-#	be defined in any case, that's why I try to use
-#		ifdef ADD
-#		VAR+=ADD
-#		endif
-#
-#	-kuk-
-
 #	we are in O.$(OS_CLASS), but most sources are one dir above:
 #
-#	The use of VPATH (no suffix specification) caused everything
-#	to break several times.
-#	vpath, of course, has the disadvantage that we need explicit rules
-#	for scripts or similar os-specific filed which have _no_ suffix...
 
 ifndef BASE_RULES_BUILD
 BASE_RULES_BUILD=1
@@ -59,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)
@@ -97,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
@@ -116,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)
@@ -130,19 +108,19 @@ endif
 
 #	Main targets
 
-inc : $(COMMON_INC) $(INSTALL_INC)
-
-build : inc 
+install: buildInstall 
 
 buildInstall : build 
 
-install: buildInstall 
-
 rebuild: clean install
 
+build : inc 
+
 build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
 	$(TARGETS)
 
+inc : $(COMMON_INC) $(INSTALL_INC)
+
 buildInstall : \
 	$(INSTALL_SCRIPTS) $(INSTALL_PROD) $(INSTALL_MUNCHS) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
@@ -160,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)
@@ -175,18 +153,6 @@ $(DIRECTORY_TARGETS) :
 	$(MKDIR) -p $@
 
 #---------------------------------------------------------------
-#---------------------------------------------------------------
-#	Generic Rules for 'simple' targets that
-#	can be generated from a single source with same basename.
-#
-#	The usual two rules .c* -> $(OBJ) and then  $(OBJ) -> $(EXE)
-#	do not work because the $(OBJ)->$(EXE) rule wouldn't
-#	know if the original source was C or C++.
-#
-#	Hint: The $(subst...) construct removes the .c or .cpp
-#	      as well as the '../' from the filename and adds $(OBJ):
-#	      e.g.  $< = '../abc.c'   ->  'abc.o'
-#
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!
 
@@ -201,7 +167,7 @@ $(OBJLIBNAME):%$(OBJ): $(OBJLIB_LD_OBJS)
 
 %_ctdt$(OBJ) : %_ctdt.c
 	@$(RM) $@
-	$(COMPILE.c) -traditional $<
+	$(COMPILE.ctdt) $<
 
 %$(OBJ): %.c
 	@$(HDEPENDS_CMD)
@@ -295,14 +261,18 @@ ifneq ($(strip $(RANLIB)),)
 	$(RANLIB) $@
 endif # RANLIB
 
-$(DLL_LINK_LIBNAME):$(LIB_PREFIX)%.lib: $(LIBRARY_OBJS) $(LIBRARY_RESS)
+$(DLL_LINK_LIBNAME):$(LIB_PREFIX)%.lib: $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) 
 	@$(RM) $@
 	$(LINK.shrlib)
 
-$(SHRLIBNAME):$(LIB_PREFIX)%$(SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS)
+$(SHRLIBNAME):$(LIB_PREFIX)%$(SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
 	@$(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) $@
@@ -375,6 +345,10 @@ $(INSTALL_TCLLIB)/%: ../%
 	@$(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)

configure/RULES_DIRS

@@ -33,9 +33,9 @@ actionArchTargets = $(foreach action, $(ACTIONS),\
                     $(foreach arch, $(ARCHS), \
                     $(action)$(DIVIDER)$(arch)))
 
-all : buildInstall
+all : install
 
-rebuild : clean all
+rebuild : clean install
 
 $(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
 	$(MAKE) -C $(dirPart) $(actionArchPart)

configure/RULES_JAVA

@@ -16,7 +16,7 @@
 
 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)
 
 JAVACCMD = $(subst \,/,$(JAVA_BIN)/javac$(EXE) $(CLASSPATH) $(SOURCEPATH) $(JAVACFLAGS))
 JAVAHCMD = $(subst \,/,$(JAVA_BIN)/javah$(EXE) -d $(COMMON_DIR) -force $(CLASSPATH) $(JAVAHFLAGS))
@@ -29,18 +29,19 @@ CLASSPATH=-classpath $(INSTALL_JAVA)$(addprefix :,$(USR_CLASSPATH))
 SOURCEPATH=-sourcepath .:..:../..
 
 #-------------------------------------------------------
-# Java install directory
+# Java directory
 
-INSTALL_JAVA = $(INSTALL_LOCATION)/javalib
+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
@@ -68,33 +69,43 @@ else
 JAR_OPTIONS = cvf
 endif
 
+#-------------------------------------------------------
+# Java doc  definitions
+ifdef JAVADOC
+JAVADOCFLAGS += $(USR_JAVADOCFLAGS)
+JAVADOCCMD = $(subst \,/,$(JAVA_BIN)/javadoc$(EXE) $(CLASSPATH) $(SOURCEPATH) $(JAVADOCFLAGS))
+INSTALL_JAVADOC = $(addprefix $(INSTALL_HTML)/,$(JAVADOC))/index.html
+endif
+
 #-------------------------------------------------------
 # Java rules
 
 all:    install
 
+install: buildInstall
+
+buildInstall : build
+
+rebuild: clean install
+
 inc:  $(JAVA_DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(COMMON_JAVAINC)
 
 build: inc
 
 build:  $(COMMON_TESTCLASSES) $(COMMON_JAR)
 
-buildInstall : build
-
-buildInstall : $(INSTALL_JAR)
-
-install: buildInstall
-
-rebuild: clean install
+buildInstall : $(INSTALL_JAR) $(INSTALL_JAVADOC)
 
 #This clean works only from O.* dirs.
 clean:: 
 	@$(RMDIR) $(INSTALL_CLASSES)
-	@$(RM) $(INSTALL_JAR)
+	@$(RM) $(INSTALL_JAR) $(INSTALL_JAVADOC)
 	@$(RM) $(COMMON_TESTCLASSES) $(COMMON_JAR) $(COMMON_JAVAINC)
 
+ifdef JAVA_DIRECTORY_TARGETS
 $(JAVA_DIRECTORY_TARGETS):
 	$(MKDIR) -p $@
+endif
 
 $(COMMON_JAVAINC):$(JAVAINC_CLASSFILES)
 	@echo Creating header files $(COMMON_JAVAINC)
@@ -111,6 +122,11 @@ $(INSTALL_CLASSES): $(addprefix ../,$(DEPJAVA))
 	@$(RM) $@
 	$(JAVACCMD) -d $(INSTALL_JAVA) $^
 
+$(INSTALL_JAVADOC): $(addprefix ../,$(JAVA))
+	@echo Creating java doc files 
+	@$(RM) $@
+	$(JAVADOCCMD) -d $(addprefix $(INSTALL_HTML)/,$(JAVADOC)) $^
+
 $(COMMON_DIR)/%.jar: $(JARDEPFILES)
 	@echo Creating java jar file $@
 	@$(RM) $@
@@ -120,3 +136,7 @@ $(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/RULES_TOP

@@ -13,8 +13,11 @@
 
 include $(CONFIG)/RULES_DIRS
 
-uninstall$(DIVIDER)%: uninstallDirs
-	@$(RMDIR) $(INSTALL_LOCATION_BIN)/$* $(INSTALL_LOCATION_LIB)/$* 
+uninstallArchTargets = $(foreach arch,$(BUILD_ARCHS), uninstall$(DIVIDER)$(arch))
+archPart = $(word 2, $(subst $(DIVIDER), ,$@))
+
+$(uninstallArchTargets): uninstallDirs
+	@$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart) $(INSTALL_LOCATION_LIB)/$(archPart) 
 
 cleandirs:
 	@echo " " #stops "nothing to be done for cleandirs" message
@@ -67,5 +70,6 @@ help:
 	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY : uninstall help cleandirs distclean uninstallDirs realuninstall realclean distclean
+.PHONY : $(uninstallArchTargets)
+.PHONY : uninstall help cleandirs distclean uninstallDirs realuninstall
 

configure/Sample.Makefile

@@ -52,14 +52,12 @@ a_file_CPPFLAGS_WIN32   = -DVERSION='WIN32 port'
 #
 #	In here you supply just the filename without '../' etc.
 #	While building in an O.xxx subdir, the
-#	sources are extracted from either the
-#	             '..'
-#	dir or - if it exists - the dir
-#	             '../$(OS_CLASS)'
-#	is preferred.
+#	sources are extracted from the
+#   ../os/$(OS_CLASS) directory if it exists, or
+#   ../os/default directory if it exists, or
+#	.. directory
 #	---------------------------------------------------------
 
-
 #	includes to install from this Makefile
 #
 #	again: if INC_$(OS_CLASS) is defined, it is added to INC,
@@ -101,10 +99,11 @@ libname_SRCS_DEFAULT    = posix.c
 libname_SRCS_WIN32      = win32_special.c
 libname_SRCS_Linux      = -nil-
 #
-LIBSRCS         = file_for_lib.c another_file.cpp
-LIBSRCS_DEFAULT = posix.c
-LIBSRCS_WIN32   = win32_special.c
-LIBSRCS_Linux   = -nil-
+#	SRCS that are used for all libraries
+LIB_SRCS         = file_for_lib.c another_file.cpp
+LIB_SRCS_DEFAULT = posix.c
+LIB_SRCS_WIN32   = win32_special.c
+LIB_SRCS_Linux   = -nil-
 
 #	Library to build:
 #	lib$(LIBRARY).a  or   ..dll/..exp/..lib
@@ -113,13 +112,9 @@ LIBRARY=libname
 #
 #	Host or Ioc platform specific library to build:
 #
-LIBRARY_IOC=libname
-LIBRARY_HOST=libname
+LIBRARY_IOC=libnameIoc
+LIBRARY_HOST=libnameHost
 
-# if SHARED_LIBRARIES is YES then shared and archive libraries will
-#	both be built 
-#SHARED_LIBRARIES = YES
-#
 #	Library version
 SHRLIB_VERSION = 
 #	On WIN32 results in /version:$(SHRLIB_VERSION) link option
@@ -132,10 +127,15 @@ SHRLIB_VERSION =
 #	if SRCS is undefined, it defaults to $(PROD).c 
 SRCS=a.c b.c c.c
 
+#	SRCS that are used for all PRODs
+#
+PROD_SRCS = ppp.c qqq.c
+
 #	SRCS that are only used for PROD a_file
 #
 a_file_SRCS = aa.c bb.c
 
+#
 #	EPICS libs needed to link PROD, TESTPROD and sharable library
 #
 #	note that DLL_LIBS (the libraries needed to link a shareable
@@ -143,33 +143,41 @@ a_file_SRCS = aa.c bb.c
 #	below minus the name of the sharable library (LIBRARY)
 #	
 #
-# for all systems:
+# ----------  libraries for a specific product pppp
+# for all systems
+pppp_LIBS         = Com Ca
+# for most systems:
+pppp_LIBS_DEFAULT = mathlib
+pppp_LIBS_WIN32   = -nil-
+
+# ---------- libraries for all products
+# for all systems
 PROD_LIBS         = Com Ca
 # for most systems:
 PROD_LIBS_DEFAULT = mathlib
 PROD_LIBS_WIN32   = -nil-
 
-#	system libs needed to link PROD, TESTPROD and sharable library
-#
-# for all systems:
-SYS_PROD_LIBS     = m
-# for most systems:
-SYS_PROD_LIBS_DEFAULT = foolib
-SYS_PROD_LIBS_WIN32   = -nil-
-
-#	other libs needed to link PROD, TESTPROD and sharable library
-#
-# for all systems:
+# ---------- Libraries for all products and all libraries:
+# for all systems
 USR_LIBS     = Xm Xt X11
 Xm_DIR = $(MOTIF_LIB)
 Xt_DIR = $(X11_LIB)
 X11_DIR = $(X11_LIB)
 
-# for most systems:
+# for most systems
 USR_LIBS_DEFAULT = foolib
 USR_LIBS_WIN32   = -nil-
 foolib_DIR = $(FOO_LIB)
 
+#	system libs needed to link PROD, TESTPROD and sharable library
+#
+# ---------- system libraries for all products
+# for all systems:
+PROD_SYS_LIBS     = m
+# for most systems:
+PROD_SYS_LIBS_DEFAULT = foolib
+PROD_SYS_LIBS_WIN32   = -nil-
+
 #	Product,
 #	may be   caRepeater.o -> caRepeater
 #	or       caRepeater.obj -> caRepeater.exe
@@ -179,6 +187,9 @@ PROD_WIN32   = product_only_for_WIN32
 PROD_Linux   = product_only_for_Linux
 PROD_solaris = product_only_for_solaris
 
+PROD_HOST    = product_only_for_host_type_systems
+PROD_IOC     = product_only_for_ioc_type_systems
+
 #	Product version
 PROD_VERSION = 
 #	On WIN32 results in /version:$(SHRLIB_VERSION) link option

configure/os/CONFIG.Common.RTEMS

@@ -34,8 +34,7 @@ CCC = $(RTEMS_BASE)/bin/$(CXX)
 CPP = $(RTEMS_BASE)/bin/$(CC_FOR_TARGET) -x c -E
 AR = $(RTEMS_BASE)/bin/$(AR_FOR_TARGET)
 LD = $(RTEMS_BASE)/bin/$(LD_FOR_TARGET) -r
-RTEMS_LDFLAGS := $(LDFLAGS)
-LINK.cpp = $(CCC) -o $@ $(RTEMS_LDFLAGS) $(LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(LDLIBS)
+
 RANLIB := $(RTEMS_BASE)/bin/$(RANLIB)
 
 #-------------------------------------------------------
@@ -47,27 +46,29 @@ VALID_BUILDS = Ioc
 # through the following contortions to get the EPICS flags back.
 CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
  $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
- $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS)
+ $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
 CXXFLAGS = $(CONFORM_CXXFLAGS) $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
  $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
  $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS)\
- $(CROSS_CXXFLAGS)
+ $(LIBRARY_SRC_CFLAGS)
 
-LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(PROD_LDFLAGS)\
- $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)
+LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
+ $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)\
+ $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
-LDLIBS = $(PROD_LDLIBS) $(STATIC_LDLIBS)\
- $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(OP_SYS_LDLIBS)
+LDLIBS = $(STATIC_LDLIBS)\
+ $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)
 
-CPPFLAGS += $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS) $(BASE_CPPFLAGS)\
- $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
- $(OP_SYS_CPPFLAGS) $(CODE_CPPFLAGS)
+CPPFLAGS += $(CONFORM_CPPFLAGS) $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS)\
+$(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
+ $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_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>)
@@ -75,8 +76,8 @@ OS_CLASS = RTEMS
 
 #--------------------------------------------------
 # Operating system flags
-OP_SYS_LDLIBS = -lrtemscpu -lrtemsCom -lreadline -lcurses -lm
-OP_SYS_LDFLAGS = $(CPU_CFLAGS) -u Init \
+OP_SYS_LDLIBS += -lrtemsCom -lrtemscpu -lCom -lm
+OP_SYS_LDFLAGS += $(CPU_CFLAGS) -u Init \
                  $(PROJECT_RELEASE)/lib/no-dpmem.rel \
                  $(PROJECT_RELEASE)/lib/no-mp.rel \
                  $(PROJECT_RELEASE)/lib/no-part.rel \
@@ -91,10 +92,15 @@ CODE_CFLAGS =
 CODE_CXXFLAGS =
 
 #--------------------------------------------------
-# RTEMS uses the inline keyword, so get rid of pedantic warnings
+# RTEMS uses the inline keyword so -pedantic causes too many problems.
 CONFORM_CFLAGS_STRICT = -ansi
 CONFORM_CXXFLAGS_STRICT = -ansi
 
+#--------------------------------------------------
+# Command-line input support
+COMMANDLINE_LIBRARY = LIBTECLA
+LDLIBS_LIBTECLA = -ltecla_r -lncurses
+
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mcp750

@@ -0,0 +1,10 @@
+#
+# $Id$
+# Author: W. Eric Norum
+#         Canadian Light Source
+#         eric@cls.usask.ca
+#
+# All RTEMS targets use the same Makefile fragment
+#
+RTEMS_TARGET_CPU=ppc
+include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-psim

@@ -0,0 +1,10 @@
+#
+# $Id$
+# Author: W. Eric Norum
+#         University of Saskatchewan
+#         eric.norum@usask.ca
+#
+# All RTEMS targets use the same Makefile fragment
+#
+RTEMS_TARGET_CPU=ppc
+include $(CONFIG)/os/CONFIG.Common.RTEMS

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$(addprefix .,$(SHRLIB_VERSION))
+LOADABLE_SHRLIB_PREFIX = lib
 
 #-------------------------------------------------------
 #	names of libraries to build 
@@ -31,40 +33,60 @@ 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
-SHRLIB_DEPLIBS = $(foreach lib,$(SHRLIB_LIBS),$(firstword $(wildcard  \
-$($(lib)_DIR)/$(LIB_PREFIX)$(lib).*)))
 
-SHRLIB_LDFLAGS = $(SHRLIB_LDFLAGS_$(strip $(SHARED_LIBRARIES)))
-SHRLIB_LDLIBS = $($*_LDLIBS:%=-l%) $(SHRLIB_LIBS:%=-l%) \
- $($*_SYS_LIBS:%=-l%) $(SYS_SHRLIB_LIBS:%=-l%)
+# 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_SUFFIX), \
+    $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
+
+SHRLIB_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS) \
+ $($*_SYS_LIBS) $(LIB_SYS_LIBS) $(USR_SYS_LIBS)) $(LDLIBS)
 
 SHRLIB_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(SHRLIB_DEPLIBS))
-SHRLIB_LDFLAGS += $(sort $(SHRLIB_DEPLIB_DIRS:%=-L%))
+SHRLIBDIR_LDFLAGS += $(sort $(SHRLIB_DEPLIB_DIRS:%=-L%))
 
-#--------------------------------------------------
+#-------------------------------------------------------
 # Prod: DEPLIBS, LDFLAGS, and LDLIBS definitions
-PROD_DEPLIBS = $(foreach lib,$(PROD_LIBS) $(USR_LIBS),$(firstword $(wildcard  \
-$($(lib)_DIR)/$(LIB_PREFIX)$(lib).*)))
 
-PROD_LDLIBS = $($*_LDLIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\
- $($*_SYS_LIBS:%=-l%) $(SYS_PROD_LIBS:%=-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_SUFFIX), \
+    $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
+
+PROD_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(PROD_LIBS) $(USR_LIBS)\
+ $($*_SYS_LIBS) $(PROD_SYS_LIBS) $(USR_SYS_LIBS))
+
+LDLIBS_STATIC_YES = LDLIBS
+LDLIBS_SHARED_NO = LDLIBS
+PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \
+               $(LDLIBS_SHARED_$(SHARED_LIBRARIES))))
 
 PROD_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(PROD_DEPLIBS))
-PROD_LDFLAGS += $(sort $(PROD_DEPLIB_DIRS:%=-L%))
+PRODDIR_LDFLAGS += $(sort $(PROD_DEPLIB_DIRS:%=-L%))
+
+#--------------------------------------------------
+# Link definitions
+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
 OP_SYS_CPPFLAGS += -DUNIX 
 OP_SYS_LDLIBS += -lm
 
-#--------------------------------------------------
-# Link definitions
-LINK.cpp = $(CCC) -o $@ $(LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(LDLIBS)
-LINK.shrlib = $(CCC) -o $@ $(SHRLIB_LDFLAGS) $(LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
-
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.UnixCommon

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

@@ -10,12 +10,15 @@
 # Include definitions common to all Unix targets
 include $(CONFIG)/os/CONFIG.Common.UnixCommon
 
+#
+# Set OS-specific information
+#
 OS_CLASS = Darwin
 ARCH_CLASS = ppc
 
 #
 # Special flags for Darwin
-#   No common blocks (as required when going to shared libraries)
+#   No common blocks (as required when using shared libraries)
 #
 OP_SYS_CFLAGS += -fno-common
 
@@ -25,21 +28,31 @@ OP_SYS_CFLAGS += -fno-common
 CPPSNCFLAGS += -no-cpp-precomp
 
 #
-# Need to get some fink-installed packages (readline, etc.).
-# If you don't have readline on your system you must remove
-# or comment out these lines and make the appropriate changes
-# to src/libCom/osi/os/Darwin/osdReadline.h
+# The following two definitions enable the use of DarwinPorts packages.
 #
-OP_SYS_CPPFLAGS += -I$(FINK_DIR)/include
-OP_SYS_LDFLAGS += -L$(FINK_DIR)/lib
-OP_SYS_LDLIBS += -lreadline
+OP_SYS_CPPFLAGS += -I/opt/local/include
+OP_SYS_LDFLAGS += -L/opt/local/lib
 
 #
-# Stuff that will be needed when going to shared libraries
+# The following two definitions enable the use of Fink packages.
 #
-SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
-       -install_name $(EPICS_BASE)/lib/$(HOST_ARCH)/$@ \
-       -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_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
+OP_SYS_CPPFLAGS += -I/sw/include
+OP_SYS_LDFLAGS += -L/sw/lib
+
+#
+# Libraries for command-line editing.
+#
+LDLIBS_LIBTECLA = -ltecla_r -lncurses
+LDLIBS_READLINE = -lreadline
+
+#
+# Command-line input support
+#
+# Install the DarwinPorts or Fink libtecla1 package and place the following
+# line in CONFIG_SITE.darwin-ppc.Common to use libtecla command-line editing:
+#COMMANDLINE_LIBRARY=LIBTECLA
+# or install the DarwinPorts or Fink readline package and place the following
+# line in CONFIG_SITE.darwin-ppc.Common to use GNU readline
+# command-line editing:
+#COMMANDLINE_LIBRARY=READLINE
+

configure/os/CONFIG.Common.hpux-parisc

@@ -13,21 +13,24 @@ include $(CONFIG)/os/CONFIG.Common.UnixCommon
 OS_CLASS = hpux
 ARCH_CLASS = parisc
 
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES +=
-POSIX_LDLIBS_NO +=
+# Posix stuff is not set here as "-mt" (in CONFIG.hpux-parisc.hpux-parisc)
+# does all defines and linker options to make posix threads work
 
-OP_SYS_CPPFLAGS = -D_HPUX_SOURCE -DHP_UX
-OP_SYS_CFLAGS = +z
-OP_SYS_CXXFLAGS = +z
-OP_SYS_LDLIBS += -lpthread
+OP_SYS_CPPFLAGS = -DHP_UX
+OP_SYS_CFLAGS = -D_HPUX_SOURCE 
+OP_SYS_CXXFLAGS =
 
-SHRLIB_SUFFIX = .sl
+SHRLIB_SUFFIX = .sl$(addprefix .,$(SHRLIB_VERSION))
+LOADABLE_SHRLIB_SUFFIX = .sl$(addprefix .,$(SHRLIB_VERSION))
+LOADABLE_SHRLIB_PREFIX =
+
+# Set runtime path for shared libraries
+empty:=                                      # trick from the make docs...
+space:= $(empty) $(empty)
+RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_DIRS))),+s
 
 ifdef CROSS
    GNU_TARGET=parisc-hp-unix
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
 endif
-

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

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

configure/os/CONFIG.Common.linux-mpc82xx

@@ -13,7 +13,7 @@ ARCH_CLASS = mpc82xx
 
 CODE_CPPFLAGS = -D_REENTRANT
 
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS
+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 =
@@ -21,14 +21,18 @@ 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 = -lreadline -lcurses -lrt
+OP_SYS_LDFLAGS +=
+OP_SYS_LDLIBS = -lrt
 
 #ARCH_DEP_CPPFLAGS += -D_X86_
 
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
+
 ifdef CROSS
    GNU_TARGET=ppc_82xx
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
 endif
 
+

configure/os/CONFIG.Common.linux-x86

@@ -15,25 +15,24 @@ ARCH_CLASS = x86
 
 CODE_CPPFLAGS = -D_REENTRANT
 
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS
+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 = -lreadline -lcurses -lrt
+OP_SYS_LDLIBS += -lrt
 
 ARCH_DEP_CPPFLAGS += -D_X86_
 ARCH_DEP_CFLAGS += -mcpu=pentium
 
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
+
 ifdef CROSS
    GNU_TARGET=i586-pc-linux-gnu
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
 endif
 
-#Allow R3.13 built extensions to load R3.14 shared libs
-SYS_SHRLIB_LIBS += pthread readline curses rt

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

@@ -0,0 +1,33 @@
+# 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_
+ARCH_DEP_CFLAGS += -mcpu=pentium
+
+RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
+
+ifdef CROSS
+   GNU_TARGET=i586-pc-linux-gnu
+   CMPLR_SUFFIX=
+   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
+endif
+

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

@@ -0,0 +1,12 @@
+# CONFIG.Common.linux-x86-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86 with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.Common.linux-x86-debug
+#-------------------------------------------------------
+
+# Include definitions common to all linux-x86  target archs
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+

configure/os/CONFIG.Common.osf-alpha

@@ -21,7 +21,6 @@ POSIX_CPPFLAGS_NO =
 POSIX_LDLIBS_NO +=
 
 OP_SYS_CPPFLAGS = -D_OSF_SOURCE
-OP_SYS_LDLIBS +=
 
 ifdef CROSS
    GNU_TARGET=alpha-osf

configure/os/CONFIG.Common.solaris-sparc

@@ -13,26 +13,22 @@ include $(CONFIG)/os/CONFIG.Common.UnixCommon
 OS_CLASS = solaris
 ARCH_CLASS = sparc
 
-CODE_CPPFLAGS = -D__EXTENSIONS__
+CODE_CPPFLAGS = -D__EXTENSIONS__ 
 
-# This is the only combination of posix threads flags that works with solaris 6
-####POSIX_CPPFLAGS_YES = -D_REENTRANT -D_POSIX_C_SOURCE=199506L
-####POSIX_LDLIBS_YES += -lposix4 -lpthread -lthread
+SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 
-# This set of flags is recommended by sun for posix threads and works with solaris 8
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L
-POSIX_LDLIBS_YES += -lposix4 -lpthread
+# Flags for solaris 6
+POSIX_CPPFLAGS_YES_6 += -D_REENTRANT
 
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_NO +=
+POSIX_CPPFLAGS_YES += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION))
+POSIX_CPPFLAGS_YES += -D_XOPEN_SOURCE=500
+POSIX_LDLIBS_YES_6 += -lthread
+POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION))
 
-OP_SYS_CPPFLAGS = -DSOLARIS=$(subst 5.,,$(shell uname -r))
-# socket and nsl needed by libca.a
-OP_SYS_LDLIBS += -lsocket -lnsl
+OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION)
 
-#  -R does not work unless full path names are specified
-# use loader's -R option
-PROD_LDFLAGS += $(sort $(DEPLIB_DIRS:%=-R%))
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
 
 ifdef CROSS
    GNU_TARGET=sparc-sun-solaris2
@@ -40,6 +36,16 @@ ifdef CROSS
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
 endif
 
-#Allow R3.13 built extensions to load R3.14 shared libs
-SYS_SHRLIB_LIBS += posix4 pthread Crun
+OP_SYS_LDLIBS += -lsocket -lnsl
+OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
+OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+GNU_DIR = /opt/gnu
+INCLUDES_READLINE = -I$(GNU_DIR)/include
+LDFLAGS_READLINE += -R$(GNU_DIR)/lib
+LDFLAGS_READLINE += -L$(GNU_DIR)/lib
+LDLIBS_READLINE = -lreadline -lcurses
+# Use archive if there is a problem with the readline shared library
+#LDLIBS_READLINE = -Bstatic -lreadline -Bdynamic -lcurses
 

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

@@ -0,0 +1,12 @@
+# CONFIG.Common.solaris-sparc-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc-debug
+#-------------------------------------------------------
+
+# Include definitions common to all solaris-sparc  target archs
+include $(CONFIG)/os/CONFIG.Common.solaris-sparc
+

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

@@ -9,4 +9,7 @@
 
 # Include definitions common to all solaris-sparc  target archs
 include $(CONFIG)/os/CONFIG.Common.solaris-sparc
+# CONFIG.Common.solaris-sparc
+
+OP_SYS_LDLIBS_8 = -lc
 

configure/os/CONFIG.Common.solaris-x86

@@ -15,21 +15,21 @@ ARCH_CLASS = x86
 
 CODE_CPPFLAGS = -D__EXTENSIONS__
 
-# This is the only combination of posix threads flags that works on solaris-sparc with solaris 6
-#POSIX_CPPFLAGS_YES = -D_REENTRANT -D_POSIX_C_SOURCE=199506L
-#POSIX_LDLIBS_YES += -lposix4 -lpthread -lthread
+SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 
-# This set of flags is recommended by sun for posix threads and works with solaris 8
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L
-POSIX_LDLIBS_YES += -lposix4 -lpthread
+# Flags for solaris 6
+POSIX_CPPFLAGS_YES_6 += -D_REENTRANT
 
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_NO +=
+POSIX_CPPFLAGS_YES += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION))
+POSIX_CPPFLAGS_YES += -D_XOPEN_SOURCE=500
+POSIX_LDLIBS_YES_6 += -lthread
+POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION))
 
-OP_SYS_CPPFLAGS = -DSOLARIS=$(subst 5.,,$(shell uname -r))
+OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION)
 ARCH_DEP_CPPFLAGS = -D_X86_
-# socket and nsl needed by libca.a
-OP_SYS_LDLIBS += -lsocket -lnsl
+
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
 
 ifdef CROSS
    GNU_TARGET=x86-sun-solaris2
@@ -37,6 +37,6 @@ ifdef CROSS
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
 endif
 
-#Allow R3.13 built extensions to load R3.14 shared libs
-SYS_SHRLIB_LIBS += posix4 pthread Crun
-
+OP_SYS_LDLIBS += -lsocket -lnsl
+OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
+OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))

configure/os/CONFIG.Common.sun4-x86

@@ -15,19 +15,22 @@ ARCH_CLASS = x86
 
 CODE_CPPFLAGS = -D__EXTENSIONS__
 
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L
-POSIX_LDLIBS_YES += -lpthread -lthread
+POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500
 POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_NO +=
+POSIX_LDLIBS_YES += -lpthread -lthread
 
 OP_SYS_CPPFLAGS = -DSUNOS4
-OP_SYS_LDLIBS += -lsocket -lnsl
 
 ARCH_DEP_CPPFLAGS += -D_X86_
 
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
+
 ifdef CROSS
    GNU_TARGET=x86-sun-sunos4
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
 endif
 
+OP_SYS_LDLIBS += -lsocket -lnsl
+

configure/os/CONFIG.Common.vxWorks-ppc603

@@ -3,8 +3,8 @@
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for vxWorks-ppc604 target archs
-# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc604
+# Definitions for vxWorks-ppc603 target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc603
 #-------------------------------------------------------
 
 # Include definitions common to all vxWorks target archs

configure/os/CONFIG.Common.vxWorks-ppc603_long

@@ -0,0 +1,21 @@
+# CONFIG.Common.vxWorks-ppc603_long
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-ppc603 target archs with at least 32MB
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc603_long
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks target archs
+include $(CONFIG)/os/CONFIG.Common.vxWorksCommon
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+ 
+ARCH_CLASS = ppc
+
+# Architecture specific build flags
+ARCH_DEP_CPPFLAGS = -DCPU=PPC603  
+ARCH_DEP_CFLAGS = -mcpu=603 -mstrict-align -mlongcall
+

configure/os/CONFIG.Common.vxWorks-ppc604

@@ -16,6 +16,6 @@ CMPLR_SUFFIX = ppc
 ARCH_CLASS = ppc
 
 # Architecture specific build flags
-ARCH_DEP_CPPFLAGS = -DCPU=PPC604 
+ARCH_DEP_CPPFLAGS = -DCPU=PPC604
 ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align
 

configure/os/CONFIG.Common.vxWorks-ppc604_long

@@ -0,0 +1,21 @@
+# CONFIG.Common.vxWorks-ppc604_long
+#
+# $Id
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-ppc604 target archs with at least 32MB
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc604_long
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks target archs
+include $(CONFIG)/os/CONFIG.Common.vxWorksCommon
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+ 
+ARCH_CLASS = ppc
+
+# Architecture specific build flags
+ARCH_DEP_CPPFLAGS = -DCPU=PPC604
+ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align -mlongcall
+

configure/os/CONFIG.Common.vxWorksCommon

@@ -29,14 +29,19 @@ LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX))
 
 #--------------------------------------------------
 # Prod: DEPLIBS, LDFLAGS, and LDLIBS definitions
-PROD_DEPLIBS = $(foreach lib,$(PROD_LIBS) $(USR_LIBS),$(firstword $(wildcard  \
-$($(lib)_DIR)/$(LIB_PREFIX)$(lib).*)))
 
-PROD_LDLIBS = $($*_LDLIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\
- $($*_SYS_LIBS:%=-l%) $(SYS_PROD_LIBS:%=-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_SUFFIX), \
+    $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
+
+
+PROD_LDLIBS = $(addprefix -l,$($*_LDLIBS) $(PROD_LIBS) $(USR_LIBS)\
+ $($*_SYS_LIBS) $(PROD_SYS_LIBS) $(USR_SYS_LIBS))
 
 PROD_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(PROD_DEPLIBS))
-PROD_LDFLAGS += $(sort $(PROD_DEPLIB_DIRS:%=-L%))
+PRODDIR_LDFLAGS += $(sort $(PROD_DEPLIB_DIRS:%=-L%))
 
 #-------------------------------------------------------
 # Prod definitions
@@ -47,10 +52,11 @@ NMS = $(PRODNAME:%$(EXE)=%.nm)
 
 #-------------------------------------------------------
 # R3.13 compatability object library definitions
+# Does not allow $*_SRCS or $*_OBJS. Allows only OBJLIB_SRCS and OBJLIB_OBJS.
 OBJLIB += $(OBJLIB_$(OS_CLASS))
 OBJLIB_SUFFIX = Library.o
 OBJLIBNAME = $(addsuffix $(OBJLIB_SUFFIX),$(basename $(OBJLIB)))
-OBJLIB_LD_OBJS = $(addsuffix $(OBJ),$(basename $(OBJLIB_SRCS) $(OBJLIB_OBJS)))
+OBJLIB_LD_OBJS += $(addsuffix $(OBJ),$(basename $(OBJLIB_SRCS) $(OBJLIB_OBJS)))
 PRODTARGETS += $(OBJLIBNAME)
 INSTALL_PROD += $(OBJLIBNAME:%=$(INSTALL_BIN)/%)
 OBJLIB_MUNCHNAME += $(OBJLIBNAME:%$(OBJ)=%$(MUNCH_SUFFIX))
@@ -60,7 +66,6 @@ CTDT_SRCS += $(OBJLIBNAME:%$(OBJ)=%_ctdt.c)
 CTDT_OBJS += $(OBJLIBNAME:%$(OBJ)=%_ctdt$(OBJ))
 NMS += $(OBJLIBNAME:%$(OBJ)=%.nm)
 OBJLIB_LINK.cpp = $(LD) -o $@ $(OBJLIB_LD_OBJS)
-TARGET_SRCS += $(foreach name, $(OBJLIB), $($(name)_SRCS))
 SRC_FILES += $(OBJLIB_SRCS)
 
 #--------------------------------------------------
@@ -79,13 +84,17 @@ NM = $(GNU_BIN)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
 export WIND_BASE = $(VX_DIR)
 export WIND_HOST_TYPE
 
+#--------------------------------------------------
+# Tornado2.2 
+# The follow export allows vxWorks.h to include gnu header files
+export TOOL_FAMILY = GNU
+
 #--------------------------------------------------
 # Operating system flags
-OP_SYS_CPPFLAGS = -DvxWorks
-OP_SYS_CFLAGS = -fno-builtin
-#OP_SYS_CFLAGS = -fno-builtin -fdollars-in-identifiers
-OP_SYS_LDFLAGS =
-OP_SYS_LDLIBS =
+OP_SYS_CPPFLAGS += -DvxWorks
+OP_SYS_CFLAGS += -fno-builtin
+#OP_SYS_CFLAGS += -fno-builtin -fdollars-in-identifiers
+OP_SYS_LDFLAGS +=
 
 # Fix for vxWorks headers using macros defined in
 # vxWorks.h but not including vxWorks.h 
@@ -106,13 +115,24 @@ CODE_CXXFLAGS = -fno-implicit-templates
 POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
 POSIX_CPPFLAGS_NO =
 
+#--------------------------------------------------
+# no shared libs for vxWorks
+SHRLIB_CFLAGS = 
+SHRLIB_LDFLAGS = 
+
 #--------------------------------------------------
 # osithead use default stack, YES or NO override
 OSITHREAD_USE_DEFAULT_STACK = NO
 
 #--------------------------------------------------
 # Link definitions
-LINK.cpp = $(LD) -o $@ $(LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(LDLIBS)
+LINK.cpp = $(LD) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
+LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
+
+#--------------------------------------------------
+# Definitions for compile of *_ctdt.c file
+CFLAGS_ctdt = $(filter-out -pedantic,$(CFLAGS)) -fdollars-in-identifiers
+COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_FLAG)
 
 #--------------------------------------------------
 # Allow site overrides

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

@@ -15,16 +15,11 @@ ARCH_CLASS = x86
 
 EXE=.exe
 
-POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS
-POSIX_CPPFLAGS_NO =
-#####POSIX_LDLIBS_YES = -lpthread
-#####POSIX_LDLIBS_YES = -lthread
-POSIX_LDLIBS_NO =
-
-# -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp.
-OP_SYS_CPPFLAGS += -DCYGWIN32 -U_WIN32
-OP_SYS_LDFLAGS =
-####OP_SYS_LDLIBS = -lreadline -lcurses -lrt
+#POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS -D_POSIX_TIMERS
+# _POSIX_SOURCE eliminates select()
+POSIX_CPPFLAGS_YES = -D_POSIX_THREADS -D_POSIX_TIMERS
+#POSIX_LDLIBS_YES += -lpthread
 
 ARCH_DEP_CPPFLAGS += -D_X86_
 
+OP_SYS_CPPFLAGS += -DCYGWIN32 -U_WIN32

configure/os/CONFIG.UnixCommon.Common

@@ -14,12 +14,5 @@ RM = rm -f
 MKDIR = mkdir
 RMDIR = rm -rf
 
-# Set LD_LIBRARY_PATH for shared library builds
-ifneq ($(EPICS_BASE),$(INSTALL_LOCATION))
-export LD_LIBRARY_PATH := $(INSTALL_HOST_LIB):$(EPICS_BASE_HOST_LIB):$(LD_LIBRARY_PATH)
-else
-export LD_LIBRARY_PATH := $(INSTALL_HOST_LIB):$(LD_LIBRARY_PATH)
-endif
-
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.UnixCommon.Common

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

@@ -0,0 +1,10 @@
+# CONFIG.aix-ppc.Common
+#
+# This file is maintained by the build community.
+#
+# 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

@@ -14,6 +14,18 @@ GNU_DIR = /usr
 CC = $(GNU_BIN)/cc
 CCC = $(GNU_BIN)/c++
 
+#
+# Darwin shared libraries
+#
+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 = .$(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.
 #
@@ -21,7 +33,14 @@ CODE_CFLAGS =
 CODE_CXXFLAGS = 
 
 #
-# -O3 is too agressive on Darwin with the April, 2002 Developer Tools
+# Add support for Objective-C source
 #
-OPT_CFLAGS_YES = -O2
-OPT_CXXFLAGS_YES = -O2
+vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
+%.o: %.m
+	$(COMPILE.c) -c $<
+
+#
+# Pedantic produces way too many unnecessary messages
+#
+CONFORM_CFLAGS_STRICT=-ansi
+CONFORM_CXXFLAGS_STRICT=-ansi