Removed release date, less work to do at the last minute...

I had a closer look at the MS and the POSIX doc. It appears that
there is confusion between the two related to how the arguments
are interpreted when the user buffer pointer is null. In the POSIX
doc it clearly states that the count only applies if the user pointer
isn't nill. In the MS doc it clearly states that the count is also the
size of the internally allocated buffer when the user pointer is nill.

It seems that a reasonable compromise will be to specify a buffer
size of BUFSIZ (defined by POSIX and fortunately also by windows).

config/CONFIG.Host.Linux

@@ -29,7 +29,7 @@ G++_SHRLIB_LDFLAGS_YES +=  -Wl,-soname,$@
 
 OP_SYS_CFLAGS += -D_BSD_SOURCE
 
-ARCH_DEP_CFLAGS = -D_X86_ -Dlinux -mcpu=pentium
+ARCH_DEP_CFLAGS = -D_X86_ -Dlinux
 ARCH_DEP_LDLIBS += -lpthread -lreadline -lcurses -lrt
 
 #Allows R3.13 built extensions to load R3.14 shared libs

config/CONFIG_BASE_VERSION

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

config/CONFIG_COMMON

@@ -87,10 +87,10 @@ EPICS_BASE_BIN          = $(EPICS_BASE)/bin/$(T_A)
 
 GCC_ANSI = $(GCC) -ansi
 GCC_STRICT = $(GCC) -ansi -pedantic
-GCC_TRAD = $(GCC) -traditional
+GCC_TRAD = $(GCC)
 GCC_DEP_CFLAGS = -fPIC -D_REENTRANT
 
-GCC_WARN_YES = -Wall
+GCC_WARN_YES = -Wall -Wtraditional -Wmissing-prototypes -Wstrict-prototypes
 GCC_WARN_NO = -w
 GCC_OPT_YES = -O3
 GCC_OPT_NO = -g
@@ -102,13 +102,13 @@ GCC_SHRLIB_CFLAGS_YES =
 GCC_SHRLIB_LDFLAGS_YES =  -shared
 
 G++_NORMAL = $(G++) -ansi -pedantic
-G++_STRICT = $(G++) -ansi -pedantic -Wtraditional
-G++_TRAD = $(G++) -traditional
+G++_STRICT = $(G++) -ansi -pedantic
+G++_TRAD = $(G++)
 G++_TEMPL_INST_FLAG = -DEXPL_TEMPL
 G++_DEP_CFLAGS = -fPIC -D_REENTRANT
 G++_WARN_YES = -Wall \
-      -Wmissing-prototypes -Woverloaded-virtual \
-      -Wwrite-strings -Wconversion -Wstrict-prototypes\
+      -Woverloaded-virtual \
+      -Wwrite-strings -Wconversion\
       -Wpointer-arith -Winline
 G++_WARN_NO = -w
 G++_OPT_YES = -O3
@@ -241,8 +241,8 @@ CXXFLAGS = $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)
 LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\
  $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS) $(RUNTIME_LDFLAGS)
 
-LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS)\
- $(STATIC_LDLIBS) $(OP_SYS_LDLIBS) $(POSIX_LDLIBS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(STATIC_LDLIBS) $(ARCH_DEP_LDLIBS)\
+  $(OP_SYS_LDLIBS) $(POSIX_LDLIBS)
 
 CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(POSIX_CPPFLAGS)
 

configure/CONFIG.CrossCommon

@@ -26,6 +26,9 @@ export GCC_EXEC_PREFIX = $(GNU_LIB)/gcc-lib/
 CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
 CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))
 
+CMPLR_PREFIX_CROSS=$(addsuffix -,$(GNU_TARGET))
+CMPLR_PREFIX=$(CMPLR_PREFIX_$(BUILD_CLASSS))
+
 # All cross builds use the gnu compiler
 include $(CONFIG)/CONFIG.gnuCommon
 

configure/CONFIG.gnuCommon

@@ -15,8 +15,8 @@ GNU = YES
 GNU_BIN = $(GNU_DIR)/bin
 GNU_LIB = $(GNU_DIR)/lib
 
-CC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
-CCC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX)
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++$(CMPLR_SUFFIX)
 AR = $(GNU_BIN)/$(CMPLR_PREFIX)ar$(CMPLR_SUFFIX) -rc
 LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
 CPP = $(CC) -x c -E
@@ -50,3 +50,5 @@ STATIC_LDFLAGS_NO =
 
 SHRLIB_CFLAGS = -fPIC
 
+GNU_LDLIBS_YES = -lgcc
+

configure/CONFIG_ADDONS

@@ -67,6 +67,7 @@
 #    OBJS_IOC      ioc system object files to build and install
 #    USR_INCLUDES  include directories
 #    BIN_INSTALLS  binaries to install
+#    LIB_INSTALLS  library binaries to install
 #    RCS           win32 resource files for building libraries and prods
 #    PROD_RCS      win32 resource files for building prods
 #    LIB_RCS       win32 resource files for building libraries
@@ -221,6 +222,14 @@ BIN_INSTALLS+=$(BIN_INSTALLS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(LIB_INSTALLS_$(OS_CLASS))),)
+LIB_INSTALLS+=$(subst -nil-,,$(LIB_INSTALLS_$(OS_CLASS)))
+else
+ifdef LIB_INSTALLS_DEFAULT
+LIB_INSTALLS+=$(LIB_INSTALLS_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(PROD_OBJS_$(OS_CLASS))),)
 PROD_OBJS+=$(subst -nil-,,$(PROD_OBJS_$(OS_CLASS)))
 else

configure/CONFIG_BASE_VERSION

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

configure/CONFIG_COMMON

@@ -103,6 +103,8 @@ GNU=NO
 DEP=.depends
 OBJ = .
 RES = .
+CMPLR_SUFFIX=
+CMPLR_PREFIX=
 
 #-------------------------------------------------------
 # tools for installing libraries and products
@@ -231,11 +233,6 @@ WARN_CXXFLAGS = $(WARN_CXXFLAGS_$($(BUILD_CLASS)_WARN))
 OPT_CFLAGS = $(OPT_CFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CXXFLAGS = $(OPT_CXXFLAGS_$($(BUILD_CLASS)_OPT))
 
-# Posix flags
-POSIX=YES
-POSIX_CPPFLAGS=$(POSIX_CPPFLAGS_$(POSIX))
-POSIX_LDLIBS=$(POSIX_LDLIBS_$(POSIX))
-
 # Static build flags
 STATIC_CFLAGS = $(STATIC_CFLAGS_$(STATIC_BUILD))
 STATIC_CXXCFLAGS = $(STATIC_CXXFLAGS_$(STATIC_BUILD))
@@ -272,7 +269,7 @@ LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
  $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
 LDLIBS = $(STATIC_LDLIBS)\
- $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)
+ $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS) $(GNU_LDLIBS_$(GNU))
 
 CPPFLAGS += $(CONFORM_CPPFLAGS) $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS)\
  $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
@@ -287,6 +284,12 @@ ARCMD = $(AR) $(ARFLAGS) $(USR_ARFLAGS) $@  $(LIBRARY_LD_OBJS)
 # 'Munch' link-edit
 MUNCH_CMD = $(LD) -o $@ $^
 
+#--------------------------------------------------
+# LEX default option (valid for EPICS base 3.13.0.beta12 and later)
+#
+# to allow characters that are not plain 7bit standard ASCII 
+LEXOPT +=  -8
+
 #--------------------------------------------------
 # Build compile line here
 

configure/CONFIG_SITE

@@ -29,19 +29,27 @@
 #	darwin-ppc
 #	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-ppc-bgl
 #	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-gnu      (GNU 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-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       (cygwin GNU compiler used for host builds)
 
 #  Debugging builds 
-#	linux-x86-debug			(GNU compiler with -g option for host builds)
-#	solaris-sparc-debug		(sun compiler with -g option for host builds)
-#	win32-x86-debug			(MS Visual C++ compiler with debug option for host builds)
+#	linux-x86-debug        (GNU compiler with -g option for host builds)
+#	linux-x86_64-debug     (GNU compiler with -g option for host builds)
+#	solaris-sparc-debug    (sun compiler no optimization,-g for debugging info)
+#	win32-x86-debug        (MS Visual C++ compiler with debug option for host builds)
 
 
 #  EPICS_HOST_ARCH is a required environment variable
@@ -57,6 +65,7 @@
 #       linux-586     (linux-x86 host)
 #       linux-686     (linux-x86 host)
 #       linux-athlon  (linux-x86 host)
+#       linuxRT-mvme2100  (linux-x86 host)
 #       vxWorks-486
 #       vxWorks-68040
 #       vxWorks-68040lc
@@ -66,11 +75,16 @@
 #       vxWorks-ppc603_long
 #       vxWorks-ppc604
 #       vxWorks-ppc604_long
+#       vxWorks6-mv2100
+#       vxWorks6-mv5100
 #       RTEMS-gen68360
-#       RTEMS-mvme167
-#       RTEMS-pc386
 #       RTEMS-mcp750
+#       RTEMS-mvme167
+#       RTEMS-mvme2100
+#       RTEMS-mvme5500
+#       RTEMS-pc386
 #       RTEMS-psim
+#       RTEMS-uC5282
 #
 #  Debugging builds 
 #       vxWorks-68040-debug
@@ -157,3 +171,6 @@ COMPAT_313=NO
 #  Installation directory
 #Note: INSTALL_LOCATION definition moved to configure/RELEASE file
 
+# Use POSIX thread priority scheduling (YES or NO)
+USE_POSIX_THREAD_PRIORITY_SCHEDULING = 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 2004  US: Apr  4 - Oct 31
-#	              EU: Mar 28 - Oct 31
+#	DST for 2006  US: Apr  2 - Oct 29
+#	              EU: Mar 26 - Oct 29
 #	(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:040402:103102
-#EPICS_TIMEZONE=MET::-60:032802:103102
+EPICS_TIMEZONE=CUS::360:040202:102902
+#EPICS_TIMEZONE=MET::-60:032602:102902
 EPICS_TS_NTP_INET=
 
 # IOC Shell:

configure/RELEASE

@@ -7,17 +7,19 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# RELEASE: Define location of external products
-#
+# RELEASE: Define location of external EPICS products
+
+# VX_DIR definition now in os/CONFIG_SITE.Common.vxWorksCommon
+# RTEMS_BASE (and RTEMS_VERSION) now in os/CONFIG_SITE.Common.RTEMS
+
 # NB: Settings in RELEASE files can be overridden in files named
 #   RELEASE.$(EPICS_HOST_ARCH)
+#   RELEASE.Common.$(OS_CLASS)Common
 #   RELEASE.Common.$(T_A)
 #   RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 
-#  Tornado directory
-VX_DIR = /usr/local/vw/tornado202p1
-#VX_DIR = /usr/local/vw/tornado22-$(ARCH_CLASS)
-
 # If you don't want to install into $(TOP) dir then 
 # define INSTALL_LOCATION here
 #INSTALL_LOCATION=<fullpathname>
+#INSTALL_LOCATION=/home/phoebus/JBA/install
+

configure/RULES.Db

@@ -24,6 +24,7 @@ vpath bpt%.data $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 INSTALL_DBDFLAGS += -I $(INSTALL_LOCATION)/dbd
 DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) $(RELEASE_DBDFLAGS)
 DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. $(GENERIC_SRC_INCLUDES)
+DBFLAGS += -I$(COMMON_DIR)
 
 #####################################################  Targets
 
@@ -60,7 +61,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) $(TEMPLATE3) ../template))
+TEMPLATE_FILENAME=$(firstword $(wildcard $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
 
 # dbst based database optimization
 ifeq '$(DB_OPT)' 'YES'
@@ -80,6 +81,8 @@ DBDDEPENDS_FILES += $(addsuffix $(DEP),$(COMMON_DBDS) \
 DBDDEPENDS_FLAGS = $(filter .%,$(subst -I,,$(filter-out -S%,$(DBDFLAGS))))
 DBDDEPENDS_CMD = -$(MKMF) -m $@$(DEP) $(DBDDEPENDS_FLAGS) $@ $<
 
+MAKEDBDEPENDS = $(PERL) $(TOOLS)/makeDbDepends.pl
+
 ##################################################### 
 
 ifndef T_A
@@ -134,26 +137,6 @@ clean::
 	@$(RM) *_registerRecordDeviceDriver.cpp
 	@$(RM) $(TARGETS)
 
-##################################################### "Foreign" templates
-
-TEMPLATE_LINKS	= $(filter-out $(notdir $(USES_TEMPLATE)), $(USES_TEMPLATE))
-TEMPLATE_FILES	= $(filter     $(notdir $(USES_TEMPLATE)), $(USES_TEMPLATE))
-COMMON_TEMPLATES=$(addsuffix $(COMMON_DIR)/,$(notdir $(TEMPLATE_LINKS)))
-
-ifneq '$(TEMPLATE_LINKS)' ''
-build: $(notdir $(TEMPLATE_LINKS))
-endif
-build: $(TEMPLATE_FILES)
-
-$(COMMON_TEMPLATES): $(COMMON_DIR)/%.template: 
-ifndef WIN32
-	@$(RM) $(notdir $(TEMPLATE_LINKS))
-	ln -s $(TEMPLATE_LINKS) 
-else
-	@$(RM) $(notdir $(TEMPLATE_LINKS))
-	$(CP) $(TEMPLATE_LINKS) 
-endif
-
 ##################################################### CapFast filter
 
 $(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS) 
@@ -254,19 +237,26 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf
 	@$(REPLACEVAR) < $@.VAR > $@
 	@$(RM) $@.VAR
 
-# dbst based database optimization
+#$(COMMON_DIR)/%.db$(RAW): %.substitutions %.template
+#	@$(RM) $@$(DEP)
+#	@$(MAKEDBDEPENDS) $@ $^  >> $@$(DEP)
+#	@echo "Inflating database from $^"
+#	@$(RM) $@
+#	$(MSI) $(DBFLAGS) -S$< $(firstword $(patsubst %.substitutions,,$^)) > msi.tmp
+#	$(MV) msi.tmp $@
+
 $(COMMON_DIR)/%.db$(RAW): %.substitutions
 	@$(RM) $@$(DEP)
-	@$(DBDDEPENDS_CMD)
+	@$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $@$(DEP)
 	@echo "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
-	@echo "Inflating database from $<"
+	@echo "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $@
 	$(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > msi.tmp
 	$(MV) msi.tmp $@
 
 $(COMMON_DIR)/%.db$(RAW): %.template
 	@$(RM) $@$(DEP)
-	@$(DBDDEPENDS_CMD)
+	@$(MAKEDBDEPENDS) $@ $^  >> $@$(DEP)
 	@echo "Inflating database from $<"
 	@$(RM) $@
 	$(MSI) $(DBFLAGS)  $< > msi.tmp

configure/RULES_BUILD

@@ -135,11 +135,15 @@ ifdef BIN_INSTALLS
 buildInstall : binInstalls
 endif
 
+ifdef LIB_INSTALLS
+buildInstall : libInstalls
+endif
+
 clean::
 	@echo "Cleaning"
 	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME)\
 	$(INC) *$(RES) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
-	*.out MakefileInclude  $(LOADABLE_SHRLIBNAME) \
+	*.out MakefileInclude  $(LOADABLE_SHRLIBNAME) *.manifest *.exp \
 	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS)
 ifdef BAF
 	@$(RM) $(PROD_BAF) $(LIB_BAF) *$(BOF)
@@ -173,7 +177,7 @@ $(OBJLIBNAME):%$(OBJ): $(OBJLIB_LD_OBJS)
 %$(OBJ): %.c
 	@$(HDEPENDS_CMD)
 	@$(RM) $@
-	$(COMPILE.c) $(call PATH_FILTER,$<)
+	$(COMPILE.c) $(call PATH_FILTER,$<) $(COMPILE_FILTER.c)
 
 %$(OBJ): %.cc
 	@$(HDEPENDS_CMD)
@@ -304,13 +308,25 @@ binInstalls:  $(BIN_INSTALLS)
 	@echo "Installing $(^F)"
 	@$(INSTALL) -d -m 555 $^ $(INSTALL_BIN)
 
+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)
 
 $(INSTALL_BIN)/%: %
 	@echo "Installing binary $@"
+ifdef WIN32
+ifdef BORLAND
 	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
+else
+	@$(INSTALL_PRODUCT) -d -m 555 $<* $(INSTALL_BIN)
+endif
+else
+	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
+endif
 
 $(INSTALL_BIN)/%: ../%
 	@echo "Installing script $@"
@@ -335,6 +351,7 @@ ifneq (,$(strip $(SHRLIB_VERSION)))
 	ln -s $< $(subst .$(SHRLIB_VERSION),,$@)
 endif # SHRLIB_VERSION
 
+
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
 $(INSTALL_TCLLIB)/%: %
 	@echo "Installing Tcl library $@"
@@ -345,6 +362,10 @@ $(INSTALL_TCLLIB)/%: ../%
 	@$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB)
 endif
 
+$(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS)
+	@echo "Updating $@"
+	@echo eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh
+
 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	@echo "Installing loadable shared library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
@@ -400,7 +421,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
 .PRECIOUS: $(COMMON_INC)
 
-.PHONY: all inc build install clean rebuild buildInstall binInstalls
+.PHONY: all inc build install clean rebuild buildInstall binInstalls libInstalls
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

configure/RULES_TOP

@@ -13,6 +13,10 @@
 
 include $(CONFIG)/RULES_DIRS
 
+UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
+        $(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \
+        $(INSTALL_DB)
+
 uninstallArchTargets = $(foreach arch,$(BUILD_ARCHS), uninstall$(DIVIDER)$(arch))
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
 
@@ -36,17 +40,13 @@ cvsclean:
 
 realuninstall:
 	@$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
-	@$(RMDIR) $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
-		$(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \
-		$(INSTALL_DB)
+	@$(RMDIR) $(UNINSTALL_DIRS)
 
 uninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
 	@$(MAKE) -f Makefile  cleandirs
 
 uninstallDirs:
-	@$(RMDIR) $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
-		$(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \
-		$(INSTALL_DB)
+	@$(RMDIR) $(UNINSTALL_DIRS)
 
 help:
 	@echo "Usage: gnumake [options] [target] ..."

configure/os/CONFIG.Common.RTEMS

@@ -13,15 +13,16 @@
 #-------------------------------------------------------
 #
 
-#-------------------------------------------------------
-# Where to find RTEMS
-RTEMS_BASE=/opt/rtems-4.7
-RTEMS_VERSION=4.7
-
 #-------------------------------------------------------
 # RTEMS tools are similar to UNIX tools
 -include $(CONFIG)/os/CONFIG.Common.UnixCommon
 
+GNU_TARGET_INCLUDE_DIR =
+
+#--------------------------------------------------
+# Get RTEMS_BASE definition
+-include $(CONFIG)/os/CONFIG_SITE.Common.RTEMS
+
 #-------------------------------------------------------
 # 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

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -0,0 +1,23 @@
+#
+# $Id$
+# Author: W. Eric Norum
+#         Canadian Light Source
+#         eric@cls.usask.ca
+#
+# All RTEMS targets use the same Makefile fragment
+#
+RTEMS_TARGET_CPU = m68k
+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 $< $@
+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.aix-ppc

@@ -17,9 +17,8 @@ ARCH_CLASS = ppc
 
 CODE_CPPFLAGS = -D_REENTRANT
 
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500 -D_ALL_SOURCE
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES = -lpthread
+POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500 -D_ALL_SOURCE
+POSIX_LDLIBS = -lpthread
 
 #SHARED_LIBRARIES=NO
 

configure/os/CONFIG.Common.cygwin-x86

@@ -17,11 +17,10 @@ EXE=.exe
 
 COMPILER_CPPFLAGS = -D_REENTRANT
 
-#POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS -D_POSIX_TIMERS
+#POSIX_CPPFLAGS = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS -D_POSIX_TIMERS
 # _POSIX_SOURCE eliminates select()
-POSIX_CPPFLAGS_YES = -D_POSIX_THREADS -D_POSIX_TIMERS
-#POSIX_LDLIBS_YES += -lpthread
-POSIX_LDLIBS_YES += -lpthread
+POSIX_CPPFLAGS = -D_POSIX_THREADS -D_POSIX_TIMERS
+POSIX_LDLIBS += -lpthread
 
 ARCH_DEP_CPPFLAGS += -D_X86_
 
@@ -30,5 +29,8 @@ OP_SYS_CPPFLAGS += -DCYGWIN32 -U_WIN32
 # Set runtime path for shared libraries
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
 
-LDLIBS_READLINE = -lcygreadline5 -lcygcurses7
+#  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.darwin-ppc

@@ -28,31 +28,31 @@ OP_SYS_CFLAGS += -fno-common
 CPPSNCFLAGS += -no-cpp-precomp
 
 #
-# The following two definitions enable the use of DarwinPorts packages.
+# Darwin os definition
 #
-OP_SYS_CPPFLAGS += -I/opt/local/include
-OP_SYS_LDFLAGS += -L/opt/local/lib
+OP_SYS_CPPFLAGS += -Ddarwin
+
+#
+# The following two definitions enable the use of DarwinPorts packages.
+
+#
+OP_SYS_INCLUDES += -I/opt/local/include
+# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist
+OP_SYS_LDFLAGS +=  $(addprefix -L,$(dir $(firstword $(wildcard /opt/local/lib/*))))
 
 #
 # The following two definitions enable the use of Fink packages.
 #
-OP_SYS_CPPFLAGS += -I/sw/include
-OP_SYS_LDFLAGS += -L/sw/lib
+OP_SYS_INCLUDES += -I/sw/include
+# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist
+OP_SYS_LDFLAGS +=  $(addprefix -L,$(dir $(firstword $(wildcard /sw/lib/*))))
 
 #
 # Libraries for command-line editing.
 #
-LDLIBS_LIBTECLA = -ltecla_r -lncurses
 LDLIBS_READLINE = -lreadline
 
 #
 # Command-line input support
 #
-# Install the DarwinPorts or Fink libtecla1 package and place the following
-# line in CONFIG_SITE.darwin-ppc.Common to use libtecla command-line editing:
-#COMMANDLINE_LIBRARY=LIBTECLA
-# or install the DarwinPorts or Fink readline package and place the following
-# line in CONFIG_SITE.darwin-ppc.Common to use GNU readline
-# command-line editing:
-#COMMANDLINE_LIBRARY=READLINE
-
+COMMANDLINE_LIBRARY=READLINE

configure/os/CONFIG.Common.hpux-parisc

@@ -28,8 +28,4 @@ empty:=                                      # trick from the make docs...
 space:= $(empty) $(empty)
 RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_FULLPATHDIRS))),+s
 
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=parisc-hp-unix
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
+GNU_TARGET=parisc-hp-unix

configure/os/CONFIG.Common.linux-ppc

@@ -0,0 +1,18 @@
+# CONFIG.Common.linux-ppc
+#
+# This file is maintained by the build community.
+#
+# Definitions for linux-ppc target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-ppc
+#-------------------------------------------------------
+
+# 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

@@ -7,28 +7,13 @@
 # Sites may override these definitions in CONFIG_SITE.Common.linux-x86
 #-------------------------------------------------------
 
-# Include definitions common to all Unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
+# Include definitions common to all linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
-OS_CLASS = Linux
 ARCH_CLASS = x86
 
-CODE_CPPFLAGS = -D_REENTRANT
-
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES = -lpthread
-
-# -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
-
 ARCH_DEP_CPPFLAGS += -D_X86_
 
-# Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
-
 ifeq ($(BUILD_CLASS),CROSS)
 ifeq ($(EPICS_HOST_ARCH),linux-x86)
    # Added for 386,486,... cross builds
@@ -48,5 +33,3 @@ else
 endif
 endif
 
-LDLIBS_READLINE = -lreadline -lcurses
-

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

@@ -13,8 +13,7 @@ include $(CONFIG)/os/CONFIG.Common.UnixCommon
 OS_CLASS = Linux
 ARCH_CLASS = x86
 
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES = libpthread.so
+POSIX_LDLIBS = libpthread.so
 
 OP_SYS_CPPFLAGS += -D_BSD_SOURCE -D_SVID_SOURCE
 OP_SYS_CPPFLAGS += -Dlinux
@@ -24,9 +23,3 @@ ARCH_DEP_CPPFLAGS += -D_X86_
 
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
 
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=i586-pc-linux-gnu
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-

configure/os/CONFIG.Common.linux-x86_64

@@ -0,0 +1,35 @@
+# CONFIG.Common.linux-x86_64
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86_64 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-x86_64
+#-------------------------------------------------------
+
+# Include definitions common to all linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = x86_64
+
+ARCH_DEP_CPPFLAGS += -D_X86_64_
+
+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
+endif
+

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

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

configure/os/CONFIG.Common.linuxCommon

@@ -0,0 +1,30 @@
+# CONFIG.Common.linuxCommon
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linuxCommon
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = Linux
+
+CODE_CPPFLAGS = -D_REENTRANT
+
+POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500
+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
+
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline -lcurses
+

configure/os/CONFIG.Common.solaris-sparc

@@ -20,9 +20,9 @@ COMPILER_LDFLAGS += -mt
 
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 
-POSIX_CPPFLAGS_YES += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION))
-POSIX_CPPFLAGS_YES += -D_XOPEN_SOURCE=500
-POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION))
+POSIX_CPPFLAGS += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION))
+POSIX_CPPFLAGS += -D_XOPEN_SOURCE=500
+POSIX_LDLIBS += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION))
 
 OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS)
 OP_SYS_LDFLAGS +=  $(COMPILER_LDFLAGS)
@@ -31,12 +31,7 @@ OP_SYS_LDFLAGS +=  $(COMPILER_LDFLAGS)
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
-
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=sparc-sun-solaris2
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
+GNU_TARGET=sparc-sun-solaris2
 
 OP_SYS_LDLIBS += -lsocket -lnsl
 OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
@@ -44,7 +39,6 @@ OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-GNU_DIR = /opt/gnu
 INCLUDES_READLINE = -I$(GNU_DIR)/include
 RUNTIME_LDFLAGS_READLINE += -R$(GNU_DIR)/lib
 LDFLAGS_READLINE += -L$(GNU_DIR)/lib

configure/os/CONFIG.Common.solaris-sparc64

@@ -0,0 +1,15 @@
+# CONFIG.Common.solaris-sparc64
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc64 compiler target archs
+# Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc64
+#-------------------------------------------------------
+
+# Include definitions common to all solaris-sparc target archs
+include $(CONFIG)/os/CONFIG.Common.solaris-sparc
+
+ARCH_DEP_CFLAGS += -xtarget=ultra -xarch=v9
+ARCH_DEP_CXXFLAGS += -xtarget=ultra -xarch=v9
+ARCH_DEP_LDFLAGS += -xtarget=ultra -xarch=v9

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

@@ -0,0 +1,18 @@
+# CONFIG.Common.solaris-sparc64-gnu
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc64 gnu compiler target archs
+# Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc64-gnu
+#-------------------------------------------------------
+
+# Include definitions common to all solaris-sparc-gnu  target archs
+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
+
+
+

configure/os/CONFIG.Common.solaris-x86

@@ -20,9 +20,9 @@ COMPILER_LDFLAGS += -mt
 
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 
-POSIX_CPPFLAGS_YES += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION))
-POSIX_CPPFLAGS_YES += -D_XOPEN_SOURCE=500
-POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_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_$(SOLARIS_VERSION))
 
 OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS)
 OP_SYS_LDFLAGS +=  $(COMPILER_LDFLAGS)
@@ -32,11 +32,7 @@ ARCH_DEP_CPPFLAGS = -D_X86_
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=x86-sun-solaris2
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
+GNU_TARGET=x86-sun-solaris2
 
 OP_SYS_LDLIBS += -lsocket -lnsl
 OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
@@ -44,7 +40,6 @@ OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-GNU_DIR = /opt/gnu
 INCLUDES_READLINE = -I$(GNU_DIR)/include
 RUNTIME_LDFLAGS_READLINE += -R$(GNU_DIR)/lib
 LDFLAGS_READLINE += -L$(GNU_DIR)/lib

configure/os/CONFIG.Common.vxWorks6-mv2100

@@ -0,0 +1,28 @@
+# CONFIG.Common.vxWorks6-mv2100
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for WRS vxWorks version 6.0 mv2100 target
+# target archs with at least 32MB
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks6-mv2100
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks version 6.0 targets
+include $(CONFIG)/os/CONFIG.Common.vxWorks6Common
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+ 
+ARCH_CLASS = ppc
+
+# Architecture specific build flags
+
+ARCH_DEP_CPPFLAGS = -DCPU=PPC603  
+ARCH_DEP_CFLAGS = -mcpu=603 -mstrict-align -mlongcall
+
+#CONFORM_CFLAGS_NORMAL = -DCONFORM_NORMAL_no_ansi_no_pedantic
+#CONFORM_CFLAGS_STRICT = -DCONFORM_STRICT_no_ansi_no_pedantic
+#CONFORM_CXXFLAGS_NORMAL = -DCONFORM_NORMAL_no_ansi_no_pedantic
+#CONFORM_CXXFLAGS_STRICT = -DCONFORM_STRICT_no_ansi_no_pedantic
+#CODE_CXXFLAGS = -DOVERRIDE_fno_implicit_templates

configure/os/CONFIG.Common.vxWorks6-mv5100

@@ -0,0 +1,28 @@
+# CONFIG.Common.vxWorks6-mv5100
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for WRS vxWorks version 6.0 mv5100 target
+# target archs with at least 32MB
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks6-mv5100
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks version 6.0 target archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks6Common
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+ 
+ARCH_CLASS = ppc
+
+# Architecture specific build flags
+
+ARCH_DEP_CPPFLAGS = -DCPU=PPC604  
+ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align -mlongcall
+
+#CONFORM_CFLAGS_NORMAL = -DCONFORM_NORMAL_no_ansi_no_pedantic
+#CONFORM_CFLAGS_STRICT = -DCONFORM_STRICT_no_ansi_no_pedantic
+#CONFORM_CXXFLAGS_NORMAL = -DCONFORM_NORMAL_no_ansi_no_pedantic
+#CONFORM_CXXFLAGS_STRICT = -DCONFORM_STRICT_no_ansi_no_pedantic
+#CODE_CXXFLAGS = -DOVERRIDE_fno_implicit_templates

configure/os/CONFIG.Common.vxWorks6Common

@@ -0,0 +1,155 @@
+# CONFIG.Common.vxWorks6Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks version 6.0 target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks6Common
+# or CONFIG_SITE.<host>.vxWorks6Common
+#-------------------------------------------------------
+
+# Vx valid build types
+VALID_BUILDS = Ioc
+
+#--------------------------------------------------
+# operating system class (include/os/<os_class>)
+OS_CLASS = vxWorks
+
+#-------------------------------------------------------
+# Prefix and suffix definitions
+EXE =
+OBJ = .o
+LIB_PREFIX =lib
+LIB_SUFFIX = .a
+MUNCH_SUFFIX = .munch
+
+#-------------------------------------------------------
+# Compiler definitions
+CMPLR_PREFIX=
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+
+#-------------------------------------------------------
+# Library definitions
+LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX))
+
+#--------------------------------------------------
+# Prod: DEPLIBS, LDFLAGS, and LDLIBS definitions
+
+PROD_DEPLIBS=$(foreach lib,$(PROD_LIBS) $(USR_LIBS), \
+    $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).*, \
+    $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
+    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
+    $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
+
+
+PROD_LDLIBS = $(addprefix -l,$($*_LDLIBS) $(PROD_LIBS) $(USR_LIBS)\
+ $($*_SYS_LIBS) $(PROD_SYS_LIBS) $(USR_SYS_LIBS))
+
+PROD_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(PROD_DEPLIBS))
+PRODDIR_LDFLAGS += $(sort $(PROD_DEPLIB_DIRS:%=-L%))
+
+#-------------------------------------------------------
+# Prod definitions
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+CTDT_SRCS = $(PRODNAME:%$(EXE)=%_ctdt.c)
+CTDT_OBJS = $(PRODNAME:%$(EXE)=%_ctdt$(OBJ))
+NMS = $(PRODNAME:%$(EXE)=%.nm)
+MUNCH_DEPENDS = %_ctdt$(OBJ)
+
+#-------------------------------------------------------
+# R3.13 compatability object library definitions
+# Does not allow $*_SRCS or $*_OBJS. Allows only OBJLIB_SRCS and OBJLIB_OBJS.
+OBJLIB += $(OBJLIB_$(OS_CLASS))
+OBJLIB_SUFFIX = Library.o
+OBJLIBNAME = $(addsuffix $(OBJLIB_SUFFIX),$(basename $(OBJLIB)))
+OBJLIB_LD_OBJS += $(addsuffix $(OBJ),$(basename $(OBJLIB_SRCS) $(OBJLIB_OBJS)))
+PRODTARGETS += $(OBJLIBNAME)
+INSTALL_PROD += $(OBJLIBNAME:%=$(INSTALL_BIN)/%)
+OBJLIB_MUNCHNAME += $(OBJLIBNAME:%$(OBJ)=%$(MUNCH_SUFFIX))
+INSTALL_MUNCHS += $(OBJLIB_MUNCHNAME:%=$(INSTALL_BIN)/%)
+PRODTARGETS += $(OBJLIB_MUNCHNAME)
+CTDT_SRCS += $(OBJLIBNAME:%$(OBJ)=%_ctdt.c)
+CTDT_OBJS += $(OBJLIBNAME:%$(OBJ)=%_ctdt$(OBJ))
+NMS += $(OBJLIBNAME:%$(OBJ)=%.nm)
+OBJLIB_LINK.cpp = $(LD) -o $@ $(OBJLIB_LD_OBJS)
+SRC_FILES += $(OBJLIB_SRCS)
+
+#---------------------------------------------------------------------
+# vxWorks directory definitions (new for vxWorks 6.0)
+# WindRiver Workbench directory definitions
+GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/vxworks-6.0/target/h
+GNU_TARGET_INCLUDE_DIR += $(VX_DIR)/vxworks-6.0/target/h/wrn/coreip
+
+GNU_DIR = $(VX_DIR)/gnu/3.3.2-vxworks60/x86-linux2
+
+#--------------------------------------------------
+# C++ host processing
+NM = $(GNU_BIN)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+
+#--------------------------------------------------
+# The follow 2 exports prevent gnu cross-compiler
+# from finding wrong assembler (as).
+export WIND_BASE = $(VX_DIR)
+export WIND_HOST_TYPE
+
+#--------------------------------------------------
+# Tornado2.2 and WindRiver Workbench
+# The follow export allows vxWorks.h to include gnu header files
+export TOOL_FAMILY = GNU
+
+#--------------------------------------------------
+# Operating system flags
+OP_SYS_CPPFLAGS += -DvxWorks
+OP_SYS_CFLAGS += -fno-builtin
+#OP_SYS_CFLAGS += -fno-builtin -fdollars-in-identifiers
+OP_SYS_LDFLAGS +=
+
+# Fix for vxWorks headers using macros defined in
+# vxWorks.h but not including vxWorks.h 
+# New for WindRiver Workbench and vxWorks 6.0
+OP_SYS_INCLUDE_CPPFLAGS += -include $(VX_DIR)/vxworks-6.0/target/h/vxWorks.h
+
+#--------------------------------------------------
+# code flags
+CODE_CFLAGS =
+#
+# WRS still uses an old gnu compiler with a broken -frepo and 
+# otherwise no automatic template instantiation mechanism as
+# is the defacto standard approach today. If we remove this 
+# flag certain ppc targets will not build. 
+CODE_CXXFLAGS = -fno-implicit-templates
+
+#--------------------------------------------------
+# posix c preprocessor flags
+POSIX_CPPFLAGS = -D_POSIX_SOURCE
+
+#--------------------------------------------------
+# no shared libs for vxWorks
+SHRLIB_CFLAGS = 
+SHRLIB_LDFLAGS = 
+
+#--------------------------------------------------
+# osithead use default stack, YES or NO override
+OSITHREAD_USE_DEFAULT_STACK = NO
+
+#--------------------------------------------------
+# Link definitions
+LINK.cpp = $(LD) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
+LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
+
+#--------------------------------------------------
+# Definitions for compile of *_ctdt.c file
+CFLAGS_ctdt = $(filter-out -pedantic,$(CFLAGS)) -fdollars-in-identifiers
+COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_FLAG)
+
+#--------------------------------------------------
+# C preprocessor command
+VXCPPFLAGS = $(filter-out $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
+PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@
+
+#--------------------------------------------------
+# Allow site overrides
+-include $(CONFIG)/os/CONFIG_SITE.Common.vxWorks6Common
+-include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorks6Common
+

configure/os/CONFIG.Common.vxWorksCommon

@@ -23,6 +23,12 @@ LIB_PREFIX =lib
 LIB_SUFFIX = .a
 MUNCH_SUFFIX = .munch
 
+#-------------------------------------------------------
+# Compiler definitions
+CMPLR_PREFIX=
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+
 #-------------------------------------------------------
 # Library definitions
 LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX))
@@ -113,8 +119,7 @@ CODE_CXXFLAGS = -fno-implicit-templates
 
 #--------------------------------------------------
 # posix c preprocessor flags
-POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
-POSIX_CPPFLAGS_NO =
+POSIX_CPPFLAGS = -D_POSIX_SOURCE
 
 #--------------------------------------------------
 # no shared libs for vxWorks

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

@@ -0,0 +1,47 @@
+# CONFIG.Common.win32-x86-cygwin
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for cygwin-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.cygwin-x86
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = WIN32
+ARCH_CLASS = x86
+
+EXE=.exe
+
+COMPILER_CPPFLAGS = -D_REENTRANT
+
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+INCLUDES_READLINE = -I$(GNU_DIR)/include
+LDFLAGS_READLINE += -L$(GNU_DIR)/lib
+LDLIBS_READLINE = -lreadline
+
+OP_SYS_CXXFLAGS += -D__cplusplus
+
+# With no-cygwin option:
+#	compiler defines _X86_ 1
+#	compiler defines __MSVCRT__ 1
+#	compiler defines __MINGW32__ 1
+#	compiler defines __WIN32 1
+#	compiler defines __WIN32__ 1
+#	compiler defines _WIN32 1
+#	compiler defines WIN32 1
+#	compiler defines WINNT 1
+#	compiler does not define  __unix __unix__ unix
+#	compiler does not define  __CYGWIN__ __CYGWIN32__
+
+# Overrides -DUNIX from CONFIG.Common.UnixCommon
+OP_SYS_CPPFLAGS = -mno-cygwin
+
+OP_SYS_LDFLAGS += -mno-cygwin
+OP_SYS_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+

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

@@ -0,0 +1,39 @@
+# CONFIG.Common.win32-x86-mingw
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for win32-x86-mingw target builds
+# Sites may override these definitions in CONFIG_SITE.Common.win32-x86-mingw
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = WIN32
+ARCH_CLASS = x86
+
+EXE=.exe
+
+# Library used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline
+
+STATIC_BUILD=YES
+STATIC_LDLIBS_YES=-lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+
+# Compiler defines _X86_ 1
+
+# Compiler defines __MSVCRT__ 1
+# Compiler defines __MINGW32__ 1
+# Compiler defines __WIN32 1
+# Compiler defines __WINNT 1
+# Compiler defines __WINNT__ 1
+# Compiler defines __WIN32__ 1
+# Compiler defines _WIN32 1
+# Compiler defines WIN32 1
+# Compiler defines WINNT 1
+# Compiler does not define  __unix __unix__ unix
+
+# Override for -DUNIX from CONFIG.Common.UnixCommon
+OP_SYS_CPPFLAGS =
+

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

@@ -10,9 +10,6 @@ include $(CONFIG)/CONFIG.gnuCommon
 
 GNU_DIR = /usr/common/usg/gcc/3.2.1
 
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++
-
 AR = ar
 ARFLAGS = rcv
 RANLIB = ranlib -t

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

@@ -10,8 +10,6 @@
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++
 AR = ar -rc
 RANLIB=
 LD = ld -r
@@ -23,7 +21,7 @@ STATIC_LDLIBS_YES = -Wl,-a,default
 STATIC_LDLIBS_NO =
 
 # Switch explicitly from default DCE threads to posix threads
-POSIX_CPPFLAGS_YES += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L
+POSIX_CPPFLAGS += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L
 USR_SYS_LIBS += pthread
 
 # C++ templates need PIC definition also in link phase

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

@@ -15,9 +15,9 @@ AR = ar -rc
 LD = ld -r
 
 # Configure OS vendor C compiler
-CONFORM_CFLAGS_ANSI = -Aa
-CONFORM_CFLAGS_STRICT = -Aa
-CONFORM_CFLAGS_TRAD = -Ac
+CONFORM_CFLAGS_ANSI = -Aa -mt
+CONFORM_CFLAGS_STRICT = -Aa -mt
+CONFORM_CFLAGS_TRAD = -Ac -mt
 
 # Portability across different PA-RISC architecture versions
 CODE_CFLAGS = +DAportable +z

configure/os/CONFIG.linux-ppc.Common

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

configure/os/CONFIG.linux-ppc.linux-ppc

@@ -0,0 +1,20 @@
+#  CONFIG.linux-ppc.linux-ppc
+#
+#
+# Definitions for linux-ppc host - linux-ppc target builds
+# Sites may override these definitions in CONFIG_SITE.linux-ppc.linux-ppc
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
+GNU_DIR = /usr
+
+CC = $(GNU_BIN)/gcc
+CCC = $(GNU_BIN)/g++
+
+SHRLIB_LDFLAGS = -shared -fPIC
+LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
+
+GNU_LDLIBS_YES = -lgcc
+

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

@@ -11,14 +11,11 @@ include $(CONFIG)/CONFIG.gnuCommon
 
 GNU_DIR = /usr
 
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++
-
 STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_LDFLAGS +=  -shared -fPIC 
+SHRLIB_LDFLAGS +=  -shared -fPIC
 LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
 

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

@@ -0,0 +1,15 @@
+# CONFIG.linux-x86_64-debug.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86_64 debug with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.linux-x86_64-debug.Common
+#-------------------------------------------------------
+
+#Include definitions common to linux-x86_64 hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common
+
+# Make all crosscompiler builds debug builds
+#CROSS_OPT=NO
+

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

@@ -0,0 +1,14 @@
+# CONFIG.linux-x86_64-debug.linux-x86_64-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86_64 host - linux-x86_64 target build with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86_64.linux-x86_64
+
+# Removes -O optimization and adds -g compile option
+HOST_OPT=NO
+

configure/os/CONFIG.linux-x86_64.Common

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

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

@@ -0,0 +1,21 @@
+#  CONFIG.linux-x86_64.linux-x86_64
+#
+# $Id$
+#
+# Definitions for linux-x86_64 host - linux-x86_64 target builds
+# Sites may override these definitions in CONFIG_SITE.linux-x86_64.linux-x86_64
+#-------------------------------------------------------
+
+# 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.linux-x86_64.linux-x86_64-debug

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

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

@@ -10,10 +10,6 @@
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
-GNU_DIR = /opt/gnu
-
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++
 AR = ar -rc
 RANLIB=
 LD = ld -r
@@ -23,8 +19,8 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_LDFLAGS += -shared -fPIC -h $@ 
-LOADABLE_SHRLIB_LDFLAGS += -shared -fPIC -h $@
+SHRLIB_LDFLAGS +=  -shared -fPIC
+LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
 
 OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
 

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

@@ -7,54 +7,4 @@
 # Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc
 #-------------------------------------------------------
 
-SPARCWORKS = /opt/SUNWspro
-
-CC = $(SPARCWORKS)/bin/cc
-CCC = $(SPARCWORKS)/bin/CC
-CPP = $(CC) -E -Qn
-RANLIB =
-# required by sun's C++ compiler
-AR = $(CCC) -xar -o
-LD = ld -r
-
-#Prepare the object code for profiling with prof. (YES or NO)
-PROFILE=NO
-#Prepare the object code for profiling with gprof. (YES or NO)
-GPROF=NO
-
-# Configure OS vendor C compiler
-CONFORM_CFLAGS_ANSI = -Xa -v
-CONFORM_CFLAGS_STRICT = -Xc -v
-CONFORM_CFLAGS_TRAD = -Xs
-PROF_CFLAGS_YES = -p
-GPROF_CFLAGS_YES = -xpg
-CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
-WARN_CFLAGS_YES =
-WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -xO4
-OPT_CFLAGS_NO = -g
-
-# Configure OS vendor C++ compiler
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT =
-PROF_CXXFLAGS_YES = -p
-GPROF_CXXFLAGS_YES = -xpg
-CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
-WARN_CXXFLAGS_YES = +w
-WARN_CXXFLAGS_NO =
-OPT_CXXFLAGS_YES = -O
-OPT_CXXFLAGS_NO = -g
-
-CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
-
-STATIC_LDFLAGS_YES= -Bstatic
-STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Bdynamic
-STATIC_LDLIBS_NO=
-
-SHRLIB_CFLAGS = -KPIC
-SHRLIB_LDFLAGS += -z defs -G -h $@ -z text
-LOADABLE_SHRLIB_LDFLAGS += -G -h $@ -z text
-
-OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
-
+include $(CONFIG)/os/CONFIG.solarisCommon.solarisCommon

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

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

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

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

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

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

configure/os/CONFIG.solaris-sparc64.Common

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

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

@@ -0,0 +1,11 @@
+# CONFIG.solaris-sparc64.solaris-sparc64
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc Sun compiler host - solaris-sparc Sun compiler target builds
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc64.solaris-sparc64
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/os/CONFIG.solaris-sparc.solaris-sparc

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

@@ -10,10 +10,6 @@
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
-GNU_DIR = /opt/gnu
-
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++
 AR = ar -rc
 RANLIB=
 LD = ld -r
@@ -22,4 +18,3 @@ SHRLIB_LDFLAGS += -shared -fPIC -h $@  -z defs
 LOADABLE_SHRLIB_LDFLAGS += -shared -fPIC -h $@
 
 OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
-

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

@@ -7,54 +7,4 @@
 # Sites may override these definitions in CONFIG_SITE.solaris-x86.solaris-x86
 #-------------------------------------------------------
 
-SPARCWORKS = /opt/SUNWspro
-
-CC = $(SPARCWORKS)/bin/cc
-CCC = $(SPARCWORKS)/bin/CC
-CPP = $(CC) -E -Qn
-RANLIB =
-# required by sun's C++ compiler
-AR = $(CCC) -xar -o
-LD = ld -r
-
-#Prepare the object code for profiling with prof. (YES or NO)
-PROFILE=NO
-#Prepare the object code for profiling with gprof. (YES or NO)
-GPROF=NO
-
-# Configure OS vendor C compiler
-CONFORM_CFLAGS_ANSI = -Xa -v
-CONFORM_CFLAGS_STRICT = -Xc -v
-CONFORM_CFLAGS_TRAD = -Xs
-PROF_CFLAGS_YES = -p
-GPROF_CFLAGS_YES = -xpg
-CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
-WARN_CFLAGS_YES =
-WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -xO4
-OPT_CFLAGS_NO = -g
-
-# Configure OS vendor C++ compiler
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT =
-PROF_CXXFLAGS_YES = -p
-GPROF_CXXFLAGS_YES = -xpg
-CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
-WARN_CXXFLAGS_YES = +w
-WARN_CXXFLAGS_NO =
-OPT_CXXFLAGS_YES = -O
-OPT_CXXFLAGS_NO = -g
-
-CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
-
-STATIC_LDFLAGS_YES= -Bstatic
-STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Bdynamic
-STATIC_LDLIBS_NO=
-
-SHRLIB_CFLAGS = -KPIC
-SHRLIB_LDFLAGS += -z defs -G -h $@ -z text
-LOADABLE_SHRLIB_LDFLAGS += -G -h $@ -z text
-
-OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
-
+include $(CONFIG)/os/CONFIG.solarisCommon.solarisCommon

configure/os/CONFIG.solarisCommon.solarisCommon

@@ -0,0 +1,65 @@
+# CONFIG.solaris-sparc.solaris-sparc
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc host - solaris-sparc target build
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc
+#-------------------------------------------------------
+
+SPARCWORKS = /opt/SUNWspro
+
+CC = $(SPARCWORKS)/bin/cc
+CCC = $(SPARCWORKS)/bin/CC
+CPP = $(CC) -E -Qn
+RANLIB =
+# required by sun's C++ compiler
+AR = $(CCC) -xar -o
+LD = ld -r
+
+#Prepare the object code for profiling with prof. (YES or NO)
+PROFILE=NO
+#Prepare the object code for profiling with gprof. (YES or NO)
+GPROF=NO
+
+# Configure OS vendor C compiler
+CONFORM_CFLAGS_ANSI = -Xa -v
+CONFORM_CFLAGS_STRICT = -Xc -v
+CONFORM_CFLAGS_TRAD = -Xs
+PROF_CFLAGS_YES = -p
+GPROF_CFLAGS_YES = -xpg
+CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
+WARN_CFLAGS_YES =
+WARN_CFLAGS_NO = -w
+OPT_CFLAGS_YES = -xO4
+OPT_CFLAGS_NO = -g
+
+# Configure OS vendor C++ compiler
+CONFORM_CXXFLAGS_NORMAL =
+CONFORM_CXXFLAGS_STRICT =
+PROF_CXXFLAGS_YES = -p
+GPROF_CXXFLAGS_YES = -xpg
+CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
+WARN_CXXFLAGS_YES = +w
+WARN_CXXFLAGS_NO =
+OPT_CXXFLAGS_YES = -O
+OPT_CXXFLAGS_NO = -g
+
+CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
+
+STATIC_LDFLAGS_YES= -Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Bdynamic
+STATIC_LDLIBS_NO=
+
+SHRLIB_CFLAGS = -KPIC
+SHRLIB_LDFLAGS = -z defs -G -h $@ -z text
+LOADABLE_SHRLIB_LDFLAGS = -G -h $@ -z text
+
+OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
+
+# Filter for getting rid of "invalid white space character in directive" compiler warnings
+# when including headers created during win32 build.
+#COMPILE_FILTER.c = 2>&1 | $(EPICS_BASE)/configure/tools/filterWarnings.pl
+#COMPILE_FILTER.cpp = $(COMPILE_FILTER.c)
+

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

@@ -0,0 +1,19 @@
+# CONFIG.win32-x86-cygwin.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for win32-x86-cygwin host archs
+# Sites may override these definitions in CONFIG_SITE.win32-x86-cygwin.Common
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.UnixCommon.Common
+
+HOSTEXE=.exe
+
+WIND_HOST_TYPE = x86-win32
+
+# osithead use default stack, YES or NO override
+OSITHREAD_USE_DEFAULT_STACK = NO
+

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

@@ -0,0 +1,34 @@
+#  CONFIG.win32-x86-cygwin.win32-x86-cygwin
+#
+# $Id$
+#
+# Definitions for win32-x86-cygwin host - win32-x86-cygwin target builds
+# Sites may override these definitions in CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
+#-------------------------------------------------------
+
+# 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
+
+# Dont use -fPIC: with -fPIC we get 
+# "warning: -fPIC ignored for target (all code is position independent) "
+SHRLIB_CFLAGS =
+
+# Dont use -ansi: -ansi eliminates strdup and _tempnam
+CONFORM_CFLAGS_ANSI =
+CONFORM_CFLAGS_STRICT = -pedantic
+CONFORM_CXXFLAGS_ANSI =
+CONFORM_CXXFLAGS_STRICT = -pedantic
+
+# Override linking with gcc library
+GNU_LDLIBS_YES =
+

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

@@ -0,0 +1,32 @@
+# CONFIG.win32-x86-mingw.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for win32-x86-cygwin host archs
+# Sites may override these definitions in CONFIG_SITE.win32-x86-cygwin.Common
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.UnixCommon.Common
+
+CP = $(PERL) $(CONFIG)/tools/cp.pl
+MV = $(PERL) $(CONFIG)/tools/mv.pl
+RM = $(PERL) $(CONFIG)/tools/rm.pl -f
+MKDIR = $(PERL) $(CONFIG)/tools/mkdir.pl
+RMDIR = $(PERL) $(CONFIG)/tools/rm.pl -rf
+ECHO = echo
+
+HOSTEXE=.exe
+
+WIND_HOST_TYPE = x86-win32
+
+# osithead use default stack, YES or NO override
+OSITHREAD_USE_DEFAULT_STACK = NO
+
+# DLL build not supported yet
+# Needed to find dlls for base installed build tools (antelope,eflex,...)
+#PATH := $(EPICS_BASE_TOOLS_BIN):$(PATH)
+
+
+

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

@@ -0,0 +1,33 @@
+#  CONFIG.win32-x86-mingw.win32-x86-mingw
+#
+# $Id$
+#
+# Definitions for win32-x86-mingw host - win32-x86-mingw target builds
+# Sites may override these definitions in CONFIG_SITE.win32-x86-mingw.win32-x86-mingw
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
+# Shared libraries not implemented
+SHARED_LIBRARIES=NO
+
+# gcc, g++, ar, ld, and ranlib must be in user's path
+CC = gcc
+CCC = g++
+AR = ar -rc
+LD = ld -r
+RANLIB = ranlib
+
+# Avoid "position-independent code is always generated" message
+SHRLIB_CFLAGS =
+
+# Dont use -ansi option:  eliminates strdup and _tempnam
+CONFORM_CFLAGS_ANSI =
+CONFORM_CFLAGS_STRICT = -pedantic
+CONFORM_CXXFLAGS_ANSI =
+CONFORM_CXXFLAGS_STRICT = -pedantic
+
+# Override linking with gcc library
+GNU_LDLIBS_YES =
+

configure/os/CONFIG_SITE.Common.RTEMS

@@ -1,14 +1,19 @@
 #
 # Site-specific information for all RTEMS targets
 #
+#-------------------------------------------------------
 
+# Where to find RTEMS
 #
-# If you're not using BOOTP/DHCP to pick up your IOC network configuration
-# you may need to specify your Internet Domain Name here
+RTEMS_BASE=/usr/local/rtems/rtems-4.7
+RTEMS_VERSION=4.7
+
+# If you're using neither BOOTP/DHCP nor FLASH to pick up your IOC
+# network configuration you must specify your Internet Domain Name here
 #
 OP_SYS_CFLAGS += -DRTEMS_NETWORK_CONFIG_DNS_DOMAINNAME=aps.anl.gov
 
 #
 # Specify your desired command-line-input library
 #
-EPICSCOMMANDLINE_LIBRARY = READLINE
+EPICSCOMMANDLINE_LIBRARY = EPICS

configure/os/CONFIG_SITE.Common.cygwin-x86

@@ -0,0 +1,12 @@
+# CONFIG_SITE.Common.cygwin-x86
+#
+# $Id$
+#
+# Site Specific definitions for cygwin-x86 target
+# Only the local epics system manager should modify this file
+
+# If readline is installed uncomment the following line
+# to add command-line editing and history support
+#COMMANDLINE_LIBRARY = READLINE
+
+

configure/os/CONFIG_SITE.Common.darwin-ppc

@@ -9,5 +9,6 @@
 #
 # Other local options
 #
-OP_SYS_CFLAGS += -g
-#COMMANDLINE_LIBRARY = READLINE
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
+COMMANDLINE_LIBRARY = READLINE

configure/os/CONFIG_SITE.Common.hpux-parisc

@@ -10,9 +10,9 @@
 #    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) (or wherever you install
 #    the EPICS shared libraries on your system) when invoking base
 #    executables.
-# b) Add the path to SHRLIB_SEARCH_DIRS below, which will burn
+# b) Add the path to SHRLIB_SEARCH_FULLPATHDIRS below, which will burn
 #    the runtime search path into the executables.
 #SHARED_LIBRARIES=YES
 
 # This is the absolute path to the generic INSTALL_LOCATION, for SHARED_LIBRARY searches.
-SHRLIB_SEARCH_DIRS += /opt/epics/R$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)/support/base/$(EPICS_VERSION)-$(EPICS_REVISION)-$(EPICS_MODIFICATION)-$(EPICS_UPDATE_NAME)$(EPICS_UPDATE_LEVEL)/lib/$(EPICS_HOST_ARCH)
+SHRLIB_SEARCH_FULLPATHDIRS += /opt/epics/R$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)/base/$(EPICS_VERSION)-$(EPICS_REVISION)-$(EPICS_MODIFICATION)-$(EPICS_UPDATE_NAME)$(EPICS_UPDATE_LEVEL)/lib/$(EPICS_HOST_ARCH)

configure/os/CONFIG_SITE.Common.linux-x86

@@ -12,7 +12,7 @@
 # a) LD_LIBRARY_PATH must include the full absolute pathname to
 #    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
 #    executables.
-# b) Add the runtime path to SHRLIB_SEARCH_DIRS, which will add
+# b) Add the runtime path to SHRLIB_SEARCH_FULLPATHDIRS, which will add
 #    the named directory to the list contained in the executables.
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -0,0 +1,23 @@
+# CONFIG_SITE.Common.linux-x86_64
+#
+# $Id$
+#
+# Site Specific definitions for linux-x86_64 target
+# Only the local epics system manager should modify this file
+
+# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
+# shared libraries will be found automatically.  However if the .so
+# files are installed at a different path to their compile-time path
+# then in order to be found at runtime do one of these:
+# a) LD_LIBRARY_PATH must include the full absolute pathname to
+#    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
+#    executables.
+# b) Add the runtime path to SHRLIB_SEARCH_DIRS, which will add
+#    the named directory to the list contained in the executables.
+# c) Add the runtime path to /etc/ld.so.conf and run ldconfig
+#    to inform the system of the shared library location.
+
+# If readline is not installed comment the following line
+# to omit command-line editing and history support
+COMMANDLINE_LIBRARY = READLINE
+OP_SYS_CFLAGS += -g

configure/os/CONFIG_SITE.Common.solaris-sparc

@@ -8,4 +8,7 @@
 # If readline is installed uncomment the following macro definition
 # to include command-line editing and history support
 #
-COMMANDLINE_LIBRARY = READLINE
+#COMMANDLINE_LIBRARY = READLINE
+
+# APS site override
+GNU_DIR = /opt/gnu

configure/os/CONFIG_SITE.Common.solaris-sparc64

@@ -0,0 +1,11 @@
+# CONFIG_SITE.Common.solaris-sparc64
+#
+# $Id$
+#
+# Site Specific definitions for solaris-sparc64 target
+# Only the local epics system manager should modify this file
+
+# Include definitions common to all solaris-sparc64 target archs
+include $(CONFIG)/os/CONFIG_SITE.Common.solaris-sparc
+
+COMMANDLINE_LIBRARY = EPICS

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

@@ -0,0 +1,11 @@
+# CONFIG_SITE.Common.solaris-sparc64-gnu
+#
+# $Id$
+#
+# Site Specific definitions for solaris-sparc64-gnu target
+# Only the local epics system manager should modify this file
+
+# Include definitions common to all solaris-sparc-gnu target archs
+include $(CONFIG)/os/CONFIG_SITE.Common.solaris-sparc-gnu
+
+COMMANDLINE_LIBRARY = EPICS

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -0,0 +1,10 @@
+# CONFIG_SITE.Common.vxWorksCommon
+#
+# Site specific definitions for vxWorks target builds
+# Only the local epics system manager should modify this file
+
+
+#  Tornado directory
+VX_DIR = /usr/local/vw/tornado202p1
+#VX_DIR = /usr/local/vw/tornado22-$(ARCH_CLASS)
+

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

@@ -0,0 +1,12 @@
+# CONFIG_SITE.Common.win32-x86-cygwin
+#
+# $Id$
+#
+# Site Specific definitions for cygwin-x86 target
+# Only the local epics system manager should modify this file
+
+# Needed to find dlls for gcc, g++, as, cpp, ...
+# if cygwin/bin not already in path
+CYGWIN_BIN=C:/cygwin/bin
+export PATH := $(CYGWIN_BIN):$(PATH)
+

configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86

@@ -6,5 +6,6 @@
 # Site override definitions for cygwin-x86 host - cygwin-x86 target builds
 #-------------------------------------------------------
  
-##GNU_DIR=C:/cygwin
+#  GNU_DIR used when COMMANDLINE_LIBRARY is READLINE
+GNU_DIR=C:/cygwin
 

configure/os/CONFIG_SITE.darwin-ppc.Common

@@ -6,6 +6,4 @@
 # Site override definitions for darwin-ppc host builds
 #-------------------------------------------------------
 
-# JBA test override values
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+# CROSS_COMPILER_TARGET_ARCHS = RTEMS-uC5282

configure/os/CONFIG_SITE.linux-x86.Common

@@ -9,5 +9,4 @@
 # JBA test override values
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
-#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
-
+#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167

configure/os/CONFIG_SITE.linux-x86.UnixCommon

@@ -4,6 +4,3 @@
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
  
-CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX)
-CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++$(CMPLR_SUFFIX)
-

configure/os/CONFIG_SITE.linux-x86.vxWorks6-mv2100

@@ -0,0 +1,12 @@
+# CONFIG_SITE.linux-x86.vxWorks6-mv2100
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for linux-x86 host - vxWorks6-mv2100 target builds
+#-------------------------------------------------------
+# WindRiver has changed the directory structure of vxWorks
+# This is for VxWorks 6.0
+
+VX_DIR = /ade/vxWorks/6.0
+

configure/os/CONFIG_SITE.linux-x86.vxWorks6-mv5100

@@ -0,0 +1,12 @@
+# CONFIG_SITE.linux-x86.vxWorks6-mv5100
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for linux-x86 host - vxWorks6-mv5100 target builds
+#-------------------------------------------------------
+# WindRiver has changed the directory structure of vxWorks
+# This is for VxWorks 6.0
+
+VX_DIR = /ade/vxWorks/6.0
+

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

@@ -0,0 +1,15 @@
+# CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug
+#
+# $Id$
+#
+# Site specific override definitions for solaris-sparc host builds
+# Only the local epics system manager should modify this file
+
+
+
+#Prepares the object code to collect data for profiling with prof. 
+#PROFILE=YES
+
+#Compiles for profiling with the gprof profiler.
+#GPROF=YES
+

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -0,0 +1,12 @@
+# CONFIG_SITE.linux-x86_64.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for linux-x86_64 host builds
+#-------------------------------------------------------
+
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
+

configure/os/CONFIG_SITE.linux-x86_64.UnixCommon

@@ -0,0 +1,10 @@
+# CONFIG_SITE.linux-x86_64.UnixCommon
+$
+# $Id$
+#
+# Site Specific configure override definitions
+# Only the local epics system manager should modify this file
+ 
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX)
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++$(CMPLR_SUFFIX)
+

configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64

@@ -0,0 +1,17 @@
+# CONFIG_SITE.linux-x86_64.linux-x86_64
+#
+# $Id$
+#
+# Site specific definitions for linux-x86_64 host - linux-x86_64 target builds
+#-------------------------------------------------------
+
+# -z defs causes problems for Linux
+#The -z defs option causes the linker to not ignore
+# unresolved references when building a shared library
+# Forces a fatal error if any undefined symbols remain 
+# at the end of the link
+# So we will override the definition of SHRLIB_LDFLAGS
+# in "CONFIG.linux-x86_64.linux-x86_64"
+
+SHRLIB_LDFLAGS= -shared
+

configure/os/CONFIG_SITE.linux-x86_64.vxWorks-68040

@@ -0,0 +1,21 @@
+# CONFIG_SITE.linux-x86_64.vxWorks-68040
+#
+# $Id$
+#
+# Site specific definitions for linux-x86_64 host -  vxWorks-68040 target builds
+# Only the local epics system manager should modify this file
+#-------------------------------------------------------
+
+# JBA test override values
+#CMPLR_SUFFIX=
+#GNU_TARGET=m68k-wrs-vxworks
+#CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
+
+# ORNL SNS overrides for cross compilers
+#VX_DIR = /opt/tornado20/
+#VX_CONFIG_DIR_YES = $(VX_DIR)/target/config
+#VX_INCLUDE_YES = /usr/local/crossgcc/m68k/m68k-wrs-vxworks/sys-include
+#VX_GNU_YES = /usr/local/crossgcc/m68k/
+#VX_GNU_BIN_YES = $(VX_GNU)/bin
+#VX_GNU_LIB_YES = /usr/local/crossgcc/m68k/lib/gcc-lib/m68k-wrs-vxworks/2.95.2
+

configure/os/CONFIG_SITE.linux-x86_64.vxWorks-ppc603

@@ -0,0 +1,17 @@
+# CONFIG_SITE.linux-x86_64.vxWorks-ppc603
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for linux-x86_64 host - vxWorks-ppc603 target builds
+#-------------------------------------------------------
+# This file contains overrides for Vx builds
+# ORNL SNS overrides for cross compilers
+
+# The custom cross compiler for VxWorks on Linux
+# has place in a directory structure like that of
+# the Solaris distribution.  So now the cross should
+# only need the following line.
+# cross-compiler from "Linux x86pc" host to a "ppc603" target
+VX_DIR_YES = /ade/vxWorks/t202/ppc
+

configure/os/CONFIG_SITE.linux-x86_64.vxWorks-ppc603_long

@@ -0,0 +1,17 @@
+# CONFIG_SITE.linux-x86_64.vxWorks-ppc603_long
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for linux-x86_64 host - vxWorks-ppc603 target builds
+#-------------------------------------------------------
+# This file contains overrides for Vx builds
+# ORNL SNS overrides for cross compilers
+
+# The custom cross compiler for VxWorks on Linux
+# has place in a directory structure like that of
+# the Solaris distribution.  So now the cross should
+# only need the following line.
+# cross-compiler from "Linux x86pc" host to a "ppc603" target
+VX_DIR_YES = /ade/vxWorks/t202/ppc
+

configure/os/CONFIG_SITE.linux-x86_64.vxWorks6-mv2100

@@ -0,0 +1,12 @@
+# CONFIG_SITE.linux-x86_64.vxWorks6-mv2100
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for linux-x86_64 host - vxWorks6-mv2100 target builds
+#-------------------------------------------------------
+# WindRiver has changed the directory structure of vxWorks
+# This is for Tornado 3 (i.e. VxWorks 6.0)
+
+VX_DIR = /ade/vxWorks/6.0
+

configure/os/CONFIG_SITE.linux-x86_64.vxWorks6-mv5100

@@ -0,0 +1,12 @@
+# CONFIG_SITE.linux-x86_64.vxWorks6-mv5100
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for linux-x86_64 host - vxWorks6-mv5100 target builds
+#-------------------------------------------------------
+# WindRiver has changed the directory structure of vxWorks
+# This is for Tornado 3 (i.e. VxWorks 6.0)
+
+VX_DIR = /ade/vxWorks/6.0
+

configure/os/CONFIG_SITE.linux-x86_64.vxWorksCommon

@@ -0,0 +1,11 @@
+# CONFIG_SITE.linux-x86_64.vxWorksCommon
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86_64 host - vxWorks target builds
+#-------------------------------------------------------
+ 
+# SNS override values
+#WIND_HOST_TYPE = x86-linux
+

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

@@ -1,3 +1,4 @@
+include $(CONFIG)/os/CONFIG_SITE.Common.solaris-sparc
 
 #Prepares the object code to collect data for profiling with prof. 
 #PROFILE=YES

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

@@ -1,3 +1,4 @@
+include $(CONFIG)/os/CONFIG_SITE.Common.solaris-sparc
 
 #Prepares the object code to collect data for profiling with prof. 
 #PROFILE=YES

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

@@ -0,0 +1,17 @@
+# CONFIG_SITE.win32-x86-mingw.Common
+#
+# $Id$
+#
+# Site Specific definitions for cygwin-x86 target
+# Only the local epics system manager should modify this file
+
+# If readline is not installed comment the following line
+# to omit command-line editing and history support
+#COMMANDLINE_LIBRARY = READLINE
+
+# Needed to find dlls for gcc, g++, as, cpp, ...
+# if MINGW_BIN not in user's path
+MINGW_BIN=C:/MinGW/bin
+export PATH := $(MINGW_BIN):$(PATH)
+
+PERL=c:/cygwin/bin/perl.exe

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

@@ -2,7 +2,7 @@
 
 # Microsoft Visual C++ .NET is the default compiler
 # If you have Visual C++ 6.0, uncomment the following override lines
-# This will to eliminate warnings about unknown options /GL, LTCG, and /44355.
+# This will to eliminate warnings about unknown options /GL, /LTCG, and /w44355.
 #OPT_CFLAGS_YES = /Ox
 #OPT_CXXFLAGS_YES = /Ox
 #OPT_CFLAGS_NO =  /Zi 
@@ -12,4 +12,8 @@
 #WARN_CXXFLAGS_YES = /W3 
 
 
+# iF you have Visual C++ 8.0 or 8.0 express, uncomment the following override.
+# This will to eliminate warnings about /GX being deprecated.
+#
+#CCC = cl /nologo /EHsc /GR
 

configure/tools/convertRelease.pl

@@ -18,9 +18,7 @@ eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
 use Cwd qw(cwd abs_path);
 use Getopt::Std;
 
-$cwd = cwd();
-$cwd =~ s/\/tmp_mnt//;	# hack for sun4
-$cwd =~ s/\\/\//g;	# hack for win32
+$cwd = UnixPath(cwd());
 
 getopt "ahtT";
 
@@ -41,7 +39,6 @@ if ($opt_T) {
     $top = $cwd;
     $top =~ s/\/iocBoot.*$//;
     $top =~ s/\/configure.*$//;
-    chomp($top = `cygpath -m $top`) if ($^O eq "cygwin");
 }
 
 # The IOC may need a different path to get to $top
@@ -67,7 +64,7 @@ unless (@ARGV == 1) {
 $outfile = $ARGV[0];
 
 # TOP refers to this application
-%macros = (TOP => $top);
+%macros = (TOP => LocalPath($top));
 @apps   = (TOP);	# Records the order of definitions in RELEASE file
 
 # Read the RELEASE file(s)
@@ -316,3 +313,27 @@ sub checkRelease {
     print "\n" if ($status);
     exit $status;
 }
+
+# Path rewriting rules for various OSs
+# These functions are duplicated in src/makeBaseApp/makeBaseApp.pl
+sub UnixPath {
+    my ($newpath) = @_;
+    if ($^O eq "cygwin") {
+	$newpath =~ s|\\|/|go;
+	$newpath =~ s%^([a-zA-Z]):/%/cygdrive/$1/%;
+    } elsif ($^O eq 'sunos') {
+	$newpath =~ s(^\/tmp_mnt/)(/);
+    }
+    return $newpath;
+}
+
+sub LocalPath {
+    my ($newpath) = @_;
+    if ($^O eq "cygwin") {
+	$newpath =~ s%^/cygdrive/([a-zA-Z])/%$1:/%;
+    } elsif ($^O eq "darwin") {
+	# These rules are likely to be site-specific
+	$newpath =~ s%^/private/var/auto\.home/%/home/%;    # APS
+    }
+    return $newpath;
+}

configure/tools/filterWarnings.pl

@@ -31,15 +31,24 @@ sub Usage
     exit 2;
 }
 
-while ( $errline = <> ) {
-  if ( $errline =~ m/^(Warning|Error)/ ) {
-    ($errno) = ($errline =~ m/.* ([0-9]+):/);
-    $codeline = <>;
-    $pointline = <>;
-    next if $codeline =~ m|/[/*]\s*X.*aCC[^a-zA-Z]*$errno|;
+# Invalid whit space filter on solaris not implemented
+#if ( $ENV{"EPICS_HOST_ARCH"} =~ m/solaris-sparc/ ) {
+#  while ( $errline = <> ) {
+#    if ( $errline !~ m/invalid white space character in directive/ ) {
+#      print $errline;
+#    }
+#  }
+#} else {
+  while ( $errline = <> ) {
+    if ( $errline =~ m/^(Warning|Error)/ ) {
+      ($errno) = ($errline =~ m/.* ([0-9]+):/);
+      $codeline = <>;
+      $pointline = <>;
+      next if $codeline =~ m|/[/*]\s*X.*aCC[^a-zA-Z]*$errno|;
 
-    print wrap ("", "    ", $errline);
-    print $codeline;
-    print $pointline;
+      print wrap ("", "    ", $errline);
+      print $codeline;
+      print $pointline;
+    }
   }
-}
+#}

configure/tools/fullPathName.pl

@@ -1,10 +1,20 @@
 eval 'exec perl -S -w  $0 ${1+"$@"}'  # -*- Mode: perl -*-
         if 0; 
 
+#
+# Determine fullpathname if argument starts with "."
+# else return argument value.
+#
+
 use Cwd 'abs_path';
 my $dir;
-if( $ARGV[0] )
-{
-  $dir = abs_path("$ARGV[0]");
-  print "$dir\n";
+if( $ARGV[0] ) {
+  if( $ARGV[0] =~ /^\./ )
+  {
+    $dir = abs_path("$ARGV[0]");
+	$dir =~ s/\/tmp_mnt//;     
+    print "$dir\n";
+  } else  {
+    print "$ARGV[0]\n";
+  }
 }

configure/tools/makeDbDepends.pl

@@ -0,0 +1,33 @@
+eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
+    if $running_under_some_shell; # makeDbDepends.pl
+
+# Called from within RULES.Db in the Db directories.
+# Searches .substitutions and .template files (from the command line) for
+# "file xxx {" entries to create a DEPENDS file
+#  and 
+# 'include "xxx"' entries to create a DEPENDS file
+
+
+$target = $ARGV[0];
+shift @ARGV;
+
+
+foreach $file (@ARGV) {
+    open(IN, "<$file") or die "Cannot open $file: $!";
+    @infile = <IN>;
+    close IN or die "Cannot close $file: $!";
+
+    @depends = grep { s/^\s*file\s*(.*)\s*\{.*$/\1/ } @infile;
+    chomp @depends;
+
+    if (@depends) {
+	print "$target: @depends\n";
+    }
+
+    @depends2 = grep { s/^\s*include\s*\"\s*(.*)\s*\".*$/\1/ } @infile;
+    chomp @depends2;
+
+    if (@depends2) {
+	print "$target: @depends2\n";
+    }
+}

configure/tools/makeMakefileInclude.pl

@@ -106,7 +106,7 @@ foreach $name ( @nameList ) {
 	print OUT "${name}_RESS+=\$(addsuffix \$(RES),\$(basename \$(${name}_RCS)))\n";
 	print OUT "${name}_OBJSNAME+=\$(addsuffix \$(OBJ),\$(basename \$(${name}_OBJS)))\n";
 	print OUT "${name}_DEPLIBS=\$(foreach lib, \$(${name}_LDLIBS),\\\n";
-	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib)\*,\\\n";
+	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib).\*,\\\n";
 	print OUT " \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS)))\\\n";
 	print OUT " \$(addsuffix /\$(LIB_PREFIX)\$(lib)\$(LIB_SUFFIX),\\\n";
 	print OUT " \$(firstword \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS))\/)))\n";
@@ -121,12 +121,12 @@ foreach $name ( @nameList ) {
 	print OUT "${name}_RESS+=\$(addsuffix \$(RES),\$(basename \$(${name}_RCS)))\n";
 	print OUT "${name}_OBJSNAME+=\$(addsuffix \$(OBJ),\$(basename \$(${name}_OBJS)))\n";
 	print OUT "${name}_DEPLIBS=\$(foreach lib, \$(${name}_LDLIBS),\\\n";
-	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib)\*,\\\n";
+	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib).\*,\\\n";
 	print OUT " \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS)))\\\n";
 	print OUT " \$(addsuffix /\$(LIB_PREFIX)\$(lib)\$(LIB_SUFFIX),\\\n";
 	print OUT " \$(firstword \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS))\/)))\n";
 	print OUT "${name}_DLL_DEPLIBS=\$(foreach lib, \$(${name}_DLL_LIBS),\\\n";
-	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib)\*,\\\n";
+	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib).\*,\\\n";
 	print OUT " \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS)))\\\n";
 	print OUT " \$(addsuffix /\$(LIB_PREFIX)\$(lib)\$(LIB_SUFFIX),\\\n";
 	print OUT " \$(firstword \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS))\/)))\n";
@@ -144,12 +144,12 @@ foreach $name ( @nameList ) {
 	print OUT "${name}_RESS+=\$(addsuffix \$(RES),\$(basename \$(${name}_RCS)))\n";
 	print OUT "${name}_OBJSNAME+=\$(addsuffix \$(OBJ),\$(basename \$(${name}_OBJS)))\n";
 	print OUT "${name}_DEPLIBS=\$(foreach lib, \$(${name}_LDLIBS),\\\n";
-	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib)\*,\\\n";
+	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib).\*,\\\n";
 	print OUT " \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS)))\\\n";
 	print OUT " \$(addsuffix /\$(LIB_PREFIX)\$(lib)\$(LIB_SUFFIX),\\\n";
 	print OUT " \$(firstword \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS))\/)))\n";
 	print OUT "${name}_DLL_DEPLIBS=\$(foreach lib, \$(${name}_DLL_LIBS),\\\n";
-	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib)\*,\\\n";
+	print OUT " \$(firstword \$(wildcard \$(addsuffix /\$(LIB_PREFIX)\$(lib).\*,\\\n";
 	print OUT " \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS)))\\\n";
 	print OUT " \$(addsuffix /\$(LIB_PREFIX)\$(lib)\$(LIB_SUFFIX),\\\n";
 	print OUT " \$(firstword \$(\$(lib)_DIR) \$(SHRLIB_SEARCH_DIRS))\/)))\n";

documentation/ConvertingR3.13AppsToR3.14.html

@@ -165,7 +165,7 @@ example_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 </ul>
 
 <p>After these changes are made the following files are no longer needed:
-baseLIBOBS, Makefile.Host, and Makefile.Vx</p>
+baseLIBOBJS, Makefile.Host, and Makefile.Vx</p>
 
 <h3>File base.dbd no longer needed</h3>
 
@@ -188,18 +188,18 @@ file.</blockquote>
   The structure rset is now a typedef so change
 
   <blockquote>
-    <pre>struct rset <recordname>RSET={ ...</pre>
+    <pre>struct rset &lt;recordname&gt;RSET={ ...</pre>
   </blockquote>
   to
 
   <blockquote>
-    <pre>rset <recordname>RSET={ ...</pre>
+    <pre>rset &lt;recordname&gt;RSET={ ...</pre>
   </blockquote>
   and add the following line after the "rset &lt;recordname&gt;RSET="
   definition.
 
   <blockquote>
-    <pre>epicsExportAddress(rset,xxxRSET);</pre>
+    <pre>epicsExportAddress(rset,&lt;recordname&gt;RSET);</pre>
   </blockquote>
 </blockquote>
 
@@ -211,7 +211,8 @@ file.</blockquote>
   <blockquote>
     <pre>#include "epicsExport.h"</pre>
   </blockquote>
-  and add the following line after the dset dev&lt;devname&gt; definition
+  and add the following line after the dset definition:
+  struct  { ...} dev&lt;devname&gt;= { ...}; 
 
   <blockquote>
     <pre>epicsExportAddress(dset,dev&lt;devname&gt;);</pre>
@@ -316,12 +317,12 @@ $(TOP)/configure/CONFIG"</tt></p>
 
 <p>Change</p>
 
-<p><tt>include ARCH = &lt;old arch specification e.g. mv167&gt;</tt></p>
+<p><tt>ARCH = &lt;old arch specification e.g. mv167&gt;</tt></p>
 
 <p>to</p>
 
-<p>"<tt>include ARCH = &lt;new arch specification e.g.
-vxWorks-68040&gt;"</tt></p>
+<p><tt>ARCH = &lt;new arch specification e.g.
+vxWorks-68040&gt;</tt></p>
 
 <p>Change "<tt>include $(TOP)/config/RULES.ioc</tt>" to "<tt>include
 $(TOP)/configure/RULES.ioc"</tt></p>
@@ -347,7 +348,7 @@ ld &lt; iocCore</pre>
 
 <p>Change the statement:</p>
 
-<p><tt>dbLoadDatabase("../../dbd/exampleApp.dbd")</tt> <br>
+<p><tt>dbLoadDatabase("../../dbd/&lt;name&gt;App.dbd")</tt> <br>
 </p>
 to
 <pre>dbLoadDatabase("../../dbd/&lt;name&gt;.dbd")

documentation/ConvertingR3.14.5AppsToR3.14.6.html

@@ -0,0 +1,163 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title></title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <meta name="Author" content="jba">
+</head>
+
+<body>
+
+<center>
+<h2>Converting an EPICS R3.14.5 application to R3.14.6</h2>
+</center>
+
+<p>This document describes how to convert a R3.14.5 application so that it
+builds with release R3.14.6.</p>
+
+
+<h3>Modify the Makefiles in &lt;top&gt;/iocBoot directory.</h3>
+
+<p>Change " i<tt>nclude $(TOP)/config/CONFIG_APP" </tt>to "<tt>include
+$(TOP)/configure/CONFIG"</tt></p>
+
+<p>If they do not already exist, add the lines
+<blockquote>
+<p><tt>DIRS += $(wildcard *ioc*)</tt></p>
+<p><tt>DIRS += $(wildcard as*)</tt></p>
+</blockquote>
+
+<p>Change <tt>"include $(TOP)/config/RULES.iocBoot" </tt>to "i<tt>nclude
+$(TOP)/configure/RULES_DIRS"</tt></p>
+
+<h3>Modify the Makefiles in &lt;top&gt;/iocBoot/ioc* directories.</h3>
+
+<p>Change <tt>"include $(TOP)/config/CONFIG_APP" </tt>to "<tt>include
+$(TOP)/configure/CONFIG"</tt></p>
+
+<p>Change</p>
+
+<p><tt>ARCH = &lt;old arch specification e.g. mv167&gt;</tt></p>
+
+<p>to</p>
+
+<p><tt>ARCH = &lt;new arch specification e.g.
+vxWorks-68040&gt;</tt></p>
+
+<p>Change "<tt>include $(TOP)/config/RULES.ioc</tt>" to "<tt>include
+$(TOP)/configure/RULES.ioc"</tt></p>
+
+<p>If it exists remove the line</p>
+
+<p><tt>buildInstall: cdCommands </tt></p>
+
+<p>Add the line</p>
+<p><tt>TARGETS = cdCommands</tt></p>
+<p>before the include for RULES.ioc line.</p>
+
+<h3>Modify st.cmd in &lt;top&gt;/iocBoot/ioc* directories.</h3>
+
+<p>Remove the lines</p>
+<pre>ld &lt; seq
+ld &lt; iocCore</pre>
+
+<p>Change "<tt>ld &lt; &lt;libname&gt;Lib</tt>" to "<tt>ld &lt;
+&lt;libname&gt;.munch"</tt></p>
+
+<p>Change "<tt>cd appbin</tt>" to "<tt>cd topbin</tt>"</p>
+
+<p>Change the statement:</p>
+
+<p><tt>dbLoadDatabase("../../dbd/&lt;name&gt;App.dbd")</tt> <br>
+</p>
+to
+<pre>dbLoadDatabase("../../dbd/&lt;name&gt;.dbd")
+&lt;name&gt;_registerRecordDeviceDriver(pdbbase)</pre>
+
+<p>where &lt;name&gt; is replaced with the name of your dbd file.</p>
+
+<h3>recGbl calls</h3>
+
+<p>If any source file makes calls to recGbl routines make sure it has <span
+style="font-family: courier">"#include "recGbl.h"</span>. If it doesn't the
+compiler will issue warning messages and the ioc may issue the message:
+"undefined symbol: _recGblSetSevr".</p>
+
+<h3>Record support changes</h3>
+
+<p>The steppermotor, scan, and pid records are no longer in base.  If these
+records are not used in your application, comment out references to them in
+base.dbd. If these record types are used at your site, they  should be
+downloaded and built with base R3.14 by your EPICS administrator. To update
+the R3.14 location of these record types in your application you must  add
+appropriate module definitions to your application's config/RELEASE file and
+add <tt>LIBOBJS</tt> definitions to the src Makefile.</p>
+
+<p>For example add</p>
+
+<p>         <tt>PID=&lt;full path to modules directory&gt;/pid</tt></p>
+
+<p>to config/RELEASE and add <br>
+
+<p></p>
+
+<p><tt>LIBOBJS += $(PID_BIN)/pidRecord.o</tt></p>
+to your application src/Makefile.
+
+<p>You should consider changing any existing old steppermotor records to the
+new EPICS  motor record  module supported by Beamline Controls and Data
+Acquisition at APS.</p>
+
+<h3>RecDynLink.o and devPtSoft changes</h3>
+
+<p>recDynLink.o and devPtSoft.o are no longer in EPICS base and now exist as
+separate EPICS modules.You must now add the appropriate module full path
+definitions to your application config/RELEASE file, and change
+<tt>LIBOBJS</tt> location definition <tt>$(EPICS_BASE_BIN)</tt> to the module
+definition bin directory in your application src directory files.  See
+"Hardware support changes" below for instructions.</p>
+
+<h3>Hardware support changes</h3>
+
+<p>All hardware support (dev, drv and dbd files) except soft support has been
+unbundled from base R3.14. This support includes the files symb.dbd,
+drvHp1404a.o, drvEpvxiMsg.o, and drvEpvxi.o. If these are not used by your
+application, comment out references to them in base.dbd.</p>
+
+<p>Hardware support now exists as separate EPICS modules. The hardware
+support for your site should be downloaded and built with base R3.14 by your
+EPICS administrator. You must now add the appropriate module full path
+definitions to your application config/RELEASE file, and change
+<tt>LIBOBJS</tt> location from <tt>$(EPICS_BASE_BIN) </tt>to the module  bin
+directory in your application src directory files.</p>
+
+<p>For example, remove</p>
+
+<p>         <tt>LIBOBJS+=$(EPICS_BASE_BIN)/symb</tt></p>
+
+<p>from baseLIBOBJS and add</p>
+
+<p>         <tt>LIBOBJS+=$(SYMB_BIN)/symb</tt></p>
+
+<p>to your application src/Makefile, <br>
+and add the line</p>
+
+<p><tt>SYMB=&lt;full path definition for the built module SYMB&gt;</tt></p>
+
+<p>into your application config/RELEASE file .</p>
+
+<h3>dbLoadtemplate tool changes</h3>
+
+<p>The host tool dbLoadTemplate has been replace by a new EPICS extension,
+msi, which should be downloaded and built with base R3.14 by your EPICS
+administrator. dbLoadTemplate is still supported on iocs.  If, in your
+application, db files are created from template and substitution files you
+should  add the definition</p>
+
+<p><tt>MSI=&lt;full path name to msi executable&gt;</tt></p>
+
+<p>to your application config/RELEASE file.</p>
+<br>
+ </body>
+</html>

documentation/ConvertingR3.14.7AppsToR3.14.8.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title></title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <meta name="Author" content="jba">
+</head>
+
+<body>
+
+<center>
+<h2>Converting an EPICS R3.14.7 application to R3.14.8</h2>
+</center>
+
+<p>This document describes how to convert a R3.14.7 application
+so that it builds and runs properly with release R3.14.8.</p>
+
+<h3>No changes required.</h3>
+
+</body>
+</html>
+~