fix for mantis 350

vulnerable if the following function indicates recv bytes are pending but
recv blocks anyways.

osiSockIoctl_t bytesPending = 0;
int status = socket_ioctl ( this->sock, FIONREAD, & bytesPending );

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 1991-2004 University of Chicago and The Regents of the
+Copyright (c) 1991-2007 UChicago Argonne LLC and The Regents of the
 University of California. All rights reserved.
 
 EPICS BASE is distributed subject to the following license conditions:

Makefile

@@ -14,10 +14,16 @@
 TOP = .
 include $(TOP)/configure/CONFIG
 
+# Bootstrap resolution: tools not installed yet
+TOOLS = $(TOP)/src/tools
+
+DIRS += configure src
 ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
 DIRS += config
 endif
-DIRS += configure src
+
+src_DEPEND_DIRS = configure
+config_DEPEND_DIRS = src
 
 include $(TOP)/configure/RULES_TOP
 

configure/CONFIG

@@ -17,12 +17,12 @@
 #  Common build definitions
 #
 
-ifndef EPICS_BASE
+ifneq ($(wildcard $(TOP)/configure/CONFIG_BASE_VERSION),)
 EPICS_BASE = $(INSTALL_LOCATION)
 CONFIG = $(TOP)/configure
 BASE_TOP=YES
 else
-CONFIG = $(EPICS_BASE)/configure
+CONFIG ?= $(EPICS_BASE)/configure
 endif
 
 -include $(CONFIG)/os/CONFIG_COMPAT
@@ -36,6 +36,7 @@ ifdef T_A
 endif
 
 include $(CONFIG)/CONFIG_COMMON
+include $(CONFIG)/CONFIG_FILE_TYPE
 
 #  Base-specific build options
 #
@@ -53,7 +54,6 @@ include $(CONFIG)/CONFIG_BASE_VERSION
 #
 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
 
@@ -71,6 +71,12 @@ endif
 #
 -include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
 
+#  RELEASE file specific definitions
+#
+ifneq ($(CONFIG),$(TOP)/configure)
+-include $(CONFIG)/CONFIG_APP_INCLUDE
+endif
+
 #  Site specific target and host-target definitions
 #
 -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
@@ -78,6 +84,25 @@ endif
 
 endif
 
+# Include <top>/cfg/CONFIG* definitions from tops defined in RELEASE* files
+#
+ifneq ($(CONFIG),$(TOP)/configure)
+RELEASE_TOPS ?= $(shell $(PERL) $(TOOLS)/convertRelease.pl -T $(TOP) releaseTops )
+RELEASE_CFG_CONFIGS = $(foreach top, $(RELEASE_TOPS), $(wildcard $($(top))/cfg/CONFIG*))
+ifneq ($(RELEASE_CFG_CONFIGS),)
+include $(RELEASE_CFG_CONFIGS)
+endif
+endif
+
+# Include $(INSTALL_CFG)/CONFIG* definitions
+#
+ifndef T_A
+TOP_CFG_CONFIGS = $(wildcard $(INSTALL_CFG)/CONFIG*)
+ifneq ($(TOP_CFG_CONFIGS),)
+include $(TOP_CFG_CONFIGS)
+endif
+endif
+
 #  User specific definitions
 #
 -include $(HOME)/configure/CONFIG_USER
@@ -105,6 +130,4 @@ endif
 #etc.
 
 #CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040
-#CMPLR=STRICT
-#CXXCMPLR=STRICT
 

configure/CONFIG.CrossCommon

@@ -18,10 +18,8 @@ BUILD_CLASS = CROSS
 #   ifdef CROSS    looks better than  ifeq ($(BUILD_CLASS),CROSS)
 CROSS = YES
 
-GNU_TARGET_INCLUDE_DIR = $(GNU_DIR)/$(GNU_TARGET)/include
-GNU_TARGET_LIB_DIR = $(GNU_DIR)/$(GNU_TARGET)/lib
-
-export GCC_EXEC_PREFIX = $(GNU_LIB)/gcc-lib/
+GNU_TARGET_INCLUDE_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/include)
+GNU_TARGET_LIB_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/lib)
 
 CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
 CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))

configure/CONFIG.gnuCommon

@@ -22,9 +22,6 @@ LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
 CPP = $(CC) -x c -E
 RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX)
 
-CONFORM_CFLAGS_ANSI = -ansi
-CONFORM_CFLAGS_STRICT = -ansi
-CONFORM_CFLAGS_TRAD = -traditional
 PROF_CFLAGS_YES = -p
 GPROF_CFLAGS_YES = -pg
 CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
@@ -33,8 +30,6 @@ WARN_CFLAGS_NO = -w
 OPT_CFLAGS_YES = -O3
 OPT_CFLAGS_NO = -g
 
-CONFORM_CXXFLAGS_NORMAL = -ansi
-CONFORM_CXXFLAGS_STRICT = -ansi
 PROF_CXXFLAGS_YES = -p
 GPROF_CXXFLAGS_YES = -pg
 CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
@@ -45,10 +40,16 @@ OPT_CXXFLAGS_NO = -g
 
 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 
+PIPE_CFLAGS_YES_YES = -pipe
+PIPE_CFLAGS = $(PIPE_CFLAGS_$(GCC_PIPE)_$(GNU))
+PIPE_CXXFLAGS = $(PIPE_CFLAGS)
+
 STATIC_LDFLAGS_YES = -static
 STATIC_LDFLAGS_NO =
 
 SHRLIB_CFLAGS = -fPIC
+SHRLIB_LDFLAGS =  -shared -fPIC
+LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
 
 GNU_LDLIBS_YES = -lgcc
 

configure/CONFIG_ADDONS

@@ -3,11 +3,10 @@
 #     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
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id#
+# $Id$
 #
 #	check for add-on CFLAGS and CXXFLAGS
 #
@@ -20,8 +19,8 @@
 #	4) if you have the special case that your USR_CFLAGS_$(OS_CLASS) is
 #	   empty but you don't want 3), you have to define it as '-nil-', e.g.:
 #		USR_CFLAGS = <defines for all systems>
-#		USR_CFLAGS_sun4 = -nil-
-#		USR_CFLAGS_DEFAULT = <defines for most systems, not sun4>
+#		USR_CFLAGS_WIN = -nil-
+#		USR_CFLAGS_DEFAULT = <defines for most systems, not WIN32>
 #
 #    These rules apply to these Makefile-variables:
 #    USR_CFLAGS    C flags
@@ -175,8 +174,6 @@ LIB_LDFLAGS+=$(LIB_LDFLAGS_DEFAULT)
 endif
 endif
 
-#	concat specific library contents (if defined)
-#
 ifneq ($(strip $(LIBSRCS_$(OS_CLASS))),)
 LIBSRCS += $(subst -nil-,,$(LIBSRCS_$(OS_CLASS)))
 else
@@ -378,6 +375,17 @@ USR_LIBS += $(USR_LIBS_DEFAULT)
 endif
 endif
 
+#
+#	concat specific include files
+#
+ifneq ($(strip $(INC_$(OS_CLASS))),)
+INC += $(subst -nil-,,$(INC_$(OS_CLASS)))
+else
+ifdef INC_DEFAULT
+INC+=$(INC_DEFAULT)
+endif
+endif
+
 #
 #	concat specific library contents (if defined) to SYS_PROD_LIBS
 #

configure/CONFIG_APP_INCLUDE

@@ -0,0 +1,24 @@
+export TOP
+export IOCAPPS
+
+RELEASE_TOPS = $(shell $(PERL) $(TOOLS)/convertRelease.pl -T $(TOP) releaseTops )
+
+ifneq ($(RELEASE_TOPS),)
+
+define  RELEASE_FLAGS_template
+  export $(1)
+  $(1)_HOST_BIN = $$(strip $$($(1)))/bin/$$(EPICS_HOST_ARCH)
+  $(1)_HOST_LIB = $$(strip $$($(1)))/lib/$$(EPICS_HOST_ARCH)
+  $(1)_BIN = $$(strip $$($(1)))/bin/$$(T_A)
+  $(1)_LIB = $$(strip $$($(1)))/lib/$$(T_A)
+  SHRLIB_SEARCH_DIRS += $$($(1)_LIB)
+  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/os/$$(OS_CLASS)))
+  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include))
+  RELEASE_DBDFLAGS += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/dbd))
+  RELEASE_DBFLAGS += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/db))
+  RELEASE_PERL_MODULE_DIRS += $$(wildcard $$($(1)_LIB)/perl)
+endef
+$(foreach top, $(RELEASE_TOPS), $(eval $(call RELEASE_FLAGS_template,$(top)) ))
+
+endif
+

configure/CONFIG_BASE

@@ -21,14 +21,14 @@ endif
 #---------------------------------------------------------------
 # Epics base Ioc libraries 
 
-EPICS_BASE_IOC_LIBS += recIoc softDevIoc iocsh 
+EPICS_BASE_IOC_LIBS += recIoc softDevIoc
 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 iocshHost asHost dbStaticHost registryIoc
+EPICS_BASE_HOST_LIBS += cas gdd asHost dbStaticHost registryIoc
 EPICS_BASE_HOST_LIBS += ca Com
 
 #---------------------------------------------------------------
@@ -53,22 +53,33 @@ BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
 #---------------------------------------------------------------
 # Where to find the installed build tools
 
-EPICS_BASE_TOOLS_BIN_HOST = $(EPICS_BASE_BIN)
-EPICS_BASE_TOOLS_BIN_CROSS = $(EPICS_BASE_HOST_BIN)
-EPICS_BASE_TOOLS_BIN = $(EPICS_BASE_TOOLS_BIN_$(BUILD_CLASS))
+TOOLS = $(EPICS_BASE_HOST_BIN)
 
 #---------------------------------------------------------------
 # Epics base build tools and tool flags
 
-MAKEBPT                    = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/makeBpt$(HOSTEXE))
-DBEXPAND                   = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/dbExpand$(HOSTEXE))
-DBTORECORDTYPEH            = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/dbToRecordtypeH$(HOSTEXE))
-DBTOMENUH                  = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/dbToMenuH$(HOSTEXE))
-REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_BASE_TOOLS_BIN)/registerRecordDeviceDriver.pl
+MAKEBPT                    = $(call PATH_FILTER, $(TOOLS)/makeBpt$(HOSTEXE))
+DBEXPAND                   = $(call PATH_FILTER, $(TOOLS)/dbExpand$(HOSTEXE))
+DBTORECORDTYPEH            = $(call PATH_FILTER, $(TOOLS)/dbToRecordtypeH$(HOSTEXE))
+DBTOMENUH                  = $(call PATH_FILTER, $(TOOLS)/dbToMenuH$(HOSTEXE))
+REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.pl
+CONVERTRELEASE=$(PERL) $(TOOLS)/convertRelease.pl
 
+#-------------------------------------------------------
+# 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
+
+#---------------------------------------------------------------
 # private versions of lex/yacc from EPICS
-EYACC = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/antelope$(HOSTEXE))
-ELEX = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/e_flex$(HOSTEXE)) -S$(EPICS_BASE)/include/flex.skel.static
+EYACC = $(call PATH_FILTER, $(TOOLS)/antelope$(HOSTEXE))
+ELEX = $(call PATH_FILTER, $(TOOLS)/e_flex$(HOSTEXE)) -S$(EPICS_BASE)/include/flex.skel.static
 
 YACC  = $(EYACC)
 LEX   = $(ELEX)

configure/CONFIG_BASE_VERSION

@@ -1,5 +1,5 @@
 #*************************************************************************
-# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2008 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
@@ -19,17 +19,27 @@
 
 BASE_3_14=YES
 
+# EPICS_VERSION must be a number >0 and <256 
 EPICS_VERSION = 3
+
+# EPICS_REVISION must be a number >=0 and <256 
 EPICS_REVISION = 14
 
-# This part may contain letters, eg 0beta1
-EPICS_MODIFICATION = 9
+# EPICS_MODIFICATION must be a number >=0 and <256 
+EPICS_MODIFICATION = 11
 
+# EPICS_PATCH_LEVEL must be a number  (win32 resource file requirement)
 # Not included if zero
 EPICS_PATCH_LEVEL = 0
 
-# This will be -CVS or empty at an official release point
-EPICS_CVS_SNAPSHOT=-RC1
+# This will end in -CVS between official releases
+EPICS_CVS_SNAPSHOT=-CVS
+#EPICS_CVS_SNAPSHOT=-pre1
+#EPICS_CVS_SNAPSHOT=-pre1-CVS
+#EPICS_CVS_SNAPSHOT=-RC1
+#EPICS_CVS_SNAPSHOT=-RC1-CVS
+#EPICS_CVS_SNAPSHOT=-RC2
+#EPICS_CVS_SNAPSHOT=-RC2-CVS
 #EPICS_CVS_SNAPSHOT=
 
 # No changes should be needed below here

configure/CONFIG_COMMON

@@ -16,6 +16,10 @@
 #
 # Common Configuration Information
 
+#-------------------------------------------------------
+# POSIX is OS default
+POSIX=YES
+
 #-------------------------------------------------------
 # Divider symbol
 DIVIDER = .
@@ -47,11 +51,16 @@ CHECK_RELEASE_YES = checkRelease
 CHECK_RELEASE_NO =
 CHECK_RELEASE_WARN = warnRelease
 
+#-------------------------------------------------------
+# GNU directory
+# GNU_DIR definition is here because it is used to find
+# READLINE library even if GNU compiler is not used
+GNU_DIR = /usr
+
 #-------------------------------------------------------
 # Directories
 
 INSTALL_LOCATION            = $(TOP)
-TOOLS                       = $(CONFIG)/tools
 
 INSTALL_LOCATION_LIB        = $(INSTALL_LOCATION)/lib
 INSTALL_LOCATION_BIN        = $(INSTALL_LOCATION)/bin
@@ -71,6 +80,7 @@ INSTALL_JAVA                = $(INSTALL_LOCATION)/javalib
 #Directory for OS independant build created files
 COMMON_DIR = ../O.Common
 
+#-------------------------------------------------------
 ifdef T_A
 
 INSTALL_LIB                 = $(INSTALL_LOCATION_LIB)/$(T_A)
@@ -83,8 +93,7 @@ SHRLIB_SEARCH_DIRS          = $(INSTALL_LIB)
 
 #-------------------------------------------------------
 # Ext, app, and module configure dir targets
-CONFIG_TARGETS += CONFIG_APP_INCLUDE RULES_INCLUDE
-CONFIG_INSTALLS += ../RULES_BUILD
+CONFIG_INSTALLS += ../RULES_BUILD ../RELEASE*
 
 #-------------------------------------------------------
 # Cross compile default, HOST or CROSS, CONFIG.crossCommon will override
@@ -92,8 +101,6 @@ 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
@@ -103,32 +110,29 @@ HOST_WARN=YES
 CROSS_WARN=YES
 GNU=NO
 
+#-------------------------------------------------------
+# Run checkRelease in $(TOP)/configure/O.*
+CONFIG_TARGETS += $(CHECK_RELEASE_$(CHECK_RELEASE))
+
 #-------------------------------------------------------
 # Prefix and suffix
 DEP=.depends
 OBJ = .
-RES = .
 CMPLR_SUFFIX=
 CMPLR_PREFIX=
 LIB_PREFIX=
 SHRLIB_PREFIX= $(LIB_PREFIX)
 
 #-------------------------------------------------------
-# 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
+# Make echo output - suppress echoing if make's '-s' flag is set
+ECHO := $(if $(findstring s,$(MAKEFLAGS)),\#,@echo)
 
 #--------------------------------------------------
 # vpath directories
+POSIX_YES = os/posix
 GENERIC_SRC_DIRS = .. $(SRC_DIRS)
 OS_SRC_DIRS += . $(foreach dir, .. $(SRC_DIRS), \
-            $(dir)/os/$(OS_CLASS) $(dir)/os/posix $(dir)/os/default )
+       $(addprefix $(dir)/, os/$(OS_CLASS) $(POSIX_$(POSIX)) os/default ))
 ALL_SRC_DIRS = $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)
 
 #--------------------------------------------------
@@ -136,7 +140,7 @@ ALL_SRC_DIRS = $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)
 INSTALL_INCLUDES += \
        -I$(INSTALL_INCLUDE)/os/$(OS_CLASS) \
        -I$(INSTALL_INCLUDE)
-GENERIC_SRC_INCLUDES = $(addprefix -I, $(GENERIC_SRC_DIRS))
+SRC_INCLUDES = -I$(COMMON_DIR) $(addprefix -I, $(wildcard $(ALL_SRC_DIRS)))
 
 #--------------------------------------------------
 # Target filename definitions
@@ -152,7 +156,7 @@ JAR =
 #--------------------------------------------------
 # obj files
 
-TARGET_OBJS =  $($*_OBJLIBS) $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS)))
+TARGET_OBJS =  $($*_OBJLIBS) $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
 
 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)
@@ -163,12 +167,12 @@ LIBRARY_LD_OBJS = $(USR_OBJLIBS) $(LIB_OBJLIBS) $(TARGET_OBJS) $(LIBRARY_OBJS)
 #--------------------------------------------------
 # WIN95/NT resource files
 
-TARGET_RESS = $(addsuffix $(RES),$(basename $($*_RCS)))
+TARGET_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $($*_RCS))),)
 
-PROD_RESS = $(addsuffix $(RES),$(basename $(RCS) $(PROD_RCS)))
+PROD_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $(RCS) $(PROD_RCS))),)
 PROD_LD_RESS = $(TARGET_RESS) $(PROD_RESS)
 
-LIBRARY_RESS = $(addsuffix $(RES),$(basename $(RCS) $(LIB_RCS) $(LIBRARY_RCS)))
+LIBRARY_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $(RCS) $(LIB_RCS) $(LIBRARY_RCS))),)
 LIBRARY_LD_RESS = $(TARGET_RESS) $(LIBRARY_RESS)
 
 #--------------------------------------------------
@@ -179,14 +183,14 @@ LIB_BAF=$(addsuffix $(BAF),$(basename $(LIBRARY)))
 #--------------------------------------------------
 # C preprocessor, compiler, and linker flag defaults
 
-# Target architecture specific (solaris,sun4,mv167,...) flags
+# Target architecture specific flags
 ARCH_DEP_CPPFLAGS =
 ARCH_DEP_CFLAGS =
 ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
 ARCH_DEP_LDFLAGS =
 ARCH_DEP_LDLIBS =
 
-# Target operating system specific (Unix,Vx,WIN32...) flags
+# Target operating system specific flags
 OP_SYS_CPPFLAGS =
 OP_SYS_CFLAGS =
 OP_SYS_CXXFLAGS = $(OP_SYS_CFLAGS)
@@ -227,16 +231,13 @@ TARGET_CPPFLAGS += $($(basename $@)_CPPFLAGS_$(OS_CLASS)) $($(basename $@)_CPPFL
 
 TARGET_LDFLAGS = $($*_LDFLAGS)
 
-# Level of ansi conformance flags
-CONFORM_CPPFLAGS = $(CONFORM_CPPFLAGS_$(CMPLR))
-CONFORM_CFLAGS = $(CONFORM_CFLAGS_$(CMPLR))
-CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_$(CXXCMPLR))
-
 # Warnings flags
+WARN_CPPFLAGS = $(WARN_CPPFLAGS_$($(BUILD_CLASS)_WARN))
 WARN_CFLAGS = $(WARN_CFLAGS_$($(BUILD_CLASS)_WARN))
 WARN_CXXFLAGS = $(WARN_CXXFLAGS_$($(BUILD_CLASS)_WARN))
 
 # Optimization flags
+OPT_CPPFLAGS = $(OPT_CPPFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CFLAGS = $(OPT_CFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CXXFLAGS = $(OPT_CXXFLAGS_$($(BUILD_CLASS)_OPT))
 
@@ -248,9 +249,15 @@ STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD))
 
 #--------------------------------------------------
 # cflags for shared library src files (from SHRLIB_CFLAGS)
-LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(LOADABLE_LIBRARY),$($(lib)_OBJS) $(LIBRARY_OBJS)))
+LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(LOADABLE_LIBRARY),$($(lib)_OBJSNAME) $(LIBRARY_OBJS)))
 LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)
 
+#--------------------------------------------------
+# prefix, suffix, and ldflags for loadable shared libraries 
+TARGET_LIB_LDFLAGS=$($(patsubst $*,LOADABLE_,$(findstring $*,$(LOADABLE_LIBRARY)))SHRLIB_LDFLAGS)
+LOADABLE_SHRLIB_PREFIX=$(SHRLIB_PREFIX)
+LOADABLE_SHRLIB_SUFFIX=$(SHRLIB_SUFFIX)
+
 #--------------------------------------------------
 # Command-line input support default
 COMMANDLINE_LIBRARY = EPICS
@@ -260,25 +267,26 @@ OP_SYS_LDFLAGS += $(LDFLAGS_$(COMMANDLINE_LIBRARY))
 #--------------------------------------------------
 # Flags
 
-INCLUDES = -I. $(GENERIC_SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
+INCLUDES = -I. $(SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
  $(TARGET_INCLUDES) $(USR_INCLUDES) $(OP_SYS_INCLUDES) $($(BUILD_CLASS)_INCLUDES)
 
-CFLAGS = $(CONFORM_CFLAGS) $($(BUILD_CLASS)_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
- $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
+CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
+ $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
  $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-CXXFLAGS = $(CONFORM_CXXFLAGS) $($(BUILD_CLASS)_CXXFLAGS) $(OPT_CXXFLAGS)\
- $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
- $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
+CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS)\
+ $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS)\
+ $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
+LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
  $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $($(BUILD_CLASS)_LDFLAGS)\
  $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
-LDLIBS = $(STATIC_LDLIBS)\
+LDLIBS = \
  $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS) $(GNU_LDLIBS_$(GNU))
 
-CPPFLAGS += $(CONFORM_CPPFLAGS) $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS)\
+CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS)\
+ $(OPT_CPPFLAGS) $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS)\
  $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
  $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
@@ -292,10 +300,12 @@ ARCMD = $(AR) $(ARFLAGS) $(USR_ARFLAGS) $@  $(LIBRARY_LD_OBJS)
 MUNCH_CMD = $(LD) -o $@ $^
 
 #--------------------------------------------------
-# LEX default option (valid for EPICS base 3.13.0.beta12 and later)
+# LEX default options
 #
-# to allow characters that are not plain 7bit standard ASCII 
-LEXOPT +=  -8
+# Allow 8-bit characters
+LEXOPT += -8
+# Generate an "interactive" scanner, solves problems at EOF.
+LEXOPT += -I
 
 #--------------------------------------------------
 # Build compile line here
@@ -315,7 +325,7 @@ HDEPENDS_FLAGS =
 HDEPENDS_INCLUDES = $(subst -I,,$(INCLUDES))
 HDEPENDSFLAGS = -m $*$(DEP) $(HDEPENDS_INCLUDES) $@ $<
 HDEPENDS_CMD_YES   = -$(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDSFLAGS)
-HDEPENDS_CMD_NO   = echo ""
+HDEPENDS_CMD_NO   = $(ECHO) ""
 HDEPENDS_CMD  = $(HDEPENDS_CMD_$(HDEPENDS))
 
 #--------------------------------------------------
@@ -350,6 +360,15 @@ INSTALL_TEMPLATE = $(addprefix $(INSTALL_TEMPLATES_SUBDIR)/, \
                    $(subst $(CONFIG),top/configure,$(TEMPLATES)))
 INSTALL_CONFIGS = $(CONFIGS:%= $(INSTALL_CONFIG)/%)
 
+INSTALL_BIN_INSTALLS = $(addprefix $(INSTALL_BIN)/,$(notdir $(BIN_INSTALLS)))
+INSTALL_LIB_INSTALLS = $(addprefix $(INSTALL_LIB)/,$(notdir $(LIB_INSTALLS)))
+
+#---------------------------------------------------------------
+# Installed file permissions
+BIN_PERMISSIONS = 555
+LIB_PERMISSIONS = 644
+INSTALL_PERMISSIONS = 644
+
 #---------------------------------------------------------------
 #
 # auto determine the directory paths that things are installed to

configure/CONFIG_FILE_TYPE

@@ -0,0 +1,64 @@
+#*************************************************************************
+# Copyright (c) 2006 UChicago Argonne LLC, 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 is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+#
+# Macros and rules to create a new installation file type 
+#
+
+# --------------------------------------------------------------
+# Module developers can now define a new type of file, e.g. ABC, 
+# so that files of type ABC will be installed into a directory
+# defined by INSTALL_ABC. This is done by creating a new CONFIG<name>
+# file, e.g. CONFIG_ABC, with the following lines:
+#
+#       FILE_TYPE += ABC
+#       INSTALL_ABC = $(INSTALL_LOCATION)/abc
+#
+# The INSTALL_ABC directory should be be a subdirectory of 
+# $(INSTALL_LOCATION). The file type ABC should be target
+# architecture independent (alh files, medm files, edm files).
+#
+# Optional rules necessary for files of type ABC should be put in
+# a RULES_ABC file.
+#
+# The module developer installs new CONFIG* or RULES* files
+# into the directory $(INSTALL_LOCATION)/cfg by including the 
+# following Makefile line:
+#
+#       CFG += CONFIG_ABC RULES_ABC
+# 
+# Files of type ABC are installed into INSTALL_ABC directory
+# by adding a line like the following to a Makefile.
+#
+#       ABC += <filename1> <filename2> <filename3>
+#
+# Files in $(INSTALL_LOCATION)/cfg directory are now included by
+# the base config files so the definitions and rules are available
+# for use by later src directory Makefiles in the same module or
+# by other modules with a RELEASE line pointing to the TOP of 
+# the module with RULES_ABC.
+
+FILE_TYPE += ADL
+INSTALL_ADL = $(INSTALL_LOCATION)/adl
+
+FILE_TYPE += ALH
+INSTALL_ALH = $(INSTALL_LOCATION)/alh
+
+FILE_TYPE += CFG
+INSTALL_CFG = $(INSTALL_LOCATION)/cfg
+
+FILE_TYPE += EDL
+INSTALL_EDL = $(INSTALL_LOCATION)/edl
+
+FILE_TYPE += PERL_MODULES
+INSTALL_PERL_MODULES = $(INSTALL_LOCATION_LIB)/perl
+
+INSTALLS_CFG= $(CFG:%= $(INSTALL_CFG)/%)
+DIRECTORY_TARGETS += $(foreach type, $(FILE_TYPE),$(INSTALL_$(type)))
+

configure/CONFIG_SITE

@@ -24,21 +24,18 @@
 #	darwin-ppcx86          (Universal binaries for both CPUs)
 #	freebsd-x86            (GNU compiler used for host builds)
 #	freebsd-x86_64         (GNU compiler used for host builds)
-#	hpux-parisc            (HP compiler used for host builds)
-#	hpux-parisc-gnu        (GNU compiler used for host builds)
 #	linux-ppc              (GNU compiler used for host builds)
 #	linux-x86              (GNU compiler used for host builds)
 #	linux-x86_64           (GNU compiler used for host builds)
 #	linux-x86-borland      (Borland C++ compiler used for host builds)
-#	solaris-sparc          (sun compiler used for host builds)
+#	solaris-sparc          (Sun compiler used for host builds)
 #	solaris-sparc-gnu      (GNU compiler used for host builds)
-#	solaris-sparc64        (sun compiler used for host builds)
+#	solaris-sparc64        (Sun compiler used for host builds)
 #	solaris-sparc64-gnu    (GNU compiler used for host builds)
-#	solaris-x86            (sun compiler used for host builds)
+#	solaris-x86            (Sun compiler used for host builds)
 #	solaris-x86-gnu        (GNU compiler used for host builds)
 #	win32-x86              (MS Visual C++ compiler used for host builds)
 #	win32-x86-mingw        (MinGW compiler used for host builds)
-#	win32-x86-borland      (Borland C++ compiler used for host builds)
 #	win32-x86-cygwin       (WIN32 API with cygwin GNU compiler used for host builds)
 
 #  Debugging builds 
@@ -56,12 +53,18 @@
 #  The cross-compiler architectures to build EPICS for
 #
 #  Currently Supporting:
-#       linux-386     (linux-x86 host)
-#       linux-486     (linux-x86 host)
-#       linux-586     (linux-x86 host)
-#       linux-686     (linux-x86 host)
-#       linux-athlon  (linux-x86 host)
+#       linux-386               (linux-x86 host)
+#       linux-486               (linux-x86 host)
+#       linux-586               (linux-x86 host)
+#       linux-686               (linux-x86 host)
 #       linux-arm
+#       linux-arm_eb
+#       linux-arm_el
+#       linux-athlon            (linux-x86 host)
+#       linux-cris              (Axis GNU crosscompiler on linux-x86 host)
+#       linux-cris_v10          (Axis GNU crosscompiler on linux-x86 host)
+#       linux-cris_v32          (Axis GNU crosscompiler on linux-x86 host)
+#       linux-xscale_be
 #       vxWorks-486
 #       vxWorks-68040
 #       vxWorks-68040lc
@@ -73,10 +76,13 @@
 #       vxWorks-ppc604_long
 #       vxWorks-ppc604_altivec
 #       vxWorks-mpc8540
+#       RTEMS-at91rm9200ek
+#       RTEMS-beatnik
 #       RTEMS-gen68360
 #       RTEMS-mcp750
 #       RTEMS-mvme167
 #       RTEMS-mvme2100
+#       RTEMS-mvme3100
 #       RTEMS-mvme5500
 #       RTEMS-pc386
 #       RTEMS-psim
@@ -96,19 +102,6 @@ CROSS_COMPILER_TARGET_ARCHS=
 #
 CROSS_COMPILER_HOST_ARCHS=
 
-# Default ANSI level, individual Makefiles will override
-#  if they cannot support ANSI compilation.
-#   STRICT -  ANSI C - force warning flags
-#   ANSI   -  ANSI C
-#   TRAD   -  Standard C - Not appropriate here.
-CMPLR=STRICT
-
-# Default C++ compiler ANSI level
-#   STRICT -  ANSI C++ force strict warning flags
-#   NORMAL -  ANSI C++ optional warning flags
-#   Individual Makefiles may override
-CXXCMPLR=STRICT
-
 #  Build shared libraries?
 #        must be either YES or NO
 #     NOTE: os/CONFIG.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files and
@@ -174,3 +167,7 @@ USE_POSIX_THREAD_PRIORITY_SCHEDULING = NO
 #  EPICS version number string that is reported by many tools
 EPICS_SITE_VERSION =
 
+# For GNU compiler, use pipes rather than temporary files for communication 
+# between the various stages of compilation.
+GCC_PIPE = NO
+

configure/CONFIG_SITE_ENV

@@ -33,15 +33,15 @@
 #	where the start and end are mmddhh - that is month,day,hour
 #	eg EPICS_TIMEZONE=CUS::360:033102:102802
 #
-#	DST for 2007  US: Mar 11 - Nov 04
-#	              EU: Mar 25 - Oct 28
+#	DST for 2009  US: Mar 08 - Nov 01
+#	              EU: Mar 29 - Oct 25
 #	(see: http://www.worldtimezone.org/daylight.html)
 #
 # EPICS_TS_NTP_INET
 #	NTP or Unix time server ip address.  Uses boot host if not set.
 
-EPICS_TIMEZONE=CUS::360:031102:110402
-#EPICS_TIMEZONE=MET::-60:032502:102802
+EPICS_TIMEZONE=CUS::360:030802:110102
+#EPICS_TIMEZONE=MET::-60:032902:102502
 EPICS_TS_NTP_INET=
 
 # IOC Shell:

configure/Makefile

@@ -15,6 +15,9 @@ TOP=..
 
 include $(TOP)/configure/CONFIG
 
+# Bootstrap resolution: tools not installed yet
+TOOLS = $(TOP)/src/tools
+
 CONFIGS += $(subst ../,,$(wildcard ../CONFIG*))
 CONFIGS += $(subst ../,,$(wildcard ../os/CONFIG*))
 
@@ -23,6 +26,5 @@ CONFIGS += $(subst ../,,$(wildcard ../RULES*))
 
 CONFIGS += $(subst ../,,$(wildcard ../tools/*.pl))
 
-TARGETS = CONFIG_APP_INCLUDE
-
 include $(TOP)/configure/RULES
+

configure/RULES.Db

@@ -17,22 +17,25 @@ vpath %.vdb $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB))
 vpath %.substitutions $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 vpath %.template $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 vpath bpt%.data $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
+vpath %.acf $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
+vpath %.acs $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 
 ##################################################### dbdflags
 
 # dbExpand
 INSTALL_DBDFLAGS += -I $(INSTALL_LOCATION)/dbd
+INSTALL_DBFLAGS += -I $(INSTALL_LOCATION)/db
 DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) $(RELEASE_DBDFLAGS)
-DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. $(GENERIC_SRC_INCLUDES)
-DBFLAGS += -I$(COMMON_DIR)
+DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. -I.. $(INSTALL_DBFLAGS) $(RELEASE_DBFLAGS)
 
 #####################################################  Targets
 
 # Following line added for backward compatibilty
 DBD += $(DBDNAME)
 
-DBD += $(addsuffix .dbd,$(patsubst %.h,%,$(patsubst %.db,%,$(DBDINC))))
-INC += $(addsuffix .h,$(patsubst %.h,%,$(patsubst %.db,%,$(DBDINC))))
+DBDINC_NAME = $(patsubst %.h,%,$(patsubst %.db,%,$(DBDINC)))
+DBD += $(addsuffix .dbd,$(DBDINC_NAME))
+INC += $(addsuffix .h,$(DBDINC_NAME))
 
 INSTALL_DBDS += $(addprefix $(INSTALL_DBD)/,$(notdir $(DBD)))
 
@@ -61,7 +64,7 @@ TEMPLATE2=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(pats
           $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
           $(TEMPLATE1)))))))))))
 TEMPLATE3=$(addsuffix .template,$(addprefix ../,$(TEMPLATE2)))
-TEMPLATE_FILENAME=$(firstword $(wildcard $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
+TEMPLATE_FILENAME=$(firstword $(wildcard $($*_TEMPLATE) $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
 
 # dbst based database optimization
 ifeq '$(DB_OPT)' 'YES'
@@ -70,10 +73,26 @@ COMMON_DBS = $(addprefix $(COMMON_DIR)/,$(filter %.db,$(DB)))
 COMMON_DBS += $(addsuffix $(RAW),$(addprefix $(COMMON_DIR)/,$(filter %.db,$(DB))))
 endif
 
+INSTALL_DB_INSTALLS = $(addprefix $(INSTALL_DB)/,$(notdir $(DB_INSTALLS)))
+INSTALL_DBD_INSTALLS = $(addprefix $(INSTALL_DBD)/,$(notdir $(DBD_INSTALLS)))
+
+#####################################################  acf files
+# An access security configuration file, *.acf, can be created from
+# an *.acs file (has format of acf file plus #include "filename" lines)
+
+# flags for GNU compiler
+ACF_CPPFLAGS_YES = -undef -nostdinc
+ACF_CPPFLAGS = $(ACF_CPPFLAGS_$(GNU))
+
+ACF_INCLUDES = -I. $(TARGET_INCLUDES) $(USR_INCLUDES)\
+                $(SRC_INCLUDES) -I$(INSTALL_DB)
+ACFDEPENDS_CMD = -$(MKMF) -m $@$(DEP) $(subst -I,,$(ACF_INCLUDES)) $@ $<
+ACF_CMD = $(CPP) $(ACF_CPPFLAGS) $(ACF_INCLUDES) $< > $@
+
 #####################################################  dependancies
 
-HINC += $(addsuffix .h,$(patsubst %.h,%,$(patsubst %.db,%,$(DBDINC))))
-COMMON_DBDINC += $(addprefix $(COMMON_DIR),$(HINC))
+HINC += $(addsuffix .h,$(DBDINC_NAME))
+COMMON_DBDINC += $(addprefix $(COMMON_DIR)/,$(HINC))
 
 DBDDEPENDS_FILES += $(addsuffix $(DEP),$(COMMON_DBDS) \
                     $(COMMON_DBDINC) $(COMMON_DBS))
@@ -94,7 +113,7 @@ COMMON_DBDS = $(DBD)
 COMMON_DBS = $(DB)
 COMMONS = $(DBD) $(DB)
 
--include $(TOP)/configure/O.$(EPICS_HOST_ARCH)/CONFIG_APP_INCLUDE
+-include $(TOP)/configure/CONFIG_APP_INCLUDE
 
 all:    install
 
@@ -116,27 +135,20 @@ $(DBDDEPENDS_FILES):
 
 #####################################################  build dependancies, clean rule
 
-ifneq (,$(strip $(DBD_INSTALLS)))
-buildInstall : dbdInstalls
-endif
-
-ifneq (,$(strip $(DB_INSTALLS)))
-buildInstall : dbInstalls
-endif
-
-.PHONY: dbdInstalls dbInstalls
-
 inc : $(COMMON_INC) $(INSTALL_INC)
 
 build : $(COMMON_DBDS) $(COMMON_DBS) \
 	$(INSTALL_DBDS) $(INSTALL_DBS) \
-	$(DBDDEPENDS_FILES) $(TARGETS)
+	$(DBDDEPENDS_FILES) $(TARGETS) \
+	$(INSTALL_DB_INSTALLS) $(INSTALL_DBD_INSTALLS)
 
 clean:: 
 	@$(RM) $(COMMONS) $(DBDDEPENDS_FILES)
 	@$(RM) *_registerRecordDeviceDriver.cpp
 	@$(RM) $(TARGETS)
 
+realclean: clean
+
 ##################################################### CapFast filter
 
 $(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS) 
@@ -150,13 +162,14 @@ $(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS)
 
 ifdef CREATESUBSTITUTIONS
 $(COMMON_DIR)/%.substitutions:
+	$(ECHO) "Create substitutions"
 	@$(RM) $@
-	@$(CREATESUBSTITUTIONS) $(COMMON_DIR)/$*
+	$(CREATESUBSTITUTIONS) $@
 endif
 
 $(INSTALL_DB)/%.substitutions: %.substitutions
-	@echo "Installing db file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing db file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PRECIOUS: $(COMMON_DIR)/%.substitutions
 
@@ -169,28 +182,42 @@ $(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf
 	@$(RM) $@.VAR
 
 $(INSTALL_DB)/%.template: %.template
-	@echo "Installing db file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing db file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PRECIOUS: $(COMMON_DIR)/%.template
 
 ##################################################### INC files
 
 $(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
+	@$(RM) $@$(DEP)
+	@$(DBDDEPENDS_CMD)
+	$(ECHO) "$<:../Makefile" >> $@$(DEP)
 	@$(RM) $@
 	$(DBTORECORDTYPEH) $(DBDFLAGS)  $< $@
 
 $(COMMON_DIR)/%Record.h: %Record.dbd
+	@$(RM) $@$(DEP)
+	@$(DBDDEPENDS_CMD)
+	$(ECHO) "$<:../Makefile" >> $@$(DEP)
 	@$(RM) $@
 	$(DBTORECORDTYPEH) $(DBDFLAGS)  $< $@
 
 $(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd
+	@$(RM) $@$(DEP)
+	@$(DBDDEPENDS_CMD)
+	$(ECHO) "$<:../Makefile" >> $@$(DEP)
 	@$(RM) $@
-	$(DBTOMENUH) $< $@
+	$(DBTOMENUH) $(DBDFLAGS) $< $@
 
 $(COMMON_DIR)/menu%.h: menu%.dbd
+	@$(RM) $@$(DEP)
+	@$(DBDDEPENDS_CMD)
+	$(ECHO) "$<:../Makefile" >> $@$(DEP)
 	@$(RM) $@
-	$(DBTOMENUH) $< $@
+	$(DBTOMENUH) $(DBDFLAGS) $< $@
+
+.PRECIOUS: $(COMMON_DIR)/%.h
 
 ##################################################### DBD files
 
@@ -201,14 +228,15 @@ $(COMMON_DIR)/bpt%.dbd: bpt%.data
 $(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd 
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
-	@echo "Expanding dbd"
+	$(ECHO) "$<:../Makefile" >> $@$(DEP)
+	$(ECHO) "Expanding dbd"
 	@$(RM) $@
 	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
 
 $(COMMON_DIR)/%.dbd: %Include.dbd 
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
-	@echo "Expanding dbd"
+	$(ECHO) "Expanding dbd"
 	@$(RM) $@
 	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
 
@@ -217,16 +245,19 @@ $(COMMON_DIR)/%Include.dbd:
 	$(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $@
 
 $(INSTALL_DBD)/%: $(COMMON_DIR)/%
-	@echo "Installing dbd file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing created dbd file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_DBD)/%: %
-	@echo "Installing dbd file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing dbd file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-dbdInstalls:  $(DBD_INSTALLS)
-	@echo "Installing $(^F)"
-	@$(INSTALL) -d -m 555 $^ $(INSTALL_DBD)
+define  DBD_INSTALLS_template
+$$(INSTALL_DBD)/$$(notdir $(1)) : $(1)
+	$(ECHO) "Installing $$@"
+	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DBD)
+endef
+$(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 
 .PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%Include.dbd
 
@@ -240,16 +271,16 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf
 #$(COMMON_DIR)/%.db$(RAW): %.substitutions %.template
 #	@$(RM) $@$(DEP)
 #	@$(MAKEDBDEPENDS) $@ $^  >> $@$(DEP)
-#	@echo "Inflating database from $^"
+#	$(ECHO) "Inflating database from $^"
 #	@$(RM) $@
 #	$(MSI) $(DBFLAGS) -S$< $(firstword $(patsubst %.substitutions,,$^)) > msi.tmp
 #	$(MV) msi.tmp $@
 
 $(COMMON_DIR)/%.db$(RAW): %.substitutions
 	@$(RM) $@$(DEP)
-	@$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $@$(DEP)
-	@echo "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
-	@echo "Inflating database from $< $(TEMPLATE_FILENAME)"
+	$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $@$(DEP)
+	$(ECHO) "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
+	$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $@
 	$(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > msi.tmp
 	$(MV) msi.tmp $@
@@ -257,11 +288,20 @@ $(COMMON_DIR)/%.db$(RAW): %.substitutions
 $(COMMON_DIR)/%.db$(RAW): %.template
 	@$(RM) $@$(DEP)
 	@$(MAKEDBDEPENDS) $@ $^  >> $@$(DEP)
-	@echo "Inflating database from $<"
+	$(ECHO) "Inflating database from $<"
 	@$(RM) $@
 	$(MSI) $(DBFLAGS)  $< > msi.tmp
 	$(MV) msi.tmp $@
 
+$(COMMON_DIR)/%.acf: %.acs
+	@$(RM) $@$(DEP)
+	@$(ACFDEPENDS_CMD)
+	$(ECHO) "Creating acf file $@"
+	@$(RM) $@
+	$(ACF_CMD)
+
+.PRECIOUS: $(COMMON_DIR)/%.acf
+
 # dbst based database optimization
 ifeq '$(DB_OPT)' 'YES'
 
@@ -270,7 +310,7 @@ $(COMMON_DIR)/%.db$(RAW): ../%.db
 	$(CP) $< $@
 
 $(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
-	@echo "Optimizing database $@"
+	$(ECHO) "Optimizing database $@"
 	@$(RM) $@
 	$(DBST) . $< -d > $@
 
@@ -279,17 +319,20 @@ $(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
 else
 
 $(INSTALL_DB)/%: %
-	@echo "Installing db file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing db file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 endif
 
 $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
-	@echo "Installing db file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing created db file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-dbInstalls:  $(DB_INSTALLS)
-	@echo "Installing $(^F)"
-	@$(INSTALL) -d -m 555 $^ $(INSTALL_DB)
+define  DB_INSTALLS_template
+$$(INSTALL_DB)/$$(notdir $(1)) : $(1)
+	$(ECHO) "Installing $$@"
+	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DB)
+endef
+$(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 
 .PRECIOUS: $(COMMON_DIR)/%.edf
 .PRECIOUS: $(COMMON_DBS)

configure/RULES.ioc

@@ -10,23 +10,23 @@
 #RULES.ioc
 include $(CONFIG)/RULES_DIRS
 
-build: buildInstall
-install: buildInstall
+build$(DIVIDER)$(ARCH) build: buildInstall
+install$(DIVIDER)$(ARCH) install: buildInstall
+$(ARCH): buildInstall
 
-ifneq ($(findstring $(ARCH),$(BUILD_ARCHS)),)
-buildInstall: $(TARGETS)
+ifeq ($(filter $(ARCH),$(BUILD_ARCHS)),$(ARCH))
+buildInstall$(DIVIDER)$(ARCH) buildInstall: $(TARGETS)
 
-clean:
-	$(RM) cdCommands envPaths
+clean$(DIVIDER)$(ARCH) clean:
+	$(RM) cdCommands envPaths dllPath.bat
 
 else 
-buildInstall:
-clean:
+buildInstall$(DIVIDER)$(ARCH) buildInstall:
+clean$(DIVIDER)$(ARCH) clean:
 endif
 
-envPaths cdCommands: $(wildcard $(TOP)/configure/RELEASE*) \
+cdCommands envPaths dllPath.bat: $(wildcard $(TOP)/configure/RELEASE*) \
 	$(TOP)/configure/CONFIG $(INSTALL_BIN)
-	@$(RM) $@
 ifeq ($(IOCS_APPL_TOP),)
 	$(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) $@
 else
@@ -34,5 +34,5 @@ else
 endif
 
 realclean:
-	$(RM) cdCommands envPaths
+	$(RM) cdCommands envPaths dllPath.bat
 

configure/RULES_ARCHS

@@ -12,8 +12,6 @@
 
 all: install
 
-build install buildInstall: $(CHECK_RELEASE_$(CHECK_RELEASE))
-
 rebuild: clean install
 
 ACTIONS = inc
@@ -22,6 +20,7 @@ ACTIONS += install
 ACTIONS += buildInstall
 ACTIONS += browse
 ACTIONS += runtests
+#ACTIONS += rebuild
 
 actionPart = $(word 1, $(subst $(DIVIDER), ,$@))
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
@@ -33,6 +32,29 @@ cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 
 buildDirs = $(addprefix O.,$(BUILD_ARCHS))
 
+#*************************************************************************
+# Create epics_host_arch dependancies for GNU make -j option
+# Only works with GNU make 3.81 or later (uses eval function)
+# Needed in dirs where EPICS_HOST_ARCH build creates a tool used in 
+# cross arch builds
+
+CROSS_ARCHS += $(CROSS1) $(CROSS2)
+
+# j is NOT found in MAKEFLAGS when using make 3.81
+# Hope to uncomment this for GNU make 3.82
+#ifeq ($(findstring j,$(MAKEFLAGS)),j)
+
+define DEP_template
+$(2): $$(EPICS_HOST_ARCH)
+$(1)$$(DIVIDER)$(2): $(1)$$(DIVIDER)$$(EPICS_HOST_ARCH)
+endef
+
+$(foreach action, $(ACTIONS), $(foreach arch,\
+      $(CROSS_ARCHS),$(eval $(call DEP_template,$(action),$(arch)))))
+
+#endif
+#*************************************************************************
+
 $(actionArchTargets) : $(buildDirs) O.Common
 	$(MAKE) -C O.$(archPart) -f ../Makefile TOP=$(TOP)/.. T_A=$(archPart) $(actionPart)
 
@@ -47,26 +69,6 @@ $(buildDirs):
 O.Common:
 	$(MKDIR) O.Common
 
-#
-# RELEASE consistency checking
-
-# The RELEASE.$(EPICS_HOST_ARCH) files don't need to be included here:
-targetReleaseFiles = $(wildcard $(foreach arch, $(BUILD_ARCHS), \
-		$(TOP)/configure/RELEASE.Common.$(arch) \
-		$(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(arch)))
-
-checkReleaseTargets = $(addprefix checkRelease, $(suffix $(targetReleaseFiles)))
-checkRelease: $(checkReleaseTargets)
-	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) checkRelease
-$(checkReleaseTargets):checkRelease.%:
-	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) -a $* checkRelease
-
-warnReleaseTargets = $(addprefix warnRelease, $(suffix $(targetReleaseFiles)))
-warnRelease: $(warnReleaseTargets)
-	-$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) checkRelease
-$(warnReleaseTargets):warnRelease.%:
-	-$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) -a $* checkRelease
-
 #
 # special clean rule
 #
@@ -86,4 +88,3 @@ realclean ::
 .PHONY : $(cleanArchTargets)
 .PHONY : $(BUILD_ARCHS)
 .PHONY : $(ACTIONS) clean realclean archclean all
-.PHONY : checkRelease $(checkReleaseTargets)

configure/RULES_BUILD

@@ -33,6 +33,9 @@ include $(CONFIG)/CONFIG_ADDONS
 #---------------------------------------------------------------
 # Set PROD, TESTPROD, OBJS, and LIBRARY
 
+SCRIPTS_HOST += $(PERL_SCRIPTS)
+# PERL_SCRIPTS are installed into existing $(INSTALL_BIN) for Host systems
+
 ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
 LIBRARY += $(LIBRARY_HOST)
 LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_HOST)
@@ -74,17 +77,11 @@ ifneq (,$(strip $(HDEPENDS_FILES)))
 endif
 
 #---------------------------------------------------------------
-# Create included Makefile for prod,testprod, and library targets
+# Included defines and rules for prod,testprod, and library targets
 
-ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY)))
-
-MakefileInclude: ../Makefile $(wildcard $(TOP)/configure/RELEASE*)
-	@$(RM) $@
-	@$(PERL) $(TOOLS)/makeMakefileInclude.pl $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) $@
-
--include MakefileInclude
-
-endif # PROD, TESTPROD, LIBRARY, or LOADABLE_LIBRARY defined
+#ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY)))
+include $(CONFIG)/RULES_TARGET
+#endif
 
 #---------------------------------------------------------------
 #   Products and Object libraries
@@ -100,13 +97,10 @@ LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) \
               $(DLL_LINK_LIBNAME) $(INSTALL_DLL_LINK_LIBS) \
               $(LOADABLE_SHRLIBNAME) $(INSTALL_LOADABLE_SHRLIBS)
 
-#---------------------------------------------------------------
-ifneq ($(CONFIG),$(TOP)/configure)
-RULES_TOP:=$(INSTALL_LOCATION)
--include $(TOP)/configure/RULES_BUILD
-endif
--include $(TOP)/configure/O.$(T_A)/RULES_INCLUDE
-#---------------------------------------------------------------
+$(INSTALL_LIBS): $(INSTALL_SHRLIBS)  $(INSTALL_DLL_LINK_LIBS)  $(INSTALL_LOADABLE_SHRLIBS)
+
+
+-include $(CONFIG)/RULES_FILE_TYPE
 
 #	Main targets
 
@@ -119,9 +113,9 @@ rebuild: clean install
 build : inc 
 
 build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
-	$(TARGETS) $(TESTSCRIPTS)
+	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
-inc : $(COMMON_INC) $(INSTALL_INC)
+inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
 
 buildInstall : \
 	$(INSTALL_SCRIPTS) $(INSTALL_PROD) $(INSTALL_MUNCHS) \
@@ -130,24 +124,22 @@ buildInstall : \
 	$(INSTALL_DOCS) \
 	$(INSTALL_HTMLS) \
 	$(INSTALL_TEMPLATE) \
-	$(INSTALL_CONFIGS)
-
-ifdef BIN_INSTALLS
-buildInstall : binInstalls
-endif
-
-ifdef LIB_INSTALLS
-buildInstall : libInstalls
-endif
+	$(INSTALL_BIN_INSTALLS)
 
 clean::
-	@echo "Cleaning"
-	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME)\
-	$(INC) *$(RES) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
+	$(ECHO) "Cleaning"
+	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME) \
+	$(INC) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
 	*.out MakefileInclude  $(LOADABLE_SHRLIBNAME) *.manifest *.exp \
 	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTSCRIPTS)
+ifdef RES
+	@$(RM) *$(RES)
+endif
 ifdef BAF
-	@$(RM) $(PROD_BAF) $(LIB_BAF) *$(BOF)
+	@$(RM) $(PROD_BAF) $(LIB_BAF)
+endif
+ifdef BOF
+	@$(RM) *$(BOF)
 endif
 
 # WIN95/NT source browser
@@ -158,6 +150,14 @@ browse: $(LIB_BAF) $(PROD_BAF)
 $(DIRECTORY_TARGETS) :
 	$(MKDIR) -p $@
 
+$(PRODNAME): $(INSTALL_LIB_INSTALLS)
+
+# RELEASE file consistency checking
+checkRelease:
+	$(CONVERTRELEASE) checkRelease
+warnRelease:
+	-$(CONVERTRELEASE) checkRelease
+
 #---------------------------------------------------------------
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!
@@ -207,7 +207,7 @@ $(OBJLIBNAME):%$(OBJ):
 
 # WIN95/NT source browser
 %.bsc: %.sbr
-	@echo "building source browser archive $@"
+	$(ECHO) "building source browser archive $@"
 	@$(RM) $@
 	$(BAFCMD) $<
 
@@ -254,7 +254,7 @@ endif
 ifdef BAF
 
 $(LIB_BAF): $(addsuffix $(BOF),$(basename $(LIBRARY_LD_OBJS)))
-	@echo "Building source browser archive $@"
+	$(ECHO) "Building source browser archive $@"
 	@$(RM) $@
 	$(BAFCMD) $^
 
@@ -264,35 +264,32 @@ ifneq (,$(wildcard ../baseLIBOBJS))
 $(LIBNAME): ../baseLIBOBJS
 endif
 
-# rule for lib (archive of object files) creation
 $(LIBNAME): $(LIBRARY_OBJS)
 
-$(LIBNAME): $(LIB_PREFIX)%$(LIB_SUFFIX):
+$(DLL_LINK_LIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) 
+
+$(LIBNAME) $(DLL_LINK_LIBNAME): $(LIB_PREFIX)%$(LIB_SUFFIX):
 	@$(RM) $@
 	$(ARCMD)
 ifneq ($(strip $(RANLIB)),)
 	$(RANLIB) $@
 endif # RANLIB
 
-$(DLL_LINK_LIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) 
-
-$(DLL_LINK_LIBNAME):$(SHRLIB_PREFIX)%.lib:
-	@$(RM) $@
-	$(LINK.shrlib)
-	$(MT_DLL_COMMAND)
-
 $(SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
 
 $(SHRLIBNAME):$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.shrlib)
+ifeq ($(SHRLIB_SUFFIX),.dll)
 	$(MT_DLL_COMMAND)
+endif
 
 $(LOADABLE_SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
 
 $(LOADABLE_SHRLIBNAME):$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	@$(RM) $@
-	$(LINK.loadable_shrlib)
+	$(LINK.shrlib)
+	$(MT_DLL_COMMAND)
 
 # C++ munching for VxWorks
 %.nm : %$(EXE)
@@ -316,7 +313,7 @@ $(OBJLIB_MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(OBJ)
 	$(MUNCH_CMD)
 
 runtests: $(TESTSCRIPTS_$(BUILD_CLASS))
-	$(PERL) -e 'use Test::Harness; runtests @ARGV if @ARGV;' $^
+	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
 
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
@@ -324,51 +321,55 @@ runtests: $(TESTSCRIPTS_$(BUILD_CLASS))
 	@$(CP) $< $@
 
 # Some versions of Test::Harness expect test programs in perl only.
-# Generate a 1-line perl program to exec the real test binary.
-# Uses the $0 runtime path to itself to find the executable.
+# Generate a perl program to exec the real test binary.
 %.t: %$(EXE)
 	@$(RM) $@
-	@echo '($$e=$$0)=~s/.t$$/$(EXE)/;exec "./$$e" or die "exec failed";'>$@
+	@$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
 
-# Ext, app and module rules
-RULES_INCLUDE CONFIG_APP_INCLUDE: $(wildcard $(TOP)/configure/RELEASE*)
-	@$(RM) $@
-	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) $@
+#---------------------------------------------------------------
+## Install rules for BIN_INSTALLS and LIB_INSTALLS
+define  BIN_INSTALLS_template
+$$(INSTALL_BIN)/$$(notdir $(1)) : $(1)
+	$(ECHO) "Installing $$(<F)"
+	@$$(INSTALL) -d -m $$(BIN_PERMISSIONS) $$^ $$(INSTALL_BIN)
+endef
+$(foreach file, $(BIN_INSTALLS), $(eval $(call BIN_INSTALLS_template, $(file))))
 
-binInstalls:  $(BIN_INSTALLS)
-	@echo "Installing $(^F)"
-	@$(INSTALL) -d -m 555 $^ $(INSTALL_BIN)
+define  LIB_INSTALLS_template
+$$(INSTALL_LIB)/$$(notdir $(1)) : $(1)
+	$(ECHO) "Installing $$(<F)"
+	@$$(INSTALL) -d -m $$(LIB_PERMISSIONS) $$^ $$(INSTALL_LIB)
+endef
+$(foreach file, $(LIB_INSTALLS), $(eval $(call LIB_INSTALLS_template, $(file))))
 
-libInstalls:  $(LIB_INSTALLS)
-	@echo "Installing $(^F)"
-	@$(INSTALL) -d -m 555 $^ $(INSTALL_LIB)
+#---------------------------------------------------------------
 
 $(INSTALL_BIN)/%: ../os/$(OS_CLASS)/%
-	@echo "Installing os-specific script $@"
-	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
+	$(ECHO) "Installing os-specific script $@"
+	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)
 
 $(INSTALL_BIN)/%: %
-	@echo "Installing binary $@"
-	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
+	$(ECHO) "Installing created file $@"
+	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)
 
 $(INSTALL_BIN)/%: ../%
-	@echo "Installing script $@"
-	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
+	$(ECHO) "Installing script $@"
+	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)
 
 $(INSTALL_LIB)/%.a: %.a
-	@echo "Installing library $@"
-	@$(INSTALL_LIBRARY) -d -m 644 $< $(INSTALL_LIB)
+	$(ECHO) "Installing library $@"
+	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_LIB)
 ifneq ($(strip $(RANLIB)),)
 	$(RANLIB) $@
 endif # RANLIB
 
 $(INSTALL_LIB)/%.lib: %.lib
-	@echo "Installing library $@"
-	@$(INSTALL_LIBRARY) -d -m 644 $< $(INSTALL_LIB)
+	$(ECHO) "Installing library $@"
+	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_LIB)
 
 $(INSTALL_SHRLIB)/lib%: lib%
-	@echo "Installing shared library $@"
-	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
+	$(ECHO) "Installing shared library $@"
+	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_SHRLIB)
 ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst .$(SHRLIB_VERSION),,$@)
 	ln -s $< $(subst .$(SHRLIB_VERSION),,$@)
@@ -377,20 +378,20 @@ endif # SHRLIB_VERSION
 
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
 $(INSTALL_TCLLIB)/%: %
-	@echo "Installing Tcl library $@"
-	@$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB)
+	$(ECHO) "Installing Tcl library $@"
+	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)
 
 $(INSTALL_TCLLIB)/%: ../%
-	@echo "Installing Tcl library $@"
-	@$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB)
+	$(ECHO) "Installing Tcl library $@"
+	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)
 endif
 
 $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS)
-	@echo "Updating $@"
-	@echo eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh
+	$(ECHO) "Updating $@"
+	$(ECHO) eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh
 
 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
-	@echo "Installing loadable shared library $@"
+	$(ECHO) "Installing loadable shared library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
 ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
 	@$(RM) $(subst .$(LOADABLE_SHRLIB_VERSION),,$@)
@@ -398,54 +399,56 @@ ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
 endif # LOADABLE_SHRLIB_VERSION
 
 $(INSTALL_CONFIG)/%: %
-	@echo "Installing config file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing config file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_CONFIG)/%: ../%
-	@echo "Installing config file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing config file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_INCLUDE)/% : $(COMMON_DIR)/%
-	@echo "Installing generated generic include file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing generated generic include file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_INCLUDE)/% : %
-	@echo "Installing generic include file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing generic include file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_INCLUDE)/os/$(OS_CLASS)/% : %
-	@echo "Installing os dependent include file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing os dependent include file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_DOC)/%: %
-	@echo "Installing doc $@"
-	@$(INSTALL) -d -m 644 $< $(INSTALL_DOC)
+	$(ECHO) "Installing doc $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)
 
 $(INSTALL_DOC)/%: ../%
-	@echo "Installing doc $@"
-	@$(INSTALL) -d -m 644 $< $(INSTALL_DOC)
+	$(ECHO) "Installing doc $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)
 
 $(INSTALL_HTML)/$(HTMLS_DIR)/%: %
-	@echo "Installing html $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing html $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_HTML)/$(HTMLS_DIR)/%: ../%
-	@echo "Installing html $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing html $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_TEMPLATES_SUBDIR)/%: ../%
-	@echo "Installing $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_TEMPLATES_SUBDIR)/%: %
-	@echo "Installing $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+
+-include $(CONFIG)/RULES_EXPAND
 
 .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
 .PRECIOUS: $(COMMON_INC)
 
-.PHONY: all inc build install clean rebuild buildInstall binInstalls libInstalls
-.PHONY: runtests
+.PHONY: all inc build install clean rebuild buildInstall
+.PHONY: runtests checkRelease warnRelease
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

configure/RULES_DIRS

@@ -14,9 +14,10 @@
 ARCHS += $(BUILD_ARCHS)
 ACTIONS += inc build install buildInstall clean realclean archclean runtests
 
-dirPart = $(word 1, $(subst $(DIVIDER), ,$@))
-actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$@)), \
-    $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$@))))
+dirPart = $(join $(dir $@), $(word 1, $(subst $(DIVIDER), ,$(notdir $@))))
+
+actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$(notdir $@))), \
+ $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$(notdir $@))))) 
 
 dirActionArchTargets = $(foreach dir, $(DIRS), \
                        $(foreach action, $(ACTIONS),\
@@ -36,6 +37,30 @@ all : install
 
 rebuild : clean install
 
+# Create directory dependancies lines for GNU make -j option
+# Only works with GNU make 3.81 or later (uses eval function)
+define DEP_template1
+$(1): $$($(1)_DEPEND_DIRS)
+endef
+$(foreach dir, $(DIRS),$(eval $(call DEP_template1,$(dir))))
+
+define DEP_template2
+$(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
+endef
+$(foreach action, $(ACTIONS), $(foreach dir, $(DIRS),$(eval $(call DEP_template2,$(dir),$(action)))))
+
+define DEP_template3
+$(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
+endef
+$(foreach arch, $(ARCHS), $(foreach dir, $(DIRS),$(eval $(call DEP_template3,$(dir),$(arch)))))
+
+define DEP_template4
+$(1)$$(DIVIDER)$(2)$$(DIVIDER)$(3) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2)$$(DIVIDER)$(3),$$(ddir)))
+endef
+$(foreach arch, $(ARCHS), $(foreach action, $(ACTIONS), $(foreach dir, $(DIRS), \
+              $(eval $(call DEP_template4,$(dir),$(action),$(arch))))))
+
+
 $(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
 	$(MAKE) -C $(dirPart) $(actionArchPart)
 

configure/RULES_EXPAND

@@ -0,0 +1,23 @@
+# <top>/configure/RULES_EXPAND
+
+ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
+
+# Default settings
+EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl
+
+EXPANDFLAGS += -t $(INSTALL_LOCATION) -a $(T_A)
+EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS))
+
+EXPANDED = $(EXPAND:%@=%)
+
+buildInstall: $(EXPANDED)
+
+$(EXPANDED): %: ../%@
+	$(ECHO) "Expanding $< to $@"
+	@$(RM) $@
+	@$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
+
+clean::
+	@$(RM) $(EXPANDED)
+
+endif

configure/RULES_FILE_TYPE

@@ -0,0 +1,73 @@
+#*************************************************************************
+# Copyright (c) 2006 UChicago Argonne LLC, 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 is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+#
+
+#---------------------------------------------------------------
+# Include <top>/configure/RULES_BUILD definitions from tops defined in RELEASE* files
+#
+RELEASE_RULES_BUILDS = $(foreach top, $(RELEASE_TOPS), $(wildcard $($(top))/configure/RULES_BUILD))
+ifneq ($(RELEASE_RULES_BUILDS),)
+  include $(RELEASE_RULES_BUILDS)
+endif
+
+#---------------------------------------------------------------
+# Include <top>/cfg/RULES* definitions from tops defined in RELEASE* files
+#
+RELEASE_CFG_RULES = $(foreach top, $(RELEASE_TOPS), $(wildcard $($(top))/cfg/RULES*))
+ifneq ($(RELEASE_CFG_RULES),)
+  include $(RELEASE_CFG_RULES)
+endif
+
+#---------------------------------------------------------------
+# If this is not BASE then include TOP/configure/RULES_BUILD definitions
+#
+ifeq ($(wildcard $(TOP)/configure/CONFIG_BASE_VERSION),)
+TOP_RULES_BUILDS = $(wildcard $(TOP)/configure/RULES_BUILD)
+ifneq ($(TOP_RULES_BUILDS),)
+  include $(TOP_RULES_BUILDS)
+endif
+endif
+
+#---------------------------------------------
+# Include existing and new $(INSTALL_CFG)/* definitions
+#
+TOP_CFG_FILES = $(sort $(wildcard $(INSTALL_CFG)/RULES*) \
+                       $(wildcard $(INSTALL_CFG)/CONFIG*) \
+                       $(addprefix $(INSTALL_CFG)/,$(CFG)))
+ifneq ($(TOP_CFG_FILES),)
+  include $(TOP_CFG_FILES)
+endif
+
+#---------------------------------------------------------------
+
+define FILE_TYPE_template
+
+$(1) += $$(if $$(strip $$($(1)_$$(OS_CLASS))),$$(subst -nil-,,$$($(1)_$$(OS_CLASS))), $$($(1)_DEFAULT))
+
+INSTALLS_$(1) = $$($(1):%=$$(INSTALL_$(1))/%)
+
+$$(INSTALL_$(1))/%: ../%
+	$(ECHO) "Installing $(1) file $$@"
+	@$$(INSTALL) -d -m  $$(INSTALL_PERMISSIONS) $$< $$(dir $$@)
+
+$$(INSTALL_$(1))/%: %
+	$(ECHO) "Installing $(1) file $$@"
+	@$$(INSTALL) -d -m  $$(INSTALL_PERMISSIONS) $$< $$(dir $$@)
+
+buildInstall : $$(INSTALLS_$(1))
+
+endef
+
+$(foreach type, $(FILE_TYPE),$(eval $(call FILE_TYPE_template,$(strip $(type)))))
+#---------------------------------------------
+
+clean::
+	@$(RM) $(foreach type, $(FILE_TYPE), $($(type)))
+

configure/RULES_JAVA

@@ -53,7 +53,6 @@ COMMON_JAVAINC += $(addprefix $(COMMON_DIR)/,$(JAVAINC))
 
 JAVACFLAGS += $(USR_JAVACFLAGS)
 CLASSES += $(subst .java,.class,$(JAVA))
-DEPJAVA += $(subst .class,.java,$(CLASSES))
 INSTALL_CLASSES = $(addprefix $(INSTALL_JAVA)/,$(CLASSES))
 
 TESTCLASSES += $(subst .java,.class,$(notdir $(TESTJAVA)))
@@ -63,7 +62,7 @@ DEPTESTJAVA += $(subst .class,.java,$(TESTCLASSES))
 #-------------------------------------------------------
 # Java jar file
 
-INSTALL_JAR =$(addprefix $(INSTALL_JAVA)/,$(JAR) $(JAR_INPUT))
+INSTALL_JAR =$(addprefix $(INSTALL_JAVA)/,$(JAR))
 JARMANIFEST += $(firstword $(MANIFEST) $(JAR_MANIFEST))
 JARDEPFILES += $(addprefix $(INSTALL_JAVA)/,$(subst .java,.class,$(JAVA)) $(JAR_INPUT))
 JARINPUT += $(foreach inp,$(JAR_INPUT),-C $(INSTALL_JAVA) $(subst .java,.class,$(inp)))
@@ -115,41 +114,41 @@ $(JAVA_DIRECTORY_TARGETS):
 endif
 
 $(COMMON_JAVAINC):$(JAVAINC_CLASSFILES)
-	@echo Creating header files $(COMMON_JAVAINC)
+	$(ECHO) Creating header files $(COMMON_JAVAINC)
 	@$(RM) $@
 	$(JAVAHCMD) $(JAVAINC_CLASSNAMES)
 
 $(COMMON_TESTCLASSES): $(addprefix ../,$(DEPTESTJAVA))
-	@echo Creating test java class files $(COMMON_TESTCLASSES)
+	$(ECHO) Creating test java class files $(COMMON_TESTCLASSES)
 	@$(RM) $@
 	$(JAVACCMD) -d $(COMMON_DIR) $^
 
-$(INSTALL_CLASSES): $(addprefix ../,$(DEPJAVA))
-	@echo Creating java class files 
+$(INSTALL_CLASSES): $(addprefix ../,$(JAVA))
+	$(ECHO) Creating java class files 
 	@$(RM) $@
 	$(JAVACCMD) -d $(INSTALL_JAVA) $^
 
 $(INSTALL_JAVADOC): $(addprefix ../,$(JAVA))
-	@echo Creating java doc files 
+	$(ECHO) Creating java doc files 
 	@$(RM) $@
 	$(JAVADOCCMD) -d $(addprefix $(INSTALL_HTML)/,$(JAVADOC)) $^
 
 $(COMMON_DIR)/%.jar: $(JARDEPFILES)
-	@echo Creating java jar file $@
+	$(ECHO) Creating java jar file $@
 	@$(RM) $@
 	$(JARCMD)
 
 $(INSTALL_JAVA)/%.jar: $(COMMON_DIR)/%.jar
-	@echo "Installing java jar file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing java jar file $@"
+	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_JAVA)/%.jar: %.jar
-	@echo "Installing java jar file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing java jar file $@"
+	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(addprefix $(INSTALL_JAVA)/, $(JARINPUT)): $(INSTALL_JAVA)/%: ../%
-	@echo "Installing jar input file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	$(ECHO) "Installing jar input file $@"
+	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PHONY: all install buildInstall rebuild clean build inc
 

configure/RULES_OCTAVE

@@ -0,0 +1,52 @@
+#*************************************************************************
+# 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$
+#
+#-------------------------------------------------------
+# Octave definitions and rules
+
+ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
+
+FILE_TYPE += OCTAVE
+INSTALL_OCTAVE = $(INSTALL_LOCATION_LIB)/octave
+DIRECTORY_TARGETS += $(INSTALL_OCTAVE)
+
+ifdef T_A
+
+MKOCTFILE_FLAGS += --mex --verbose -DOCTAVE
+MKOCTFILE_FLAGS += $(RELEASE_INCLUDES) $(addprefix -L,$(SHRLIB_SEARCH_DIRS))
+
+vpath %.mex $(USR_VPATH) $(ALL_SRC_DIRS)
+vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
+
+define OCTAVES_template
+$(1) : $$($(1)_SRCS)
+endef
+$(foreach file, $(OCTAVES),$(eval $(call OCTAVES_template,$(strip $(file)))))
+
+#This clean works from O.* dirs.
+clean:: 
+	@$(RM) *.mex *.m
+
+.PRECIOUS: *.m *.mex
+
+%.mex:
+	mkoctfile $(MKOCTFILE_FLAGS) $($*_LIBS:%=-l%) $($*_SRCS)
+
+endif
+endif
+
+
+# Makefile usage:
+#  OCTAVES +=  abc.mex def.mex
+#  abc_SRCS = a1.c a2.c
+#  abc_LIBS = ca Com
+#  def_SRCS = a3.c a4.c
+#  def_LIBS = ca Com

configure/RULES_TARGET

@@ -0,0 +1,111 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+#
+#  $Id$
+#
+#  RULES_TARGET
+#
+#  This file is to be maintained by the community.
+#
+#-----------------------------------------------------------------------
+
+define TARGET_template
+$(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \
+             $$(subst -nil-,,$$($(1)_$(2)_$$(OS_CLASS))), \
+             $$($(1)_$(2)_DEFAULT))
+endef
+
+$(foreach type, SRCS RCS OBJS LDFLAGS OBJLIBS LDOBJS SYS_LIBS , \
+$(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) , \
+    $(eval $(call TARGET_template,$(strip $(target)),$(type)))))
+
+#-----------------------------------------------------------------------
+
+# This define block requires GNU make 3.81
+define PROD_template
+ifeq ($$(strip $$($(1)_OBJS) $$($(1)_SRCS) $$(PRODUCT_OBJS)),)
+$(1)_OBJS = $(1)$$(OBJ)
+endif
+endef
+
+$(foreach target, $(PROD) $(TESTPROD), \
+    $(eval $(call PROD_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
+define TARGET2_template
+$(1)_LDLIBS += $$($(1)_LIBS)
+$(1)_LDLIBS += $$(if $$(strip $$($(1)_LIBS_$$(OS_CLASS))), \
+             $$(subst -nil-,,$$($(1)_LIBS_$$(OS_CLASS))), \
+             $$($(1)_LIBS_DEFAULT))
+
+$(1)_RESS = $$(if $$(RES),$$(addsuffix $$(RES),$$(basename $$($(1)_RCS))),)
+$(1)_OBJSNAME = $$(addsuffix $$(OBJ),$$(basename $$($(1)_OBJS) $$($(1)_SRCS) ))
+$(1)_DEPLIBS = $$(foreach lib, $$($(1)_LDLIBS),\
+ $$(firstword $$(wildcard $$(addsuffix /$$(LIB_PREFIX)$$(lib).*,\
+ $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))\
+ $$(addsuffix /$$(LIB_PREFIX)$$(lib)$$(LIB_SUFFIX),\
+ $$(firstword $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))))
+
+endef
+
+$(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) , \
+    $(eval $(call TARGET2_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
+define PROD2_template
+
+$(1)$$(EXE): $$($(1)_OBJSNAME) $$($(1)_RESS) $$($(1)_DEPLIBS)
+endef
+
+$(foreach target, $(PROD) $(TESTPROD), \
+    $(eval $(call PROD2_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
+define LIBRARY_template
+BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
+
+$(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS),\
+ $$(firstword $$(wildcard $$(addsuffix /$$(LIB_PREFIX)$$(lib).*,\
+ $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))\
+ $$(addsuffix /$$(LIB_PREFIX)$$(lib)$$(LIB_SUFFIX),\
+ $$(firstword $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))))
+
+$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
+$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_DEPLIBS)
+$$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
+$$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DEPLIBS)
+$$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS)
+endef
+
+$(foreach target, $(LIBRARY), \
+    $(eval $(call LIBRARY_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
+define LOADABLE_LIBRARY_template
+LOADABLE_BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
+
+$(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS),\
+ $$(firstword $$(wildcard $$(addsuffix /$$(LIB_PREFIX)$$(lib).\*,\
+ $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))\
+ $$(addsuffix /$$(LIB_PREFIX)$$(lib)$$(LIB_SUFFIX),\
+ $$(firstword $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))))
+
+$$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
+$$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_DEPLIBS)
+$$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS)
+endef
+
+$(foreach target, $(LOADABLE_LIBRARY), \
+    $(eval $(call LOADABLE_LIBRARY_template,$(strip $(target)))))
+

configure/RULES_TOP

@@ -16,6 +16,7 @@ include $(CONFIG)/RULES_DIRS
 UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
         $(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \
         $(INSTALL_DB)
+UNINSTALL_DIRS += $(DIRECTORY_TARGETS)
 
 uninstallArchTargets = $(foreach arch,$(BUILD_ARCHS), uninstall$(DIVIDER)$(arch))
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
@@ -30,13 +31,15 @@ endif
 ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
 	@$(RMDIR) $(INSTALL_LOCATION_LIB)
 endif
-	@echo
+	$(ECHO)
 # The echo above stops a "nothing to be done for cleandirs" message
 
 distclean: realclean realuninstall
 
+CVSCLEAN=$(firstword $(wildcard $(TOOLS)/cvsclean.pl $(TOP)/src/tools/cvsclean.pl))
+
 cvsclean:
-	@$(PERL) $(TOOLS)/cvsclean.pl 
+	@$(PERL) $(CVSCLEAN) 
 
 realuninstall:
 	@$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
@@ -49,32 +52,32 @@ uninstallDirs:
 	@$(RMDIR) $(UNINSTALL_DIRS)
 
 help:
-	@echo "Usage: gnumake [options] [target] ..."
-	@echo "Targets supported by all Makefiles:"
-	@echo "     install        - Builds and installs all targets (default rule)"
-	@echo "     all            - Same as install"
-	@echo "     buildInstall   - Same as install"
-	@echo "     clean          - Removes the O.<arch> dirs created by running make"
-	@echo "                      In O.<arch> dir, clean removes build created files"
-	@echo "     realclean      - Removes ALL O.<arch> dirs"
-	@echo "                      Cannot be used within an O.<arch> dir"
-	@echo "     rebuild        - Same as clean install"
-	@echo "     inc            - Installs header files"
-	@echo "     build          - Builds all targets"
-	@echo "     archclean      - Removes O.<arch> dirs but not O.Common dir"
-	@echo "\"Partial\" build targets supported by Makefiles:"
-	@echo "     inc.<arch>     - Installs <arch> only header files."
-	@echo "     install.<arch> - Builds and installs <arch> only."
-	@echo "     clean.<arch>   - Cleans <arch> binaries in O.<arch> dirs only."
-	@echo "     build.<arch>   - Builds <arch> only."
-	@echo "Targets supported by top level Makefile:"
-	@echo "     uninstall      - Cleans directories created by the install."
-	@echo "     realuninstall  - Removes ALL install dirs"
-	@echo "     distclean      - Same as realclean realuninstall."
-	@echo "     cvsclean       - Removes cvs .#* files in all dirs of directory tree"
-	@echo "     help           - Prints this list of valid make targets "
-	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
-	@echo "     xxxRecord.o"
+	$(ECHO) "Usage: gnumake [options] [target] ..."
+	$(ECHO) "Targets supported by all Makefiles:"
+	$(ECHO) "     install        - Builds and installs all targets (default rule)"
+	$(ECHO) "     all            - Same as install"
+	$(ECHO) "     buildInstall   - Same as install"
+	$(ECHO) "     clean          - Removes the O.<arch> dirs created by running make"
+	$(ECHO) "                      In O.<arch> dir, clean removes build created files"
+	$(ECHO) "     realclean      - Removes ALL O.<arch> dirs"
+	$(ECHO) "                      Cannot be used within an O.<arch> dir"
+	$(ECHO) "     rebuild        - Same as clean install"
+	$(ECHO) "     inc            - Installs header files"
+	$(ECHO) "     build          - Builds all targets"
+	$(ECHO) "     archclean      - Removes O.<arch> dirs but not O.Common dir"
+	$(ECHO) "\"Partial\" build targets supported by Makefiles:"
+	$(ECHO) "     inc.<arch>     - Installs <arch> only header files."
+	$(ECHO) "     install.<arch> - Builds and installs <arch> only."
+	$(ECHO) "     clean.<arch>   - Cleans <arch> binaries in O.<arch> dirs only."
+	$(ECHO) "     build.<arch>   - Builds <arch> only."
+	$(ECHO) "Targets supported by top level Makefile:"
+	$(ECHO) "     uninstall      - Cleans directories created by the install."
+	$(ECHO) "     realuninstall  - Removes ALL install dirs"
+	$(ECHO) "     distclean      - Same as realclean realuninstall."
+	$(ECHO) "     cvsclean       - Removes cvs .#* files in all dirs of directory tree"
+	$(ECHO) "     help           - Prints this list of valid make targets "
+	$(ECHO) "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
+	$(ECHO) "     xxxRecord.o"
 
 .PHONY : $(uninstallArchTargets)
 .PHONY : uninstall help cleandirs distclean uninstallDirs realuninstall

configure/Sample.Makefile

@@ -63,9 +63,9 @@ a_file_CPPFLAGS_WIN32   = -DVERSION='WIN32 port'
 #	again: if INC_$(OS_CLASS) is defined, it is added to INC,
 #	otherwise INC_DEFAULT (if defined) is added:
 #
-INC_DEFAULT = for_all_but_WIN32_or_hp700.h
+INC_DEFAULT = for_all_but_WIN32_or_vxWorks.h
 INC_WIN32   = only_for_WIN32.h
-INC_hpux   = -nil-		# hpux uses no special include
+INC_vxWorks = -nil-		# vxWorks uses no special include
 INC         = file.h
 
 # --------------------------------------------------------------------

configure/os/CONFIG.Common.RTEMS

@@ -18,11 +18,16 @@
 -include $(CONFIG)/os/CONFIG.Common.UnixCommon
 
 GNU_TARGET_INCLUDE_DIR =
+unexport GCC_EXEC_PREFIX
 
 #--------------------------------------------------
 # Get RTEMS_BASE definition
 -include $(CONFIG)/os/CONFIG_SITE.Common.RTEMS
 
+ifneq ($(CONFIG),$(TOP)/configure)
+-include $(TOP)/configure/CONFIG_SITE.Common.RTEMS
+endif
+
 #-------------------------------------------------------
 # Pick up the RTEMS tool/path definitions from the RTEMS BSP directory.
 include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(subst RTEMS-,,$(T_A))/Makefile.inc
@@ -31,13 +36,13 @@ include $(CONFIG.CC)
 
 #-------------------------------------------------------
 # RTEMS cross-development tools
-CC = $(RTEMS_BASE)/bin/$(CC_FOR_TARGET) $(GCCSPECS) -fasm
-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
+CC = $(RTEMS_TOOLS)/bin/$(CC_FOR_TARGET) $(GCCSPECS) -fasm
+CCC = $(RTEMS_TOOLS)/bin/$(CXX)
+CPP = $(RTEMS_TOOLS)/bin/$(CC_FOR_TARGET) -x c -E
+AR = $(RTEMS_TOOLS)/bin/$(AR_FOR_TARGET)
+LD = $(RTEMS_TOOLS)/bin/$(LD_FOR_TARGET) -r
 
-RANLIB := $(RTEMS_BASE)/bin/$(RANLIB)
+RANLIB := $(RTEMS_TOOLS)/bin/$(RANLIB)
 
 #-------------------------------------------------------
 # Build types
@@ -46,11 +51,11 @@ VALID_BUILDS = Ioc
 #--------------------------------------------------
 # The RTEMS Makefiles redefine several macros, so we have to go
 # through the following contortions to get the EPICS flags back.
-CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
+CFLAGS = $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
  $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
  $(CODE_CFLAGS) $(STATIC_CFLAGS)  $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-CXXFLAGS = $(CONFORM_CXXFLAGS) $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
+CXXFLAGS = $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
  $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
  $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS)\
  $(LIBRARY_SRC_CFLAGS)
@@ -59,10 +64,10 @@ LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
  $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)\
  $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
-LDLIBS = $(STATIC_LDLIBS)\
+LDLIBS = \
  $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)
 
-CPPFLAGS += $(CONFORM_CPPFLAGS) $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS)\
+CPPFLAGS += $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS)\
 $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
  $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
@@ -82,7 +87,7 @@ OS_CLASS = RTEMS
 
 #--------------------------------------------------
 # Operating system flags
-OP_SYS_LDLIBS += -lrtemsCom -lrtemscpu -lCom -lrtemsNfs -lm
+OP_SYS_LDLIBS += -lrtemsCom -lc -lrtemscpu -lCom -lnfs -lm
 OP_SYS_LDFLAGS += $(CPU_CFLAGS) -u Init \
                  $(PROJECT_RELEASE)/lib/no-dpmem.rel \
                  $(PROJECT_RELEASE)/lib/no-mp.rel \
@@ -98,9 +103,8 @@ CODE_CFLAGS =
 CODE_CXXFLAGS =
 
 #--------------------------------------------------
-# RTEMS uses the inline keyword so -pedantic causes too many problems.
-CONFORM_CFLAGS_STRICT = -ansi
-CONFORM_CXXFLAGS_STRICT = -ansi
+# Override the usual RTEMS verbosity from ar
+ARFLAGS = rc
 
 #--------------------------------------------------
 # Command-line input support
@@ -109,4 +113,4 @@ LDLIBS_READLINE = -lreadline -lncurses
 
 #--------------------------------------------------
 # Allow site overrides
--include $(CONFIG)/os/CONFIG_SITE.Common.RTEMS
+-include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).RTEMS

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -0,0 +1,38 @@
+#
+# CONFIG.Common.RTEMS-beatnik
+# A migration from Eric Norum's CONFIG.Common.RTEMS-mvme5500
+# Author: Dayle Kotturi
+#         SLAC
+#         dayle@slac.stanford.edu
+#
+# All RTEMS targets use the same Makefile fragment
+#
+override EXE=.elf
+RTEMS_TARGET_CPU = powerpc
+GNU_TARGET=powerpc-rtems
+ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
+ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
+
+MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+define MUNCH_CMD
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
+endef
+
+CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik
+
+include $(CONFIG)/os/CONFIG.Common.RTEMS
+RTEMSSYMS=$(PRODNAME:%$(EXE)=%.sym)
+RTEMSIMGS=$(PRODNAME:%$(EXE)=%.bin)
+INSTALL_RTEMSSYMS=$(RTEMSSYMS:%=$(INSTALL_BIN)/%)
+INSTALL_RTEMSIMGS=$(RTEMSIMGS:%=$(INSTALL_BIN)/%)
+
+OP_SYS_LDLIBS += -lbspExt
+
+%.sym: %$(EXE)
+	$(XSYMS) $^ $@
+
+%.bin: %$(EXE)
+	$(OBJCOPY) -Obinary $^ $@
+
+#PRODTARGETS+=$(INSTALL_RTEMSSYMS) $(INSTALL_RTEMSIMGS)

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -13,9 +13,9 @@ ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
-	$(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems
-	$(RTEMS_BASE)/bin/$(LD_FOR_TARGET) -o $@ \
+	$(RTEMS_TOOLS)/bin/$(LD_FOR_TARGET) -o $@ \
 		 $(PROJECT_RELEASE)/lib/bootloader.o \
 		--just-symbols=$< \
 		-b binary rtems.gz \
@@ -24,4 +24,6 @@ define MUNCH_CMD
 	rm -f rtems.gz
 endef
 
+OP_SYS_LDLIBS += -lbspExt
+
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme2700

@@ -0,0 +1,25 @@
+#
+# Author: Matt Rippa
+#
+RTEMS_TARGET_CPU = powerpc
+ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
+ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
+ARCH_DEP_CFLAGS += -DNVRAM_INDIRECT
+
+MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+define MUNCH_CMD
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
+	gzip -f9 rtems
+	$(RTEMS_TOOLS)/bin/$(LD_FOR_TARGET) -o $@ \
+		 $(PROJECT_RELEASE)/lib/bootloader.o \
+		--just-symbols=$< \
+		-b binary rtems.gz \
+		-T $(PROJECT_RELEASE)/lib/ppcboot.lds \
+		-Map $<.map
+	rm -f rtems.gz
+endef
+
+OP_SYS_LDLIBS += -lbspExt
+
+include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme3100

@@ -0,0 +1,32 @@
+#
+# All RTEMS targets use the same Makefile fragment
+#
+override EXE=.elf
+RTEMS_TARGET_CPU = powerpc
+GNU_TARGET=powerpc-rtems
+ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
+ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
+
+MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+define MUNCH_CMD
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
+endef
+
+CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik
+
+include $(CONFIG)/os/CONFIG.Common.RTEMS
+RTEMSSYMS=$(PRODNAME:%$(EXE)=%.sym)
+RTEMSIMGS=$(PRODNAME:%$(EXE)=%.bin)
+INSTALL_RTEMSSYMS=$(RTEMSSYMS:%=$(INSTALL_BIN)/%)
+INSTALL_RTEMSIMGS=$(RTEMSIMGS:%=$(INSTALL_BIN)/%)
+
+OP_SYS_LDLIBS += -lbspExt
+
+%.sym: %$(EXE)
+	$(XSYMS) $^ $@
+
+%.bin: %$(EXE)
+	$(OBJCOPY) -Obinary $^ $@
+
+#PRODTARGETS+=$(INSTALL_RTEMSSYMS) $(INSTALL_RTEMSIMGS)

configure/os/CONFIG.Common.RTEMS-mvme5500

@@ -9,11 +9,12 @@
 RTEMS_TARGET_CPU = powerpc
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
+ARCH_DEP_CFLAGS += -DBSP_NVRAM_BASE_ADDR=0xf1110000
 
 MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
-	$(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-pc386

@@ -11,7 +11,7 @@ RTEMS_TARGET_CPU=i386
 MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
-	$(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
 	$(PROJECT_RELEASE)/build-tools/bin2boot $@ 0x00097E00 \
 		$(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 temp.bin 0x00100000 0
 	rm -f temp.bin

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -12,12 +12,7 @@ ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
-	$(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@
 endef
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS
-
-#
-# Must put this one so it shows up after the -m528x
-#
-OP_SYS_LDFLAGS += -m5200

configure/os/CONFIG.Common.UnixCommon

@@ -12,10 +12,6 @@
 # Unix valid build types
 VALID_BUILDS = Host Ioc
 
-#-------------------------------------------------------
-# Gnu directory
-GNU_DIR = /usr/local
-
 #-------------------------------------------------------
 # Unix prefix and suffix definitions
 EXE =
@@ -36,7 +32,7 @@ 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: SHRLIB_DEPLIBS, SHRLIB_LDLIBS and SHRLIBDIR_LDFLAGS definitions
 
 # SHRLIB_LIBS deprecated
 LIB_LIBS += $(SHRLIB_LIBS)
@@ -47,16 +43,18 @@ SHRLIB_DEPLIBS=$(foreach lib, $(LIB_LIBS) $(USR_LIBS), \
 	$(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_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS))\
+ $(STATIC_LDLIBS) \
+ $(addprefix -l, $($*_SYS_LIBS) $(LIB_SYS_LIBS) $(USR_SYS_LIBS)) \
+ $(LDLIBS)
 
 SHRLIB_DEPLIB_DIRS = $(foreach word,$(sort $(dir $($*_DEPLIBS) $(SHRLIB_DEPLIBS))), \
-  $(shell $(PERL) $(TOOLS)/fullPathName.pl $(word)))
+   $(shell $(PERL) $(TOOLS)/fullPathName.pl $(word)))
 
 SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-L%)
 
 #-------------------------------------------------------
-# Prod: DEPLIBS, LDFLAGS, and LDLIBS definitions
+# Prod: PROD_DEPLIBS, PROD_LDLIBS and PRODDIR_LDFLAGS definitions
 
 PROD_DEPLIBS=$(foreach lib,$(PROD_LIBS) $(USR_LIBS), \
 	$(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).*, \
@@ -64,8 +62,9 @@ PROD_DEPLIBS=$(foreach lib,$(PROD_LIBS) $(USR_LIBS), \
 	$(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_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(PROD_LIBS) $(USR_LIBS)) \
+ $(STATIC_LDLIBS) \
+ $(addprefix -l, $($*_SYS_LIBS) $(PROD_SYS_LIBS) $(USR_SYS_LIBS))
 
 LDLIBS_STATIC_YES = LDLIBS
 LDLIBS_SHARED_NO = LDLIBS
@@ -81,10 +80,8 @@ PRODDIR_LDFLAGS += $(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 = $(CCC) -o $@ $(TARGET_LIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
 LINK.shrlib += $(LIB_LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
-LINK.loadable_shrlib = $(CCC) -o $@ $(LOADABLE_SHRLIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
-LINK.loadable_shrlib += $(LIB_LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
 
 #--------------------------------------------------
 # Operating system definitions

configure/os/CONFIG.Common.cygwin-x86

@@ -13,27 +13,59 @@ include $(CONFIG)/os/CONFIG.Common.UnixCommon
 OS_CLASS = cygwin32
 ARCH_CLASS = x86
 
-EXE=.exe
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline -lcurses
 
-COMPILER_CPPFLAGS = -D_REENTRANT
-
-#POSIX_CPPFLAGS = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS -D_POSIX_TIMERS
-# _POSIX_SOURCE eliminates select()
 POSIX_CPPFLAGS = -D_POSIX_THREADS -D_POSIX_TIMERS
+#POSIX_CPPFLAGS += -D_POSIX_SOURCE
 POSIX_LDLIBS += -lpthread
 
-ARCH_DEP_CPPFLAGS += -D_X86_
+ARCH_DEP_CFLAGS += -m32
+ARCH_DEP_LDFLAGS += -m32
 
-OP_SYS_CPPFLAGS += -DCYGWIN32 -U_WIN32
+# Compiler defines _X86_ 1
+# Compiler defines __MSVCRT__ 1
+# Compiler defines __CYGWIN__ 1
+# Compiler defines __CYGWIN32__ 1
+# Compiler defines __unix__ 1
+# Compiler defines __unix 1
+# Compiler defines unix 1
 
-# Set runtime path for shared libraries
-SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+OP_SYS_CPPFLAGS += -DCYGWIN32
 
-# Set runtime path for products
-PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+EXE=.exe
 
-#  Definitions used when COMMANDLINE_LIBRARY is READLINE
-INCLUDES_READLINE = -I$(GNU_DIR)/include
-LDFLAGS_READLINE += -L$(GNU_DIR)/lib
-LDLIBS_READLINE = -lreadline
+VISC_DLL_NO = -DEPICS_DLL_NO
+VISC_DLL_YES =
+VISC_DLL = $(VISC_DLL_$(SHARED_LIBRARIES))
+STATIC_CFLAGS_YES= $(VISC_DLL)
+STATIC_CFLAGS_NO=  $(VISC_DLL) -D_DLL
+STATIC_CXXFLAGS_YES= $(VISC_DLL)
+STATIC_CXXFLAGS_NO=  $(VISC_DLL) -D_DLL
+
+#	adjust names of libraries to build
+#
+#	But: if there are no objects LIBRARY_LD_OBJS to include
+#	in this library (may be for e.g. base/src/libCompat
+#	on some archs), don't define (and build) any library!
+SHRLIB_PREFIX=
+SHRLIB_SUFFIX=.dll
+SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
+LOADABLE_SHRLIB_PREFIX=
+LOADABLE_SHRLIB_SUFFIX=.dll
+LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX))
+
+#
+# When SHARED_LIBRARIES is YES we are building a DLL link library 
+# and when SHARED_LIBRARIES is NO we are building an object library
+#
+LIB_PREFIX=
+LIB_SUFFIX=.lib
+DLL_LINK_LIBNAME_YES = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX))
+DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES))
+LIBNAME_NO = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX))
+LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES))
+
+#	dll install location
+INSTALL_SHRLIB = $(INSTALL_BIN)
 

configure/os/CONFIG.Common.darwin-ppc

@@ -8,9 +8,8 @@
 #-------------------------------------------------------
 
 #
-# Architecture-specific information
-#
-ARCH_CLASS = ppc
+# To build universal binaries, configure ARCH_CLASS
+# in the file CONFIG_SITE.Common.darwin-ppc
 
 # Include definitions common to all Darwin targets
 include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

configure/os/CONFIG.Common.darwin-ppcx86

@@ -3,20 +3,13 @@
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for Darwin 'universal' (PowerPC, Intel) target builds
+# Definitions for Darwin universal PowerPC + x86 target builds
 # Sites may override these definitions in CONFIG_SITE.Common.darwin-ppcx86
 #-------------------------------------------------------
 
 #
-# Set architecture-specific information
-#
-ARCH_CLASS = ppcx86
-
-#
-# Universal binary support
-#
-OP_SYS_CFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
-OP_SYS_LDFLAGS += -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
+# To build universal binaries, configure ARCH_CLASS
+# in the file CONFIG_SITE.Common.darwin-ppcx86
 
 # Include definitions common to all Darwin targets
 include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

configure/os/CONFIG.Common.darwin-x86

@@ -8,9 +8,8 @@
 #-------------------------------------------------------
 
 #
-# Architecture-specific information
-#
-ARCH_CLASS = x86
+# To build universal binaries, configure ARCH_CLASS
+# in the file CONFIG_SITE.Common.darwin-x86
 
 # Include definitions common to all Darwin targets
 include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

configure/os/CONFIG.Common.freebsdCommon

@@ -30,3 +30,8 @@ PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
 LDLIBS_READLINE = -lreadline -lcurses
 
 GNU_LDLIBS_YES = -lgcc_pic
+
+#--------------------------------------------------
+# Allow site overrides
+-include $(CONFIG)/os/CONFIG_SITE.Common.freebsdCommon
+-include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).freebsdCommon

configure/os/CONFIG.Common.hpux-parisc

@@ -1,34 +0,0 @@
-# CONFIG.Common.hpux-parisc
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for hpux-parisc target archs
-# Sites may override these definitions in CONFIG_SITE.Common.hpux-parisc
-#-------------------------------------------------------
-
-#Include definitions common to unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-OS_CLASS = hpux
-ARCH_CLASS = parisc
-
-# 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 = -DHP_UX
-OP_SYS_CFLAGS = -D_HPUX_SOURCE 
-OP_SYS_CXXFLAGS =
-
-SHRLIB_SUFFIX = .sl$(addprefix .,$(SHRLIB_VERSION))
-LOADABLE_SHRLIB_SUFFIX = .sl$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
-
-# Set runtime path for shared libraries
-empty:=                                      # trick from the make docs...
-space:= $(empty) $(empty)
-SHRLIBDIR_LDFLAGS += -Wl,+b$(subst $(space),:,$(SHRLIB_DEPLIB_DIRS)),+s
-
-# Set runtime path for products
-PRODDIR_LDFLAGS += -Wl,+b$(subst $(space),:,$(PROD_DEPLIB_DIRS)),+s
-
-GNU_TARGET=parisc-hp-unix

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

@@ -1,11 +0,0 @@
-# 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.interix-x86

@@ -1,41 +0,0 @@
-# CONFIG.Common.interix-x86
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for interix-x86 target builds
-# Sites may override these definitions in CONFIG_SITE.Common.interix-x86
-#-------------------------------------------------------
-
-# Include definitions common to all Unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-OS_CLASS = interix
-ARCH_CLASS = x86
-
-EXE=
-
-POSIX_CPPFLAGS  = -D_POSIX_C_SOURCE=199506L 
-POSIX_CPPFLAGS += -D_POSIX_THREADS
-POSIX_CPPFLAGS += -D_ALL_SOURCE
-POSIX_CPPFLAGS += -D_POSIX_TIMERS
-
-POSIX_CPPFLAGS += -D_REENTRANT
-
-POSIX_LDLIBS += -lpthread
-
-ARCH_DEP_CPPFLAGS += -D_X86_
-
-OP_SYS_CPPFLAGS += -DUNIX
-
-# Set runtime path for shared libraries
-SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
-
-# Set runtime path for products
-PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
-
-#  Definitions used when COMMANDLINE_LIBRARY is READLINE
-INCLUDES_READLINE = -I$(GNU_DIR)/include
-LDFLAGS_READLINE += -L$(GNU_DIR)/lib
-LDLIBS_READLINE = -lreadline
-

configure/os/CONFIG.Common.linux-386

@@ -10,9 +10,13 @@
 # Include definitions common to all linux x86 targets
 include $(CONFIG)/os/CONFIG.Common.linux-x86
 
-ARCH_DEP_CFLAGS = -march=i386
+ARCH_DEP_CFLAGS += -march=i386
 
 ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=i386-pc-linux-gnu
+  VALID_BUILDS = Ioc
 endif
 
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. i386-pc-linux-gnu-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-386 file, e.g. GNU_TARGET=i386-pc-linux-gnu
+

configure/os/CONFIG.Common.linux-486

@@ -10,9 +10,13 @@
 # Include definitions common to all linux x86 targets
 include $(CONFIG)/os/CONFIG.Common.linux-x86
 
-ARCH_DEP_CFLAGS = -march=i486
+ARCH_DEP_CFLAGS += -march=i486
 
 ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=i486-pc-linux-gnu
+   VALID_BUILDS = Ioc
 endif
 
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. i486-pc-linux-gnu-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-486 file, e.g. GNU_TARGET=i486-pc-linux-gnu
+

configure/os/CONFIG.Common.linux-586

@@ -10,10 +10,15 @@
 # Include definitions common to all linux x86 targets
 include $(CONFIG)/os/CONFIG.Common.linux-x86
 
-# i586 is euivalent to pentiumpro
-ARCH_DEP_CFLAGS = -march=i586
+# i586 is equivalent to pentium
+ARCH_DEP_CFLAGS += -march=i586
 
 ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=i586-pc-linux-gnu
+   VALID_BUILDS = Ioc
 endif
 
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. i586-pc-linux-gnu-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-586 file, e.g. GNU_TARGET=i586-pc-linux-gnu
+
+

configure/os/CONFIG.Common.linux-686

@@ -11,9 +11,13 @@
 include $(CONFIG)/os/CONFIG.Common.linux-x86
 
 # i686 is euivalent to pentiumpro
-ARCH_DEP_CFLAGS = -march=i686
+ARCH_DEP_CFLAGS += -march=i686
 
 ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=i686-pc-linux-gnu
+   VALID_BUILDS = Ioc
 endif
 
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. i686-pc-linux-gnu-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-686 file, e.g. GNU_TARGET=i686-pc-linux-gnu
+

configure/os/CONFIG.Common.linux-arm

@@ -13,8 +13,10 @@ ARCH_CLASS = arm
 
 # Set a special definition for network order of Netwinder ARM floating point
 ARCH_DEP_CPPFLAGS += -D_ARM_NWFP_
+ARCH_DEP_CPPFLAGS += -mcpu=arm9 -marm
 
 ifeq ($(BUILD_CLASS),CROSS)
+    VALID_BUILDS = Ioc
     GNU_TARGET = arm-linux
 
     # prefix of compiler tools

configure/os/CONFIG.Common.linux-arm_eb

@@ -0,0 +1,11 @@
+# CONFIG.Common.linux-arm_eb
+#
+# This file is maintained by the build community.
+#
+# Definitions for linux-arm_eb (big endian) target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-arm_eb
+#-------------------------------------------------------
+
+# Include definitions common to all Linux-arm targets
+include $(CONFIG)/os/CONFIG.Common.linux-arm
+

configure/os/CONFIG.Common.linux-arm_el

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

configure/os/CONFIG.Common.linux-athlon

@@ -12,8 +12,11 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86
 
 ARCH_DEP_CFLAGS += -march=athlon-mp -mfpmath=sse
 
-
 ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=athlon-pc-linux-gnu
+   VALID_BUILDS = Ioc
 endif
 
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. athlon-pc-linux-gnu-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-athlon file, e.g. GNU_TARGET=athlon-pc-linux-gnu
+

configure/os/CONFIG.Common.linux-cris

@@ -0,0 +1,58 @@
+# CONFIG.Common.linux-cris
+#
+# Author: Peter Zumbruch
+#         GSI
+#         P.Zumbruch@gsi.de
+#
+# Definitions for linux-cris target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-cris
+#-------------------------------------------------------
+
+# Include definitions common to all linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = cris
+
+ifeq ($(BUILD_CLASS),CROSS)
+    GNU_TARGET = cris-axis-linux-gnu
+    
+    # prefix of compiler tools
+    CMPLR_SUFFIX =
+    CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
+        
+    # CROSS_TOP_DIR
+    #    usually AXIS_TOP_DIR is defined via 
+    #    the init_env script of the SDK provided by Axis
+    #
+    ## AXIS_TOP_DIR defined? Make missing mandatory variable visible
+    AXIS_TOP_DIR?=UNDEFINED_ENV__AXIS_TOP_DIR
+    AXIS_SDK_DIR?=$(AXIS_TOP_DIR)
+    
+    # CROSS_INCLUDES 
+    AXIS_SDK_TARGET_INCLUDE_DIR = $(AXIS_SDK_DIR)/target/$(GNU_TARGET)/include 
+    AXIS_SDK_TARGET_INCLUDE_DIR +=$(AXIS_SDK_DIR)/target/$(GNU_TARGET)/usr/include
+   
+    CROSS_INCLUDES = $(addprefix -isystem ,$(AXIS_SDK_TARGET_INCLUDE_DIR))
+
+    # CROSS_LDFLAGS 
+    AXIS_SDK_TARGET_LIB_DIR =  $(AXIS_SDK_DIR)/target/$(GNU_TARGET)/lib
+    AXIS_SDK_TARGET_LIB_DIR += $(AXIS_SDK_DIR)/target/$(GNU_TARGET)/usr/lib
+   
+    CROSS_LDFLAGS = $(addprefix -L,$(AXIS_SDK_TARGET_LIB_DIR))
+
+-include $(CONFIG)/os/CONFIG_SITE.Common.linux-cris
+ifeq ($(EPICS_HOST_ARCH), linux-x86)
+-include $(CONFIG)/os/CONFIG.linux-x86.linux-cris
+-include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-cris
+endif
+endif
+
+SHARED_LIBRARIES=NO
+STATIC_BUILD=YES
+
+ARCH_DEP_CFLAGS += -mno-mul-bug-workaround
+OP_SYS_CFLAGS += -mlinux
+ARCH_DEP_CPPFLAGS += -D_cris_ -mlinux
+
+#uncomment CRIS_COMPILER_DEBUG for debugging cris-compiled code
+#CRIS_COMPILER_DEBUG

configure/os/CONFIG.Common.linux-ppc

@@ -9,9 +9,6 @@
 # Include definitions common to all Unix targets
 include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
-#
-# Set OS-specific information
-#
 ARCH_CLASS = ppc
 
 ARCH_DEP_CPPFLAGS += -D_ppc_

configure/os/CONFIG.Common.linux-x86

@@ -13,23 +13,10 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 ARCH_CLASS = x86
 
 ARCH_DEP_CPPFLAGS += -D_X86_
+ARCH_DEP_CFLAGS += -m32
+ARCH_DEP_LDFLAGS += -m32
 
-ifeq ($(BUILD_CLASS),CROSS)
-ifeq ($(EPICS_HOST_ARCH),linux-x86)
-   # Added for 386,486,... cross builds
-   CMPLR_PREFIX=
-   CROSS_INCLUDES=
-   CROSS_LDFLAGS=
-   # Use -w not -Wall
-   #WARN_CFLAGS_YES = -w
-   #WARN_CXXFLAGS_YES = -w
--include $(CONFIG)/os/CONFIG_SITE.Common.linux-x86
--include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-x86
-else
-   GNU_TARGET=i586-pc-linux-gnu
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-endif
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. x86-redhat-linux-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-x86 file, e.g. GNU_TARGET=x86-redhat-linux
 

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

@@ -10,3 +10,4 @@
 # Include definitions common to all linux-x86  target archs
 include $(CONFIG)/os/CONFIG.Common.linux-x86
 
+HOST_OPT=NO

configure/os/CONFIG.Common.linux-x86_64

@@ -13,23 +13,14 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 ARCH_CLASS = x86_64
 
 ARCH_DEP_CPPFLAGS += -D_X86_64_
+ARCH_DEP_CFLAGS += -m64
+ARCH_DEP_LDFLAGS += -m64
 
 ifeq ($(BUILD_CLASS),CROSS)
-ifeq ($(EPICS_HOST_ARCH),linux-x86_64)
-   # Added for 386,486,... cross builds
-   CMPLR_PREFIX=
-   CROSS_INCLUDES=
-   CROSS_LDFLAGS=
-   # Use -w not -Wall
-   #WARN_CFLAGS_YES = -w
-   #WARN_CXXFLAGS_YES = -w
--include $(CONFIG)/os/CONFIG_SITE.Common.linux-x86_64
--include $(CONFIG)/os/CONFIG.linux-x86_64.linux-x86_64
--include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.linux-x86_64
-else
-   GNU_TARGET=i586-pc-linux-gnu
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
+  VALID_BUILDS = Ioc
 endif
 
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. x86_64-redhat-linux-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-x86_64 file, e.g. GNU_TARGET=x86_64-redhat-linux
+

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

@@ -10,3 +10,4 @@
 # Include definitions common to all linux-x86_64  target archs
 include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 
+HOST_OPT=NO

configure/os/CONFIG.Common.linux-xscale_be

@@ -0,0 +1,25 @@
+# CONFIG.Common.linux-xscale_be
+#
+# This file is maintained by the build community.
+#
+# Definitions for linux-xscale_be (big-endian) target builds.
+# This target has been tested with the MOXA UC-7408-LX Plus.
+
+# Sites may override these definitions in CONFIG_SITE.Common.linux-xscale_be
+#-------------------------------------------------------
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = xscale
+
+#
+# The vendor's tool chain needs to be located here
+#
+GNU_DIR=/usr/local/xscale_be
+
+ifeq ($(BUILD_CLASS),CROSS)
+    VALID_BUILDS = Ioc
+    GNU_TARGET = xscale_be
+    CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
+endif

configure/os/CONFIG.Common.linuxCommon

@@ -20,7 +20,12 @@ POSIX_LDLIBS = -lpthread
 # -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_LDLIBS += -lrt
+OP_SYS_LDLIBS += -lrt -ldl
+
+# Added here for cross-target builds which include this file
+STATIC_LDFLAGS_YES= -Wl,-Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
 # Set runtime path for shared libraries
 SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
@@ -29,5 +34,9 @@ SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
 PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-LDLIBS_READLINE = -lreadline -lcurses
+LDLIBS_READLINE = -lreadline -lncurses
 
+#--------------------------------------------------
+# Allow site overrides
+-include $(CONFIG)/os/CONFIG_SITE.Common.linuxCommon
+-include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).linuxCommon

configure/os/CONFIG.Common.osf-alpha

@@ -16,7 +16,8 @@ ARCH_CLASS = alpha
 CODE_CPPFLAGS =
 
 POSIX_CPPFLAGS += -pthread -ieee
-POSIX_LDFLAGS += -pthread -ieee
+# Unknown reason why this doesn't work in POSIX_LDFLAGS:
+POSIX_LDLIBS += -pthread -ieee
 
 OP_SYS_CPPFLAGS += -D_OSF_SOURCE
 OP_SYS_LDLIBS += -lrt

configure/os/CONFIG.Common.solaris-sparc

@@ -20,9 +20,9 @@ COMPILER_LDFLAGS += -mt
 
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 
-POSIX_CPPFLAGS += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION))
+POSIX_CPPFLAGS += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_$(SOLARIS_VERSION))
 POSIX_CPPFLAGS += -D_XOPEN_SOURCE=500
-POSIX_LDLIBS += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION))
+POSIX_LDLIBS += -lposix4 -lpthread $(POSIX_LDLIBS_$(SOLARIS_VERSION))
 
 OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS)
 OP_SYS_LDFLAGS +=  $(COMPILER_LDFLAGS)
@@ -37,16 +37,30 @@ RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
 GNU_TARGET=sparc-sun-solaris2
 
+STLPORT_CFLAGS_YES= -library=stlport4
+STLPORT_CFLAGS_NO=
+STLPORT_LDLIBS_YES =
+STLPORT_LDLIBS_NO = -lCstd
+
+# can be overridden in CONFIG_SITE.Common.solaris-sparc
+USE_STLPORT=NO
+
+OP_SYS_CFLAGS+=$(STLPORT_CFLAGS_$(USE_STLPORT))
+OP_SYS_LDFLAGS+=$(STLPORT_CFLAGS_$(USE_STLPORT))
+OP_SYS_LDLIBS += $(STLPORT_LDLIBS_$(USE_STLPORT))
+
+# OS libraries used when generating shared libraries or static binaries
 OP_SYS_LDLIBS += -lsocket -lnsl
-OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
-OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
-OP_SYS_LDLIBS_10 += -lCrun -lc -lCstd
+OP_SYS_LDLIBS_8 += -lCrun -lc
+OP_SYS_LDLIBS_9 += -lumem -lCrun -lc
+OP_SYS_LDLIBS_10 += -lumem -lCrun -lc
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-INCLUDES_READLINE = -I$(GNU_DIR)/include
-RUNTIME_LDFLAGS_READLINE += -R$(GNU_DIR)/lib
-LDFLAGS_READLINE += -L$(GNU_DIR)/lib
+READLINE_DIR = $(GNU_DIR)
+INCLUDES_READLINE = -I$(READLINE_DIR)/include
+RUNTIME_LDFLAGS_READLINE += -R$(READLINE_DIR)/lib
+LDFLAGS_READLINE += -L$(READLINE_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

@@ -10,3 +10,5 @@
 # Include definitions common to all solaris-sparc  target archs
 include $(CONFIG)/os/CONFIG.Common.solaris-sparc
 
+# Removes -O optimization and adds -g compile option
+HOST_OPT=NO

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

@@ -13,9 +13,9 @@ include $(CONFIG)/os/CONFIG.Common.solaris-sparc
 
 COMPILER_CPPFLAGS =  -D_REENTRANT
 
-OP_SYS_LDLIBS_8 = -lc
-OP_SYS_LDLIBS_9 = -lc
+STLPORT_LDLIBS_NO =
 
-RUNTIME_LDFLAGS += -R$(GNU_LIB)
-OP_SYS_LDFLAGS += -L$(GNU_LIB)
+OP_SYS_LDLIBS_8 =
+OP_SYS_LDLIBS_9 =
+OP_SYS_LDLIBS_10 =
 

configure/os/CONFIG.Common.solaris-sparc64

@@ -10,6 +10,5 @@
 # Include definitions common to all solaris-sparc target archs
 include $(CONFIG)/os/CONFIG.Common.solaris-sparc
 
-ARCH_DEP_CFLAGS +=   -xarch=generic64
-ARCH_DEP_CXXFLAGS += -xarch=generic64
-ARCH_DEP_LDFLAGS +=  -xarch=generic64
+ARCH_DEP_CFLAGS +=   -m64
+ARCH_DEP_LDFLAGS +=  -m64

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

@@ -11,8 +11,5 @@
 include $(CONFIG)/os/CONFIG.Common.solaris-sparc-gnu
 
 ARCH_DEP_CFLAGS += -mcpu=v9 -m64
-ARCH_DEP_CXXFLAGS += -mcpu=v9 -m64
 ARCH_DEP_LDFLAGS += -mcpu=v9 -m64
-
-
-
+ARCH_DEP_LDFLAGS +=  -L$(GNU_LIB)/sparcv9 -R$(GNU_LIB)/sparcv9

configure/os/CONFIG.Common.solaris-x86

@@ -38,15 +38,29 @@ RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
 GNU_TARGET=x86-sun-solaris2
 
+STLPORT_CFLAGS_YES= -library=stlport4
+STLPORT_CFLAGS_NO=
+STLPORT_LDLIBS_YES =
+STLPORT_LDLIBS_NO = -lCstd
+
+# can be overridden from ...SITE
+USE_STLPORT=NO
+
+OP_SYS_CFLAGS+=$(STLPORT_CFLAGS_$(USE_STLPORT))
+OP_SYS_LDFLAGS+=$(STLPORT_CFLAGS_$(USE_STLPORT))
+
 OP_SYS_LDLIBS += -lsocket -lnsl
-OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
-OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
+OP_SYS_LDLIBS_8 += -lCrun -lc
+OP_SYS_LDLIBS_9 += -lCrun -lc
+OP_SYS_LDLIBS_10 += -lCrun -lc
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
+OP_SYS_LDLIBS += $(STLPORT_LDLIBS_$(USE_STLPORT))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-INCLUDES_READLINE = -I$(GNU_DIR)/include
-RUNTIME_LDFLAGS_READLINE += -R$(GNU_DIR)/lib
-LDFLAGS_READLINE += -L$(GNU_DIR)/lib
+READLINE_DIR = $(GNU_DIR)
+INCLUDES_READLINE = -I$(READLINE_DIR)/include
+RUNTIME_LDFLAGS_READLINE += -R$(READLINE_DIR)/lib
+LDFLAGS_READLINE += -L$(READLINE_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-x86-gnu

@@ -12,9 +12,9 @@ include $(CONFIG)/os/CONFIG.Common.solaris-x86
 
 COMPILER_CPPFLAGS = -D_REENTRANT
 
+STLPORT_LDLIBS_NO =
+
 OP_SYS_LDLIBS_8 = -lc
 OP_SYS_LDLIBS_9 = -lc
-
-RUNTIME_LDFLAGS += -R$(GNU_LIB)
-OP_SYS_LDFLAGS += -L$(GNU_LIB)
+OP_SYS_LDLIBS_10 = -lc
 

configure/os/CONFIG.Common.solaris-x86_64

@@ -0,0 +1,14 @@
+# CONFIG.Common.solaris-x86_64
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-x86_64 compiler target archs
+# Sites may override these definitions in CONFIG_SITE.Common.solaris-x86_64
+#-------------------------------------------------------
+
+# Include definitions common to all solaris-x86 target archs
+include $(CONFIG)/os/CONFIG.Common.solaris-x86
+
+ARCH_DEP_CFLAGS +=   -m64
+ARCH_DEP_LDFLAGS +=  -m64

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

@@ -0,0 +1,15 @@
+# CONFIG.Common.solaris-x86_64-gnu
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-x86_64 gnu compiler target archs
+# Sites may override these definitions in CONFIG_SITE.Common.solaris-x86_64-gnu
+#-------------------------------------------------------
+
+# Include definitions common to all solaris-x86-gnu  target archs
+include $(CONFIG)/os/CONFIG.Common.solaris-x86-gnu
+
+ARCH_DEP_CFLAGS += -m64
+ARCH_DEP_LDFLAGS += -m64
+#ARCH_DEP_LDFLAGS += -L$(GNU_LIB)/amd64 -R$(GNU_LIB)/amd64

configure/os/CONFIG.Common.vxWorks-486

@@ -20,6 +20,4 @@ ARCH_DEP_CFLAGS = -m486
 ARCH_DEP_CXXFLAGS += -x 'c++' 
 ARCH_DEP_CFLAGS += -fno-defer-pop
 
-# Allow site overrides
--include $(CONFIG)/os/CONFIG_SITE.Common.vxWorks-486
 

configure/os/CONFIG.Common.vxWorks-486-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-486-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-486-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-486-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-486
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-68040-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-68040-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-68040-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-68040
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-68040lc-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-68040lc-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-68040lc-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040lc-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-68040lc
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-68060-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-68060-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-68060-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68060-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-68060
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-mpc8540-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-mpc8540-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-mpc8540-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8540-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-mpc8540
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-pentium-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-pentium-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-pentium-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-pentium-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-pentium
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-ppc603-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-ppc603-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-ppc603-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc603-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-ppc603_long-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-ppc603_long-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-ppc603_long-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc603_long-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-ppc604

@@ -16,6 +16,9 @@ ARCH_CLASS = ppc
 
 # Architecture specific build flags
 ARCH_DEP_CPPFLAGS = -DCPU=PPC604
-ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align -mno-implicit-fp
+ARCH_DEP_CFLAGS_2 = -mcpu=604 -mstrict-align -mno-implicit-fp
+ARCH_DEP_CFLAGS_3 = -mcpu=604 -mstrict-align -mno-implicit-fp
+ARCH_DEP_CFLAGS_4 = -mcpu=604 -mstrict-align -fno-implicit-fp
+ARCH_DEP_CFLAGS = $(ARCH_DEP_CFLAGS_$(VX_GNU_MAJOR_VERSION))
 
 GNU_TARGET = powerpc-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-ppc604-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-ppc604-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-ppc604-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc604-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-ppc604_altivec

@@ -13,10 +13,10 @@ defval = $(if $(strip $(1),),$(1),$(2))
 
 # Tell compiler to include altivec support; not available in 5.4
 ALTIVEC_CFLAG_5.4 = THIS_VERSION_OF_VXWORKS DOES_NOT_SUPPORT_ALTIVEC
-ALTIVEC_CFLAG_5.5 = -fvec
-ALTIVEC_CFLAG_6.0 = -fvec
+ALTIVEC_CFLAG_5.5 = -fvec -DALTIVEC
+ALTIVEC_CFLAG_6.0 = -fvec -DALTIVEC
 
 # From 6.1 onwards the compiler option changed
-ALTIVEC_CFLAG = -maltivec
+ALTIVEC_CFLAG = -maltivec -DALTIVEC
 
 ARCH_DEP_CFLAGS += $(call defval,$(ALTIVEC_CFLAG_$(VXWORKS_VERSION)),$(ALTIVEC_CFLAG))

configure/os/CONFIG.Common.vxWorks-ppc604_altivec-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-ppc604_altivec-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-ppc604_altivec-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc604_altivec-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_altivec
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-ppc604_long

@@ -1,4 +1,4 @@
-# $Id
+# $Id$
 #
 # Definitions for vxWorks-ppc604 targets with >32MB of RAM
 # Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc604_long

configure/os/CONFIG.Common.vxWorks-ppc604_long-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-ppc604_long-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-ppc604_long-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc604_long-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorksCommon

@@ -65,7 +65,7 @@ OBJLIB_SUFFIX = Library.o
 OBJLIBNAME = $(addsuffix $(OBJLIB_SUFFIX),$(basename $(OBJLIB)))
 OBJLIB_LD_OBJS += $(addsuffix $(OBJ),$(basename $(OBJLIB_SRCS) $(OBJLIB_OBJS)))
 PRODTARGETS += $(OBJLIBNAME)
-INSTALL_PROD += $(OBJLIBNAME:%=$(INSTALL_BIN)/%)
+INSTALL_PROD = $(OBJLIBNAME:%=$(INSTALL_BIN)/%)
 OBJLIB_MUNCHNAME += $(OBJLIBNAME:%$(OBJ)=%$(MUNCH_SUFFIX))
 INSTALL_MUNCHS += $(OBJLIB_MUNCHNAME:%=$(INSTALL_BIN)/%)
 PRODTARGETS += $(OBJLIB_MUNCHNAME)
@@ -82,12 +82,19 @@ VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
 
 # These are needed for vxWorks 6.x; the GNU toolset version number
 # is in the path to the compiler tools:
+VX_GNU_VERSION_5.4 = 2.95
+VX_GNU_VERSION_5.5 = 2.96
 VX_GNU_VERSION_6.0 = 3.3.2
 VX_GNU_VERSION_6.1 = 3.3.2
 VX_GNU_VERSION_6.2 = 3.3.2
 VX_GNU_VERSION_6.3 = 3.4.4
+VX_GNU_VERSION_6.4 = 3.4.4
+VX_GNU_VERSION_6.5 = 3.4.4
+VX_GNU_VERSION_6.6 = 4.1.2
 VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
 
+VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
+
 #--------------------------------------------------
 # Fix WIND_BASE for vxWorks 6.x on linux
 # NB: We know the value of WIND_HOST_TYPE here, but not VXWORKS_VERSION
@@ -114,12 +121,20 @@ GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
 GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
 GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
 
-# GCC_EXEC_PREFIX considered harmful since vxWorks 6 moved it
-unexport GCC_EXEC_PREFIX
-
 #--------------------------------------------------
 # C++ host processing
-NM = $(GNU_BIN)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+NM_DIR_5 = $(GNU_BIN)
+NM_DIR_6.0 = $(GNU_BIN)
+NM_DIR_6.1 = $(GNU_BIN)
+NM_DIR_6.2 = $(GNU_BIN)
+NM_DIR_6.3 = $(GNU_BIN)
+NM_DIR_6.4 = $(GNU_BIN)
+NM_DIR_6.5 = $(GNU_BIN)
+NM_DIR_6.6 = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin
+NM_DIR_6 = $(NM_DIR_$(VXWORKS_VERSION))
+NM_DIR = $(NM_DIR_$(VXWORKS_MAJOR_VERSION))
+
+NM = $(NM_DIR)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
 
 #--------------------------------------------------
 # The follow 2 exports prevent gnu cross-compiler

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

@@ -13,22 +13,15 @@ include $(CONFIG)/os/CONFIG.Common.UnixCommon
 OS_CLASS = WIN32
 ARCH_CLASS = x86
 
-EXE=.exe
-
-COMPILER_CPPFLAGS = -D_REENTRANT
-
-# Set runtime path for shared libraries
-SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
-
-# Set runtime path for products
-PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
-
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-INCLUDES_READLINE = -I$(GNU_DIR)/include
-LDFLAGS_READLINE += -L$(GNU_DIR)/lib
-LDLIBS_READLINE = -lreadline
+LDLIBS_READLINE = -lreadline -lcurses
 
-OP_SYS_CXXFLAGS += -D__cplusplus
+POSIX_CPPFLAGS = -D_POSIX_THREADS -D_POSIX_TIMERS
+#POSIX_CPPFLAGS += -D_POSIX_SOURCE
+POSIX_LDLIBS += -lpthread
+
+ARCH_DEP_CFLAGS += -m32
+ARCH_DEP_LDFLAGS += -m32
 
 # With no-cygwin option:
 #	compiler defines _X86_ 1
@@ -39,14 +32,47 @@ OP_SYS_CXXFLAGS += -D__cplusplus
 #	compiler defines _WIN32 1
 #	compiler defines WIN32 1
 #	compiler defines WINNT 1
+#       compiler defines __GNUC__ 3
 #	compiler does not define  __unix __unix__ unix
 #	compiler does not define  __CYGWIN__ __CYGWIN32__
 
-# Overrides -DUNIX from CONFIG.Common.UnixCommon
 OP_SYS_CPPFLAGS = -mno-cygwin
-
-LIBRARY_LD_RESS=
-
 OP_SYS_LDFLAGS += -mno-cygwin
 OP_SYS_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
 
+EXE=.exe
+
+VISC_DLL_NO = -DEPICS_DLL_NO
+VISC_DLL_YES =
+VISC_DLL = $(VISC_DLL_$(SHARED_LIBRARIES))
+STATIC_CFLAGS_YES= $(VISC_DLL)
+STATIC_CFLAGS_NO=  $(VISC_DLL) -D_DLL
+STATIC_CXXFLAGS_YES= $(VISC_DLL)
+STATIC_CXXFLAGS_NO=  $(VISC_DLL) -D_DLL
+
+#	adjust names of libraries to build
+#
+#	But: if there are no objects LIBRARY_LD_OBJS to include
+#	in this library (may be for e.g. base/src/libCompat
+#	on some archs), don't define (and build) any library!
+SHRLIB_PREFIX=
+SHRLIB_SUFFIX=.dll
+SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
+LOADABLE_SHRLIB_PREFIX=
+LOADABLE_SHRLIB_SUFFIX=.dll
+LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX))
+
+#
+# When SHARED_LIBRARIES is YES we are building a DLL link library 
+# and when SHARED_LIBRARIES is NO we are building an object library
+#
+LIB_PREFIX=
+LIB_SUFFIX=.lib
+DLL_LINK_LIBNAME_YES = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX))
+DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES))
+LIBNAME_NO = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX))
+LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES))
+
+#	dll install location
+INSTALL_SHRLIB = $(INSTALL_BIN)
+

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

@@ -13,21 +13,13 @@ include $(CONFIG)/os/CONFIG.Common.UnixCommon
 OS_CLASS = WIN32
 ARCH_CLASS = x86
 
-EXE=.exe
-
-# Library used when COMMANDLINE_LIBRARY is READLINE
-LDLIBS_READLINE = -lreadline
-
-
-# Set runtime path for shared libraries
-SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
-
-# Set runtime path for products
-PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline -lcurses
 
+ARCH_DEP_CFLAGS += -m32
+ARCH_DEP_LDFLAGS += -m32
 
 # Compiler defines _X86_ 1
-
 # Compiler defines __MSVCRT__ 1
 # Compiler defines __MINGW32__ 1
 # Compiler defines __WIN32 1
@@ -40,12 +32,42 @@ PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
 # Compiler does not define  __unix __unix__ unix
 
 # Override for -DUNIX from CONFIG.Common.UnixCommon
-OP_SYS_CPPFLAGS =
+OP_SYS_CPPFLAGS = -D_MINGW
 
-OP_SYS_CXXFLAGS += -D__cplusplus
+EXE=.exe
 
-LIBRARY_LD_RESS=
+VISC_DLL_NO = -DEPICS_DLL_NO
+VISC_DLL_YES =
+VISC_DLL = $(VISC_DLL_$(SHARED_LIBRARIES))
+STATIC_CFLAGS_YES= $(VISC_DLL)
+STATIC_CFLAGS_NO=  $(VISC_DLL) -D_DLL
+STATIC_CXXFLAGS_YES= $(VISC_DLL)
+STATIC_CXXFLAGS_NO=  $(VISC_DLL) -D_DLL
+
+#	adjust names of libraries to build
+#
+#	But: if there are no objects LIBRARY_LD_OBJS to include
+#	in this library (may be for e.g. base/src/libCompat
+#	on some archs), don't define (and build) any library!
+SHRLIB_PREFIX=
+SHRLIB_SUFFIX=.dll
+SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
+LOADABLE_SHRLIB_PREFIX=
+LOADABLE_SHRLIB_SUFFIX=.dll
+LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX))
+
+#
+# When SHARED_LIBRARIES is YES we are building a DLL link library 
+# and when SHARED_LIBRARIES is NO we are building an object library
+#
+LIB_PREFIX=
+LIB_SUFFIX=.lib
+DLL_LINK_LIBNAME_YES = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX))
+DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES))
+LIBNAME_NO = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX))
+LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES))
+
+#	dll install location
+INSTALL_SHRLIB = $(INSTALL_BIN)
 
-OP_SYS_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
-#STATIC_LDLIBS_YES=-lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
 

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

@@ -1,8 +1,8 @@
-#  CONFIG.aix-ppc.aix-ppc
+#  CONFIG.aix-ppc-gnu.aix-ppc-gnu
 #
 #
-# Definitions for aix-ppc host - aix-ppc target builds
-# Sites may override these definitions in CONFIG_SITE.aix-ppc.aix-ppc
+# Definitions for aix-ppc-gnu host - aix-ppc-gnu target builds
+# Sites may override these definitions in CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu
 #-------------------------------------------------------
 
 # Include common gnu compiler definitions
@@ -14,6 +14,3 @@ AR = ar
 ARFLAGS = rcv
 RANLIB = ranlib -t
 
-SHRLIB_LDFLAGS = -shared  -fPIC
-LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
-

configure/os/CONFIG.cygwin-x86.Common

@@ -16,6 +16,5 @@ OSITHREAD_USE_DEFAULT_STACK = NO
 HOSTEXE=.exe
 
 # Needed to find dlls for base installed build tools (antelope,eflex,...)
-PATH := $(EPICS_BASE_TOOLS_BIN):$(PATH)
-
+PATH := $(EPICS_BASE_BIN):$(PATH)
 

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

@@ -9,23 +9,21 @@
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
-## Shared libraries for cygwin not implemented yet
-SHARED_LIBRARIES=NO
-
 # cygwin's gcc, g++, ar, ld, and ranlib must be in user's path
 CC = gcc
 CCC = g++
 AR = ar -rc
 LD = ld -r
 RANLIB = ranlib
+RES=.coff
+RCCMD = windres $(INCLUDES) $< $@
 
-# Avoid position-independent code is always generated message
+# No -fPIC avoids "-fPIC ignored for target (all code is position independent)"
 SHRLIB_CFLAGS =
+SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
+LOADABLE_SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
 
-# -ansi eliminates strdup
-CONFORM_CFLAGS_ANSI = 
-CONFORM_CFLAGS_STRICT = -pedantic
-CONFORM_CXXFLAGS_NORMAL = 
-CONFORM_CXXFLAGS_STRICT = -pedantic
+# Override linking with gcc library from CONFIG.gnuCommon
+GNU_LDLIBS_YES =
 
 

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

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

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

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

configure/os/CONFIG.darwin-ppcx86.Common

@@ -3,7 +3,7 @@
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for Darwin 'universal' (PowerPC, Intel) host builds
+# Definitions for Darwin universal PowerPC + x86 host builds
 # Sites may override these definitions in CONFIG_SITE.darwin-ppcx86.Common
 #-------------------------------------------------------
 

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

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

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -1,20 +1,35 @@
-# CONFIG.Common.darwinCommon
+# CONFIG.darwinCommon.darwinCommon
 #
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for darwin target builds
-# Sites may override these definitions in CONFIG_SITE.Common.darwin-<arch>
+# Common definitions for darwin builds
+# Sites may override these definitions in CONFIG_SITE.darwinCommon.darwinCommon
 #-------------------------------------------------------
 
 # Include definitions common to all Unix targets
 include $(CONFIG)/os/CONFIG.Common.UnixCommon
 
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
 #
 # Set OS-specific information
 #
 OS_CLASS = Darwin
 
+#
+# Build architecture flags
+#   For Darwin, ARCH_CLASS may be empty, or may contain a list of CPU
+#   architectures which must be valid arguments to the -arch options
+#   for the cc and ld commands.
+#   ARCH_CLASS is defined in a CONFIG_SITE file which is not loaded
+#   until after this file.
+#
+ARCH_DEP_FLAGS = $(addprefix -arch ,$(ARCH_CLASS))
+ARCH_DEP_CFLAGS += $(ARCH_DEP_FLAGS)
+ARCH_DEP_LDFLAGS += $(ARCH_DEP_FLAGS)
+
 #
 # Special flags for Darwin
 #   No common blocks (as required when using shared libraries)
@@ -61,9 +76,6 @@ LDLIBS_READLINE = -lreadline
 #
 COMMANDLINE_LIBRARY=READLINE
 
-# Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon
-
 GNU_DIR = /usr
 
 CC = $(GNU_BIN)/cc
@@ -94,8 +106,7 @@ 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
+#--------------------------------------------------
+# Allow site overrides
+-include $(CONFIG)/os/CONFIG_SITE.darwinCommon.darwinCommon
+-include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).darwinCommon

configure/os/CONFIG.freebsd-x86.freebsd-x86

@@ -1,19 +1,14 @@
 # $Id$
 #
-# Definitions for freebsd-x86_64 host - freebsd-x86_64 target builds
-# Sites may override these definitions in CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
+# Definitions for freebsd-x86 host - freebsd-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.freebsd-x86.freebsd-x86
 #-------------------------------------------------------
 
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
-GNU_DIR = /usr
-
 STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_LDFLAGS +=  -shared -fPIC
-LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
-

configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64

@@ -7,13 +7,8 @@
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
-GNU_DIR = /usr
-
 STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_LDFLAGS +=  -shared -fPIC
-LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
-

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

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

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

@@ -1,29 +0,0 @@
-# CONFIG.hpux-parisc-gnu.hpux-parisc-gnu
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for hpux-parisc gnu compiler host - hpux-parisc gnu compiler target builds
-# Sites may override these definitions in CONFIG_SITE.hpux-parisc-gnu.hpux-parisc-gnu
-#-------------------------------------------------------
-
-# Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon
-
-AR = ar -rc
-RANLIB=
-LD = ld -r
-
-STATIC_LDFLAGS_YES= -Wl,-a,archive
-STATIC_LDFLAGS_NO =
-
-STATIC_LDLIBS_YES = -Wl,-a,default
-STATIC_LDLIBS_NO =
-
-# Switch explicitly from default DCE threads to posix threads
-POSIX_CPPFLAGS += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L
-USR_SYS_LIBS += pthread
-
-# C++ templates need PIC definition also in link phase
-SHRLIB_LDFLAGS += -shared -fPIC
-LOADABLE_SHRLIB_LDFLAGS += $(SHRLIB_LDFLAGS)

configure/os/CONFIG.hpux-parisc.Common

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