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 );

configure/CONFIG

@@ -130,6 +130,4 @@ endif
 #etc.
 
 #CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040
-#CMPLR=STRICT
-#CXXCMPLR=STRICT
 

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

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

configure/CONFIG_BASE_VERSION

@@ -26,18 +26,20 @@ EPICS_VERSION = 3
 EPICS_REVISION = 14
 
 # EPICS_MODIFICATION must be a number >=0 and <256 
-EPICS_MODIFICATION = 10
+EPICS_MODIFICATION = 11
 
 # EPICS_PATCH_LEVEL must be a number  (win32 resource file requirement)
 # Not included if zero
 EPICS_PATCH_LEVEL = 0
 
 # This will end in -CVS between official releases
-#EPICS_CVS_SNAPSHOT=-CVS
+EPICS_CVS_SNAPSHOT=-CVS
 #EPICS_CVS_SNAPSHOT=-pre1
 #EPICS_CVS_SNAPSHOT=-pre1-CVS
-EPICS_CVS_SNAPSHOT=-RC1
+#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

@@ -101,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
@@ -112,6 +110,10 @@ 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
@@ -121,6 +123,10 @@ CMPLR_PREFIX=
 LIB_PREFIX=
 SHRLIB_PREFIX= $(LIB_PREFIX)
 
+#-------------------------------------------------------
+# Make echo output - suppress echoing if make's '-s' flag is set
+ECHO := $(if $(findstring s,$(MAKEFLAGS)),\#,@echo)
+
 #--------------------------------------------------
 # vpath directories
 POSIX_YES = os/posix
@@ -177,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)
@@ -225,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))
 
@@ -267,22 +270,23 @@ OP_SYS_LDFLAGS += $(LDFLAGS_$(COMMANDLINE_LIBRARY))
 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)\
+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)\
+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)
 
@@ -296,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
@@ -319,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))
 
 #--------------------------------------------------

configure/CONFIG_FILE_TYPE

@@ -56,9 +56,6 @@ INSTALL_CFG = $(INSTALL_LOCATION)/cfg
 FILE_TYPE += EDL
 INSTALL_EDL = $(INSTALL_LOCATION)/edl
 
-FILE_TYPE += IDL
-INSTALL_IDL = $(INSTALL_LOCATION_LIB)/idl
-
 FILE_TYPE += PERL_MODULES
 INSTALL_PERL_MODULES = $(INSTALL_LOCATION_LIB)/perl
 

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,15 +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-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-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
@@ -76,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
@@ -99,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

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/RULES.Db

@@ -33,8 +33,9 @@ DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. -I.. $(INSTALL_DBFLAGS) $(RELEASE_DBF
 # 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)))
 
@@ -90,8 +91,8 @@ 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))
@@ -161,13 +162,13 @@ $(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS)
 
 ifdef CREATESUBSTITUTIONS
 $(COMMON_DIR)/%.substitutions:
-	@echo "Create substitutions"
+	$(ECHO) "Create substitutions"
 	@$(RM) $@
-	$(CREATESUBSTITUTIONS) $(COMMON_DIR)/$*
+	$(CREATESUBSTITUTIONS) $@
 endif
 
 $(INSTALL_DB)/%.substitutions: %.substitutions
-	@echo "Installing db file $@"
+	$(ECHO) "Installing db file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PRECIOUS: $(COMMON_DIR)/%.substitutions
@@ -181,7 +182,7 @@ $(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf
 	@$(RM) $@.VAR
 
 $(INSTALL_DB)/%.template: %.template
-	@echo "Installing db file $@"
+	$(ECHO) "Installing db file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PRECIOUS: $(COMMON_DIR)/%.template
@@ -189,20 +190,32 @@ $(INSTALL_DB)/%.template: %.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
 
@@ -215,15 +228,15 @@ $(COMMON_DIR)/bpt%.dbd: bpt%.data
 $(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd 
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
-	@echo "$<:../Makefile" >> $@$(DEP)
-	@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 $@ $<
 
@@ -232,16 +245,16 @@ $(COMMON_DIR)/%Include.dbd:
 	$(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $@
 
 $(INSTALL_DBD)/%: $(COMMON_DIR)/%
-	@echo "Installing created dbd file $@"
+	$(ECHO) "Installing created dbd file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_DBD)/%: %
-	@echo "Installing dbd file $@"
+	$(ECHO) "Installing dbd file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 define  DBD_INSTALLS_template
 $$(INSTALL_DBD)/$$(notdir $(1)) : $(1)
-	@echo "Installing $$@"
+	$(ECHO) "Installing $$@"
 	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DBD)
 endef
 $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
@@ -258,7 +271,7 @@ $(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 $@
@@ -266,8 +279,8 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf
 $(COMMON_DIR)/%.db$(RAW): %.substitutions
 	@$(RM) $@$(DEP)
 	$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $@$(DEP)
-	@echo "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
-	@echo "Inflating database from $< $(TEMPLATE_FILENAME)"
+	$(ECHO) "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
+	$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $@
 	$(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > msi.tmp
 	$(MV) msi.tmp $@
@@ -275,7 +288,7 @@ $(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 $@
@@ -283,7 +296,7 @@ $(COMMON_DIR)/%.db$(RAW): %.template
 $(COMMON_DIR)/%.acf: %.acs
 	@$(RM) $@$(DEP)
 	@$(ACFDEPENDS_CMD)
-	@echo "Creating acf file $@"
+	$(ECHO) "Creating acf file $@"
 	@$(RM) $@
 	$(ACF_CMD)
 
@@ -297,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 > $@
 
@@ -306,17 +319,17 @@ $(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
 else
 
 $(INSTALL_DB)/%: %
-	@echo "Installing db file $@"
+	$(ECHO) "Installing db file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 endif
 
 $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
-	@echo "Installing created db file $@"
+	$(ECHO) "Installing created db file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 define  DB_INSTALLS_template
 $$(INSTALL_DB)/$$(notdir $(1)) : $(1)
-	@echo "Installing $$@"
+	$(ECHO) "Installing $$@"
 	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DB)
 endef
 $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))

configure/RULES.ioc

@@ -10,18 +10,19 @@
 #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:
+clean$(DIVIDER)$(ARCH) clean:
 	$(RM) cdCommands envPaths dllPath.bat
 
 else 
-buildInstall:
-clean:
+buildInstall$(DIVIDER)$(ARCH) buildInstall:
+clean$(DIVIDER)$(ARCH) clean:
 endif
 
 cdCommands envPaths dllPath.bat: $(wildcard $(TOP)/configure/RELEASE*) \

configure/RULES_ARCHS

@@ -12,8 +12,6 @@
 
 all: install
 
-build install buildInstall: $(CHECK_RELEASE_$(CHECK_RELEASE))
-
 rebuild: clean install
 
 ACTIONS = inc
@@ -36,12 +34,16 @@ buildDirs = $(addprefix O.,$(BUILD_ARCHS))
 
 #*************************************************************************
 # Create epics_host_arch dependancies for GNU make -j option
-# Only works with GNU make 3.80 or later (uses eval function)
+# 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)
@@ -50,6 +52,7 @@ endef
 $(foreach action, $(ACTIONS), $(foreach arch,\
       $(CROSS_ARCHS),$(eval $(call DEP_template,$(action),$(arch)))))
 
+#endif
 #*************************************************************************
 
 $(actionArchTargets) : $(buildDirs) O.Common
@@ -66,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)
-	$(CONVERTRELEASE) checkRelease
-$(checkReleaseTargets):checkRelease.%:
-	$(CONVERTRELEASE) -a $* checkRelease
-
-warnReleaseTargets = $(addprefix warnRelease, $(suffix $(targetReleaseFiles)))
-warnRelease: $(warnReleaseTargets)
-	-$(CONVERTRELEASE) checkRelease
-$(warnReleaseTargets):warnRelease.%:
-	-$(CONVERTRELEASE) -a $* checkRelease
-
 #
 # special clean rule
 #
@@ -105,4 +88,3 @@ realclean ::
 .PHONY : $(cleanArchTargets)
 .PHONY : $(BUILD_ARCHS)
 .PHONY : $(ACTIONS) clean realclean archclean all
-.PHONY : checkRelease $(checkReleaseTargets)

configure/RULES_BUILD

@@ -127,8 +127,8 @@ buildInstall : \
 	$(INSTALL_BIN_INSTALLS)
 
 clean::
-	@echo "Cleaning"
-	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME)\
+	$(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)
@@ -150,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 !!!!
@@ -199,7 +207,7 @@ $(OBJLIBNAME):%$(OBJ):
 
 # WIN95/NT source browser
 %.bsc: %.sbr
-	@echo "building source browser archive $@"
+	$(ECHO) "building source browser archive $@"
 	@$(RM) $@
 	$(BAFCMD) $<
 
@@ -246,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) $^
 
@@ -256,24 +264,24 @@ 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) 
-
 $(SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
 
-ifneq ($(SHRLIB_SUFFIX),.dll)
 $(SHRLIBNAME):$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.shrlib)
+ifeq ($(SHRLIB_SUFFIX),.dll)
+	$(MT_DLL_COMMAND)
 endif
 
 $(LOADABLE_SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
@@ -322,14 +330,14 @@ runtests: $(TESTSCRIPTS_$(BUILD_CLASS))
 ## Install rules for BIN_INSTALLS and LIB_INSTALLS
 define  BIN_INSTALLS_template
 $$(INSTALL_BIN)/$$(notdir $(1)) : $(1)
-	@echo "Installing $$(<F)"
+	$(ECHO) "Installing $$(<F)"
 	@$$(INSTALL) -d -m $$(BIN_PERMISSIONS) $$^ $$(INSTALL_BIN)
 endef
 $(foreach file, $(BIN_INSTALLS), $(eval $(call BIN_INSTALLS_template, $(file))))
 
 define  LIB_INSTALLS_template
 $$(INSTALL_LIB)/$$(notdir $(1)) : $(1)
-	@echo "Installing $$(<F)"
+	$(ECHO) "Installing $$(<F)"
 	@$$(INSTALL) -d -m $$(LIB_PERMISSIONS) $$^ $$(INSTALL_LIB)
 endef
 $(foreach file, $(LIB_INSTALLS), $(eval $(call LIB_INSTALLS_template, $(file))))
@@ -337,30 +345,30 @@ $(foreach file, $(LIB_INSTALLS), $(eval $(call LIB_INSTALLS_template, $(file))))
 #---------------------------------------------------------------
 
 $(INSTALL_BIN)/%: ../os/$(OS_CLASS)/%
-	@echo "Installing os-specific script $@"
+	$(ECHO) "Installing os-specific script $@"
 	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)
 
 $(INSTALL_BIN)/%: %
-	@echo "Installing created file $@"
+	$(ECHO) "Installing created file $@"
 	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)
 
 $(INSTALL_BIN)/%: ../%
-	@echo "Installing script $@"
+	$(ECHO) "Installing script $@"
 	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)
 
 $(INSTALL_LIB)/%.a: %.a
-	@echo "Installing library $@"
+	$(ECHO) "Installing library $@"
 	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_LIB)
 ifneq ($(strip $(RANLIB)),)
 	$(RANLIB) $@
 endif # RANLIB
 
 $(INSTALL_LIB)/%.lib: %.lib
-	@echo "Installing library $@"
+	$(ECHO) "Installing library $@"
 	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_LIB)
 
 $(INSTALL_SHRLIB)/lib%: lib%
-	@echo "Installing shared library $@"
+	$(ECHO) "Installing shared library $@"
 	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_SHRLIB)
 ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst .$(SHRLIB_VERSION),,$@)
@@ -370,20 +378,20 @@ endif # SHRLIB_VERSION
 
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
 $(INSTALL_TCLLIB)/%: %
-	@echo "Installing Tcl library $@"
+	$(ECHO) "Installing Tcl library $@"
 	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)
 
 $(INSTALL_TCLLIB)/%: ../%
-	@echo "Installing Tcl library $@"
+	$(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),,$@)
@@ -391,65 +399,56 @@ ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
 endif # LOADABLE_SHRLIB_VERSION
 
 $(INSTALL_CONFIG)/%: %
-	@echo "Installing config file $@"
+	$(ECHO) "Installing config file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_CONFIG)/%: ../%
-	@echo "Installing config file $@"
+	$(ECHO) "Installing config file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_INCLUDE)/% : $(COMMON_DIR)/%
-	@echo "Installing generated generic include file $@"
+	$(ECHO) "Installing generated generic include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_INCLUDE)/% : %
-	@echo "Installing generic include file $@"
+	$(ECHO) "Installing generic include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_INCLUDE)/os/$(OS_CLASS)/% : %
-	@echo "Installing os dependent include file $@"
+	$(ECHO) "Installing os dependent include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_DOC)/%: %
-	@echo "Installing doc $@"
+	$(ECHO) "Installing doc $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)
 
 $(INSTALL_DOC)/%: ../%
-	@echo "Installing doc $@"
+	$(ECHO) "Installing doc $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)
 
 $(INSTALL_HTML)/$(HTMLS_DIR)/%: %
-	@echo "Installing html $@"
+	$(ECHO) "Installing html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_HTML)/$(HTMLS_DIR)/%: ../%
-	@echo "Installing html $@"
+	$(ECHO) "Installing html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_TEMPLATES_SUBDIR)/%: ../%
-	@echo "Installing $@"
+	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_TEMPLATES_SUBDIR)/%: %
-	@echo "Installing $@"
+	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-ifeq ($(SHRLIB_SUFFIX),.dll)
-ifeq ($(SHARED_LIBRARIES),YES)
-$(LIB_PREFIX)%$(LIB_SUFFIX) $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
-	@$(RM)  $(LIB_PREFIX)$*$(LIB_SUFFIX) $(SHRLIB_PREFIX)$*$(SHRLIB_SUFFIX)
-	$(LINK.shrlib)
-	$(MT_DLL_COMMAND)
-endif
-endif
-
 -include $(CONFIG)/RULES_EXPAND
 
 .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
 .PRECIOUS: $(COMMON_INC)
 
 .PHONY: all inc build install clean rebuild buildInstall
-.PHONY: runtests
+.PHONY: runtests checkRelease warnRelease
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

configure/RULES_DIRS

@@ -38,7 +38,7 @@ all : install
 rebuild : clean install
 
 # Create directory dependancies lines for GNU make -j option
-# Only works with GNU make 3.80 or later (uses eval function)
+# Only works with GNU make 3.81 or later (uses eval function)
 define DEP_template1
 $(1): $$($(1)_DEPEND_DIRS)
 endef

configure/RULES_EXPAND

@@ -13,11 +13,11 @@ EXPANDED = $(EXPAND:%@=%)
 buildInstall: $(EXPANDED)
 
 $(EXPANDED): %: ../%@
-	@echo "Expanding $< to $@"
+	$(ECHO) "Expanding $< to $@"
 	@$(RM) $@
 	@$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
 
 clean::
-	$(RM) $(EXPANDED)
+	@$(RM) $(EXPANDED)
 
 endif

configure/RULES_FILE_TYPE

@@ -49,16 +49,16 @@ endif
 
 define FILE_TYPE_template
 
-$(1) += $$(if $$(strip $$($(1)_$$(ARCH_CLASS))),$$(subst -nil-,,$$($(1)_$$(ARCH_CLASS))), $$($(1)_DEFAULT))
+$(1) += $$(if $$(strip $$($(1)_$$(OS_CLASS))),$$(subst -nil-,,$$($(1)_$$(OS_CLASS))), $$($(1)_DEFAULT))
 
 INSTALLS_$(1) = $$($(1):%=$$(INSTALL_$(1))/%)
 
 $$(INSTALL_$(1))/%: ../%
-	@echo "Installing $(1) file $$@"
+	$(ECHO) "Installing $(1) file $$@"
 	@$$(INSTALL) -d -m  $$(INSTALL_PERMISSIONS) $$< $$(dir $$@)
 
 $$(INSTALL_$(1))/%: %
-	@echo "Installing $(1) file $$@"
+	$(ECHO) "Installing $(1) file $$@"
 	@$$(INSTALL) -d -m  $$(INSTALL_PERMISSIONS) $$< $$(dir $$@)
 
 buildInstall : $$(INSTALLS_$(1))

configure/RULES_JAVA

@@ -114,40 +114,40 @@ $(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 ../,$(JAVA))
-	@echo Creating java class files 
+	$(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 $@"
+	$(ECHO) "Installing java jar file $@"
 	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_JAVA)/%.jar: %.jar
-	@echo "Installing java jar file $@"
+	$(ECHO) "Installing java jar file $@"
 	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(addprefix $(INSTALL_JAVA)/, $(JARINPUT)): $(INSTALL_JAVA)/%: ../%
-	@echo "Installing jar input file $@"
+	$(ECHO) "Installing jar input file $@"
 	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PHONY: all install buildInstall rebuild clean build inc

configure/RULES_TARGET

@@ -82,9 +82,9 @@ $(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS),\
 
 $$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
 $$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_DEPLIBS)
-$$(LIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
-$$(LIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DEPLIBS)
-$$(LIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DLL_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), \

configure/RULES_TOP

@@ -31,7 +31,7 @@ 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
@@ -52,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

@@ -24,6 +24,10 @@ 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
@@ -32,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
@@ -47,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)
@@ -60,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)
 
@@ -98,12 +102,6 @@ SHARED_LIBRARIES=NO
 CODE_CFLAGS =
 CODE_CXXFLAGS =
 
-#--------------------------------------------------
-# RTEMS uses the inline keyword so -pedantic causes too many problems.
-# Using -ansi turns off lots of useful prototypes (e.g. strtok_r).
-CONFORM_CFLAGS_STRICT =
-CONFORM_CXXFLAGS_STRICT =
-
 #--------------------------------------------------
 # Override the usual RTEMS verbosity from ar
 ARFLAGS = rc

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -16,7 +16,7 @@ ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
 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
 
 CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik

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 \

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

@@ -10,7 +10,7 @@ ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
 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
 
 CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik

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,7 +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

configure/os/CONFIG.Common.UnixCommon

@@ -32,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)
@@ -43,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).*, \
@@ -60,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

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 += -arch i386 -arch ppc
-OP_SYS_LDFLAGS += -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.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-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.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

@@ -47,13 +47,14 @@ 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
-OP_SYS_LDLIBS_9 += -lCrun -lc
-OP_SYS_LDLIBS_10 += -lCrun -lc
+OP_SYS_LDLIBS_9 += -lumem -lCrun -lc
+OP_SYS_LDLIBS_10 += -lumem -lCrun -lc
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
-OP_SYS_LDLIBS += $(STLPORT_LDLIBS_$(USE_STLPORT))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
 READLINE_DIR = $(GNU_DIR)

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-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.cygwin-x86.Common

@@ -16,5 +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

@@ -23,15 +23,6 @@ SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
 LOADABLE_SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
 
-CONFORM_CFLAGS_ANSI =
-CONFORM_CFLAGS_STRICT = -ansi
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT = -ansi
-
-# -ansi build errors need fixing: u_long  undeclared, fd_set with no type
-CONFORM_CFLAGS_STRICT = 
-CONFORM_CXXFLAGS_STRICT = 
-
 # Override linking with gcc library from CONFIG.gnuCommon
 GNU_LDLIBS_YES =
 

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

@@ -10,4 +10,6 @@
 include $(CONFIG)/os/CONFIG.Common.cygwin-x86
 include $(CONFIG)/os/CONFIG.cygwin-x86.cygwin-x86
 
-CROSS_OPT = NO
+BUILD_CLASS = HOST
+
+HOST_OPT = NO

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

@@ -7,11 +7,8 @@
 # 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
+-include $(CONFIG)/os/CONFIG.Common.darwin-ppc
+-include $(CONFIG)/os/CONFIG.darwin-ppc.darwin-ppc
 
-# This will cause build failure when used with make -j option
-#BUILD_CLASS = HOST
-#HOST_OPT = NO
-
-CROSS_OPT=NO
+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

@@ -7,11 +7,8 @@
 # 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
+-include $(CONFIG)/os/CONFIG.Common.darwin-x86
+-include $(CONFIG)/os/CONFIG.darwin-x86.darwin-x86
 
-# This will cause build failure when used with make -j option
-#BUILD_CLASS = HOST
-#HOST_OPT = NO
-
-CROSS_OPT=NO
+BUILD_CLASS=HOST
+HOST_OPT = NO

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -1,10 +1,10 @@
-# 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
@@ -18,6 +18,18 @@ include $(CONFIG)/CONFIG.gnuCommon
 #
 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)
@@ -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.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,26 +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
-

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

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

@@ -1,55 +0,0 @@
-# CONFIG.hpux-parisc.hpux-parisc
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for host hpux-parisc - target hpux-parisc builds
-# Sites may override these definitions in CONFIG_SITE.hpux-parisc.hpux-parisc
-#-------------------------------------------------------
-
-CC = cc
-CCC = aCC
-CPP = $(CC) -E
-RANLIB =
-AR = ar -rc
-LD = ld -r
-
-# Configure OS vendor C compiler
-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
-WARN_CFLAGS_YES =
-WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -O
-OPT_CFLAGS_NO = -g
-
-CXXCMPLR=STRICT
-
-# Selective filter for getting rid of bogus compiler warnings
-COMPILE_FILTER.cpp = 2>&1 | $(EPICS_BASE)/configure/tools/filterWarnings.pl
-
-# Configure OS vendor C++ compiler
-CONFORM_CXXFLAGS_NORMAL = -AA -Aa -mt
-CONFORM_CXXFLAGS_STRICT = -AA -Aa -mt
-#CONFORM_CXXFLAGS_STRICT += +p
-
-# Portability across different PA-RISC architecture versions
-CODE_CXXFLAGS = +DAportable +z
-WARN_CXXFLAGS_YES = +w
-WARN_CXXFLAGS_NO =
-OPT_CXXFLAGS_YES = +O3
-OPT_CXXFLAGS_NO = -g
-
-STATIC_LDFLAGS_YES= -Wl,-a,archive
-STATIC_LDFLAGS_NO =
-
-STATIC_LDLIBS_YES = -Wl,-a,default
-STATIC_LDLIBS_NO =
-
-TARGET_LDFLAGS += -AA -mt
-
-SHRLIB_LDFLAGS = -b
-LOADABLE_SHRLIB_LDFLAGS = $(SHRLIB_LDFLAGS)

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

@@ -34,22 +34,6 @@ CC = $(BORLAND_BIN)/bc++ $(CCLINKOPT)
 LD = $(BORLAND_BIN)/bc++ -r
 RANLIB = 
 
-#
-# __STDC__=0 works but not as cleanly as with
-# Microsoft Visual C++.
-# The Borland header files use ifdef __STDC__
-# to disable many nice things. This is overridden
-# by defining NO_BORLAND_STDC in the Makefile.
-#
-ifdef NO_BORLAND_STDC
-CONFORM_CFLAGS_ANSI =
-CONFORM_CFLAGS_STRICT =
-else
-CONFORM_CFLAGS_ANSI = -D__STDC__=0
-CONFORM_CFLAGS_STRICT = -D__STDC__=0
-endif
-CONFORM_CFLAGS_TRAD =
-
 # -w display warnings on
 # -g0 no limit to warning messages
 # some warning message here are always disabled because they are
@@ -77,17 +61,7 @@ CPP = $(BORLAND_BIN)/bcpp
 
 # Configure OS vendor C++ compiler
 #
-# __STDC__=0 works but not as cleanly as with
-# Microsoft Visual C++.
-# The Borland header files use ifdef __STDC__
-# to disable many nice things. This is overridden
-# by defining NO_BORLAND_STDC in the Makefile.
-#
 CCC = $(BORLAND_BIN)/bc++ $(CCLINKOPT)
-ifndef NO_BORLAND_STDC
-CONFORM_CXXFLAGS_NORMAL = -D__STDC__=0
-CONFORM_CXXFLAGS_STRICT = -D__STDC__=0
-endif
 
 # -w display warnings on
 # -g0 no limit to warning messages
@@ -137,10 +111,6 @@ OPT_LDFLAGS =
 
 ARCH_DEP_CFLAGS=
 
-#	to identify the general architecture class:
-#	should be BSD, SYSV, WIN32, ...
-#	is: WIN32, sun4, hpux, linux, ...
-#
 OS_CLASS=Linux
 
 

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

@@ -14,3 +14,5 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 STATIC_LDLIBS_NO=
 
+SHRLIB_LDFLAGS += -Wl,-h$@
+LOADABLE_SHRLIB_LDFLAGS += -Wl,-h$@

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

@@ -9,9 +9,6 @@
 
 include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 
-# This will cause build failure when used with make -j option
-# See base/src/bpt MAKEBPT
-#BUILD_CLASS = HOST
-#HOST_OPT = NO
+BUILD_CLASS=HOST
+HOST_OPT=NO
 
-CROSS_OPT=NO

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

@@ -7,10 +7,5 @@
 #-------------------------------------------------------
 
 # Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon
-
-STATIC_LDFLAGS_YES= -Wl,-Bstatic
-STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Wl,-Bdynamic
-STATIC_LDLIBS_NO=
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 

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

@@ -7,6 +7,8 @@
 # Sites may override these definitions in CONFIG_SITE.linux-x86_64.linux-x86_64-debug
 #-------------------------------------------------------
 
-include $(CONFIG)/os/CONFIG.linux-x86_64.linux-x86_64
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 
-CROSS_OPT = NO
+BUILD_CLASS=HOST
+
+HOST_OPT = NO

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

@@ -15,9 +15,6 @@ AR = ar -r
 LD = -r
 
 # Configure OS vendor C compiler
-CONFORM_CFLAGS_ANSI = 
-CONFORM_CFLAGS_STRICT = 
-CONFORM_CFLAGS_TRAD = 
 CODE_CFLAGS = 
 WARN_CFLAGS_YES =
 WARN_CFLAGS_NO = -w
@@ -25,8 +22,6 @@ OPT_CFLAGS_YES = -O
 OPT_CFLAGS_NO = -g
 
 # Configure OS vendor C++ compiler
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT =
 PROF_CXXFLAGS_YES = +p
 PROF_CXXFLAGS_NO =
 CODE_CXXFLAGS =

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

@@ -15,9 +15,6 @@ AR = ar -r
 LD = -r
 
 # Configure OS vendor C compiler
-CONFORM_CFLAGS_ANSI = -std
-CONFORM_CFLAGS_STRICT = -std1
-CONFORM_CFLAGS_TRAD = -std0
 CODE_CFLAGS = 
 WARN_CFLAGS_YES =
 WARN_CFLAGS_NO = -w
@@ -25,8 +22,6 @@ OPT_CFLAGS_YES = -O
 OPT_CFLAGS_NO = -g
 
 # Configure OS vendor C++ compiler
-CONFORM_CXXFLAGS_NORMAL = 
-CONFORM_CXXFLAGS_STRICT = -std gnu
 PROF_CXXFLAGS_YES = +p
 PROF_CXXFLAGS_NO =
 CODE_CXXFLAGS =

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

@@ -21,3 +21,6 @@ STATIC_LDLIBS_NO=
 
 OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
 
+SHRLIB_LDFLAGS += -Wl,-z,defs -Wl,-z,text -Wl,-h,$@
+LOADABLE_SHRLIB_LDFLAGS += -Wl,-z,text -Wl,-h,$@
+GNU_LDLIBS_YES += -lc

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

@@ -9,10 +9,6 @@
 
 include $(CONFIG)/os/CONFIG.solaris-sparc.solaris-sparc
 
-#BUILD_CLASS = HOST
-#HOST_OPT = NO
+BUILD_CLASS=HOST
+HOST_OPT=NO
 
-GNU = NO
-
-# Removes -O optimization and adds -g compile option
-CROSS_OPT=NO

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

@@ -10,10 +10,7 @@
 include $(CONFIG)/os/CONFIG.Common.solaris-sparc64
 include $(CONFIG)/os/CONFIG.solaris-sparc64.solaris-sparc64
 
-#BUILD_CLASS = HOST
-#HOST_OPT = NO
-
-GNU = NO
+BUILD_CLASS=HOST
 
 # Removes -O optimization and adds -g compile option
-CROSS_OPT=NO
+HOST_OPT=NO

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

@@ -7,13 +7,10 @@
 # Sites may override these definitions in CONFIG_SITE.solaris-x86.solaris-x86-debug
 #-------------------------------------------------------
 
-include $(CONFIG)/os/Common.solaris-x86
+include $(CONFIG)/os/CONFIG.Common.solaris-x86
 include $(CONFIG)/os/CONFIG.solaris-x86.solaris-x86
 
-#BUILD_CLASS = HOST
-#HOST_OPT = NO
-
-GNU = NO
+BUILD_CLASS=HOST
 
 # Removes -O optimization and adds -g compile option
-CROSS_OPT=NO
+HOST_OPT=NO

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

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

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

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

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

@@ -10,10 +10,7 @@
 include $(CONFIG)/os/CONFIG.Common.solaris-x86_64
 include $(CONFIG)/os/CONFIG.solaris-x86_64.solaris-x86_64
 
-#BUILD_CLASS = HOST
-#HOST_OPT = NO
-
-GNU = NO
+BUILD_CLASS=HOST
 
 # Removes -O optimization and adds -g compile option
-CROSS_OPT=NO
+HOST_OPT=NO

configure/os/CONFIG.solarisCommon.solarisCommon

@@ -8,6 +8,7 @@
 #-------------------------------------------------------
 
 SPARCWORKS = /opt/SUNWspro
+GNU = NO
 
 CC = $(SPARCWORKS)/bin/cc
 CCC = $(SPARCWORKS)/bin/CC
@@ -23,9 +24,6 @@ PROFILE=NO
 GPROF=NO
 
 # Configure OS vendor C compiler
-CONFORM_CFLAGS_ANSI = -Xa -v
-CONFORM_CFLAGS_STRICT = -Xa -v
-CONFORM_CFLAGS_TRAD = -Xs
 PROF_CFLAGS_YES = -p
 GPROF_CFLAGS_YES = -xpg
 CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
@@ -35,8 +33,6 @@ 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))
@@ -62,4 +58,7 @@ OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
 #COMPILE_FILTER.c = 2>&1 | $(EPICS_BASE)/configure/tools/filterWarnings.pl
 #COMPILE_FILTER.cpp = $(COMPILE_FILTER.c)
 
+#--------------------------------------------------
+# Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.solarisCommon.solarisCommon
+-include $(CONFIG)/os/CONFIG_SITE.(EPICS_HOST_ARCH).solarisCommon

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

@@ -12,7 +12,6 @@ MV = $(PERL) -MExtUtils::Command -e mv
 RM = $(PERL) -MExtUtils::Command -e rm_f
 MKDIR = $(PERL) -MExtUtils::Command -e mkpath
 RMDIR = $(PERL) -MExtUtils::Command -e rm_rf
-ECHO = echo
 
 WIND_HOST_TYPE = x86-win32
 OSITHREAD_USE_DEFAULT_STACK = NO
@@ -26,5 +25,5 @@ HOME = $(HOMEDRIVE)$(HOMEPATH)
 endif
 
 # 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.win32-x86-borland.win32-x86-borland

@@ -43,22 +43,6 @@ CC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT)
 LD = $(BORLAND_BIN)/bcc32 -r
 RANLIB =
 
-#
-# __STDC__=0 works but not as cleanly as with
-# Microsoft Visual C++.
-# The Borland header files use ifdef __STDC__
-# to disable many nice things. This is overridden
-# by defining NO_BORLAND_STDC in the Makefile.
-#
-ifdef NO_BORLAND_STDC
-CONFORM_CFLAGS_ANSI =
-CONFORM_CFLAGS_STRICT =
-else
-CONFORM_CFLAGS_ANSI = -D__STDC__=0
-CONFORM_CFLAGS_STRICT = -D__STDC__=0
-endif
-CONFORM_CFLAGS_TRAD =
-
 # -w display warnings on
 # -g0 no limit to warning messages
 # some warning message here are always disabled because they are
@@ -87,18 +71,7 @@ CPP = $(BORLAND_BIN)/cpp32  -Sr
 PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(subst /,\\,$(INCLUDES)) -o$@ $<
 
 # Configure OS vendor C++ compiler
-#
-# __STDC__=0 works but not as cleanly as with
-# Microsoft Visual C++.
-# The Borland header files use ifdef __STDC__
-# to disable many nice things. This is overridden
-# by defining NO_BORLAND_STDC in the Makefile.
-#
 CCC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT)
-ifndef NO_BORLAND_STDC
-CONFORM_CXXFLAGS_NORMAL = -D__STDC__=0
-CONFORM_CXXFLAGS_STRICT = -D__STDC__=0
-endif
 
 # -w display warnings on
 # -g0 no limit to warning messages
@@ -155,10 +128,6 @@ OPT_LDFLAGS =
 SHRLIB_CFLAGS=
 ARCH_DEP_CFLAGS=
 
-#	to identify the general architecture class:
-#	should be BSD, SYSV, WIN32, ...
-#	is: WIN32, sun4, hpux, linux, ...
-#
 OS_CLASS=WIN32
 POSIX=NO
 

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

@@ -18,5 +18,5 @@ WIND_HOST_TYPE = x86-win32
 OSITHREAD_USE_DEFAULT_STACK = NO
 
 # 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.win32-x86-cygwin.win32-x86-cygwin

@@ -23,15 +23,6 @@ SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
 LOADABLE_SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
 
-CONFORM_CFLAGS_ANSI =
-CONFORM_CFLAGS_STRICT = -ansi
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT = -ansi
-
-# -ansi build errors need fixing: u_long  undeclared, fd_set with no type
-CONFORM_CFLAGS_STRICT = 
-CONFORM_CXXFLAGS_STRICT = 
-
 # Override linking with gcc library from CONFIG.gnuCommon
 GNU_LDLIBS_YES =
 

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

@@ -10,4 +10,5 @@
 include $(CONFIG)/os/CONFIG.Common.win32-x86-cygwin
 include $(CONFIG)/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin
 
-CROSS_OPT=NO
+BUILD_CLASS=HOST
+HOST_OPT=NO

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

@@ -1,10 +1,10 @@
-# CONFIG.solaris-x86-debug.solaris-x86-debug
+# CONFIG.win32-x86-debug.win32-x86-debug
 #
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for solaris-x86 debug compiler host - solaris-x86 debug compiler target builds
-# Sites may override these definitions in CONFIG_SITE.solaris-x86-debug.solaris-x86-debug
+# Definitions for win32-x86 debug compiler host - win32-x86 debug compiler target builds
+# Sites may override these definitions in CONFIG_SITE.win32-x86-debug.win32-x86-debug
 #-------------------------------------------------------
 
 include $(CONFIG)/os/CONFIG.win32-x86.win32-x86

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

@@ -15,7 +15,6 @@ MV = $(PERL) -MExtUtils::Command -e mv
 RM = $(PERL) -MExtUtils::Command -e rm_f
 MKDIR = $(PERL) -MExtUtils::Command -e mkpath
 RMDIR = $(PERL) -MExtUtils::Command -e rm_rf
-ECHO = echo
 
 WIND_HOST_TYPE = x86-win32
 OSITHREAD_USE_DEFAULT_STACK = NO
@@ -23,5 +22,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.win32-x86-mingw.win32-x86-mingw

@@ -23,12 +23,6 @@ SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
 LOADABLE_SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
 
-# Dont use -ansi option:  eliminates _fdopen, _tempnam, ...
-CONFORM_CFLAGS_ANSI =
-CONFORM_CFLAGS_STRICT = 
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT = 
-
 # Override linking with gcc library from CONFIG.gnuCommon
 GNU_LDLIBS_YES =
 
@@ -36,4 +30,3 @@ OPT_CFLAGS_NO = -O3 -g
 OPT_CXXFLAGS_NO = -O3 -g
 
 OP_SYS_LDLIBS = -lws2_32 
-PROD_SYS_LIBS = ws2_32 

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

@@ -10,4 +10,6 @@
 include $(CONFIG)/os/CONFIG.Common.win32-x86-mingw
 include $(CONFIG)/os/CONFIG.win32-x86-mingw.win32-x86-mingw
 
-CROSS_OPT=NO
+BUILD_CLASS = HOST
+
+HOST_OPT=NO

configure/os/CONFIG.win32-x86.Common

@@ -12,7 +12,6 @@ MV = $(PERL) -MExtUtils::Command -e mv
 RM = $(PERL) -MExtUtils::Command -e rm_f
 MKDIR = $(PERL) -MExtUtils::Command -e mkpath
 RMDIR = $(PERL) -MExtUtils::Command -e rm_rf
-ECHO = echo
 
 WIND_HOST_TYPE = x86-win32
 OSITHREAD_USE_DEFAULT_STACK = NO
@@ -26,5 +25,5 @@ HOME = $(HOMEDRIVE)$(HOMEPATH)
 endif
 
 # 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.win32-x86.win32-x86

@@ -31,17 +31,7 @@ BAFCMD = bscmake /nologo /o $@
 # Configure OS vendor C compiler
 CC = cl
 
-#
-# __STDC__=0 is a real great idea of Jeff that gives us both:
-# 1) define STDC for build code (pretend ANSI conformance)
-# 2) set it to 0 to use MS C "extensions" (open for _open etc.)
-# because MS uses:   if __STDC__ ... disable many nice things
-#
-# Use of /Za would dissable DLL import/export keywords which
-# include/excludes using architecture neutral macros
-CONFORM_CFLAGS_ANSI = /nologo /D__STDC__=0
-CONFORM_CFLAGS_STRICT = /nologo /D__STDC__=0
-CONFORM_CFLAGS_TRAD = /nologo
+GNU = NO
 
 #
 # /W<N> use warning level N
@@ -107,8 +97,7 @@ CPP = cl /C /E
 # /GR - generate code for run time type identification
 #
 CCC = cl /nologo /EHsc /GR
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT = /D__STDC__=0
+CODE_CPPFLAGS += /nologo /D__STDC__=0
 CODE_CPPFLAGS += /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 
 #
@@ -164,10 +153,6 @@ OPT_LDFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT))
 ARCH_DEP_CFLAGS=
 SHRLIB_CFLAGS=
 
-#	to identify the general architecture class:
-#	should be BSD, SYSV, WIN32, ...
-#	is: WIN32, sun4, hpux, linux, ...
-#
 OS_CLASS=WIN32
 POSIX=NO
 
@@ -260,7 +245,7 @@ PROD_LDLIBS += $(addsuffix .lib, \
 
 LDLIBS_STATIC_YES = LDLIBS
 LDLIBS_SHARED_NO = LDLIBS
-PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \
+PROD_LDLIBS += $(STATIC_LDLIBS) $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \
                $(LDLIBS_SHARED_$(SHARED_LIBRARIES))))
 
 #--------------------------------------------------

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

@@ -7,9 +7,10 @@
 # Sites may override these definitions in CONFIG_SITE.win32-x86.win32-x86-debug
 #-------------------------------------------------------
 
-include $(CONFIG)/os/CONFIG.Common.win32-x86
-include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+include $(CONFIG)/os/CONFIG.win32-x86-debug.win32-x86-debug
 
 GNU = NO
 
-CROSS_OPT = NO
+BUILD_CLASS = HOST
+
+HOST_OPT = NO

configure/os/CONFIG.windows-x64.Common

@@ -0,0 +1,13 @@
+# CONFIG.win-x86_64.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for win-x86_64 host archs
+# Sites may override these definitions in CONFIG_SITE.win-x86_64.Common
+#-------------------------------------------------------
+
+-include $(CONFIG)/os/CONFIG.win32-x86.Common
+
+WIND_HOST_TYPE = x86_64-win
+

configure/os/CONFIG.windows-x64.windows-x64

@@ -0,0 +1,20 @@
+# CONFIG.win-x86_64.win-x86_64
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for win-x86_64 target archs when host arch is win-x86_64
+# Sites may override these definitions in CONFIG_SITE.win-x86_64.win-x86_64
+#-------------------------------------------------------
+
+-include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+#-------------------------------------------------------
+
+
+STATIC_LDLIBS_YES=ws2_64.lib advapi64.lib user64.lib kernel64.lib winmm.lib
+
+WIN_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
+
+LINK.shrlib = $(WINLINK) /nologo $(WIN_DLLFLAGS) /implib:$*.lib /out:$*.dll $(DLL_DEF_FLAG)
+

configure/os/CONFIG_COMPAT

@@ -10,11 +10,9 @@
 # ARCH_<host_arch> = <epics_host_arch>
 ARCH_solaris = solaris-sparc
 ARCH_solarisGnu = solaris-sparc-gnu
-ARCH_sun4 = sun4-sparc
 ARCH_Linux = linux-x86
 ARCH_Darwin = darwin-ppc
 ARCH_WIN32 = win32-x86
-ARCH_hp700 = hpux-parisc
 ARCH_alpha = osf-alpha
 ARCH_cygwin32 = cygwin-x86
 ARCH_Borland = win32-x86-borland

configure/os/CONFIG_SITE.Common.RTEMS

@@ -5,8 +5,12 @@
 
 # Where to find RTEMS
 #
-RTEMS_BASE=/usr/local/rtems/rtems-4.9
-RTEMS_VERSION=4.9
+RTEMS_BASE=/usr/local/rtems/rtems-4.9.2
+RTEMS_VERSION=4.9.2
+
+# Cross-compile toolchain in $(RTEMS_TOOLS)/bin
+#
+RTEMS_TOOLS=$(RTEMS_BASE)
 
 
 # If you're using neither BOOTP/DHCP nor FLASH to pick up your IOC

configure/os/CONFIG_SITE.Common.darwin-ppc

@@ -0,0 +1,14 @@
+# CONFIG_SITE.Common.darwin-ppc
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for darwin-ppc target builds
+#-------------------------------------------------------
+
+# Select which CPU architectures to include in your universal binaries:
+#   ppc
+#   ppc64   - Not tested
+
+ARCH_CLASS = ppc
+#ARCH_CLASS = ppc ppc64

configure/os/CONFIG_SITE.Common.darwin-ppcx86

@@ -0,0 +1,18 @@
+# CONFIG_SITE.Common.darwin-ppcx86
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for darwin-ppcx86 target builds
+#----------------------------------------------------------
+
+# Select which CPU architectures to include in your universal binaries:
+#   ppc
+#   i386
+#   ppc64   - Not tested
+#   x86_64  - Needs MacOS 10.5 or 10.4 with Universal SDK
+
+ARCH_CLASS = ppc i386
+#ARCH_CLASS = ppc i386 x86_64
+#ARCH_CLASS = ppc ppc64 i386
+#ARCH_CLASS = ppc ppc64 i386 x86_64

configure/os/CONFIG_SITE.Common.darwin-x86

@@ -0,0 +1,14 @@
+# CONFIG_SITE.Common.darwin-x86
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for darwin-x86 target builds
+#-------------------------------------------------------
+
+# Select which CPU architectures to include in your universal binaries:
+#   i386
+#   x86_64  - Needs MacOS 10.5 or 10.4 with Universal SDK
+
+ARCH_CLASS = i386
+#ARCH_CLASS = i386 x86_64

configure/os/CONFIG_SITE.Common.hpux-parisc

@@ -1,19 +0,0 @@
-# CONFIG_SITE.Common.hpux-parisc
-#
-# $Id$
-#
-# Site Specific definitions for hpux-parisc target
-# Only the local epics system manager should modify this file
-
-# NOTE: If SHARED_LIBRARIES=YES (now the default) then
-# a) Environment variable SHLIB_PATH must include the full absolute pathname
-#    to $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) (or wherever you install
-#    the EPICS shared libraries on your system) when invoking base
-#    executables, or
-# b) Add the path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS 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_DEPLIB_DIRS += /opt/epics/R$(EPICS_SHORT_VERSION)/base/$(EPICS_VERSION)-$(EPICS_REVISION)-$(EPICS_MODIFICATION)-$(EPICS_PATCH_LEVEL)$(EPICS_CVS_SNAPSHOT)$(EPICS_SITE_VSTRING)/lib/$(EPICS_HOST_ARCH)
-PROD_DEPLIB_DIRS += /opt/epics/R$(EPICS_SHORT_VERSION)/base/$(EPICS_VERSION)-$(EPICS_REVISION)-$(EPICS_MODIFICATION)-$(EPICS_PATCH_LEVEL)$(EPICS_CVS_SNAPSHOT)$(EPICS_SITE_VSTRING)/lib/$(EPICS_HOST_ARCH)

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

@@ -1,13 +0,0 @@
-# CONFIG_SITE.Common.hpux-parisc-gnu
-#
-# $Id$
-#
-# Site Specific definitions for hpux-parisc-gnu target
-# Only the local epics system manager should modify this file
-
-# Include definitions for hpux-parisc, as gnu builds will use the HP linker
-include $(CONFIG)/os/CONFIG_SITE.Common.hpux-parisc
-
-# If you have built the GNU suite yourself, set the install location here,
-# else the default (/usr/local) will be used
-#GNU_DIR = /opt/gcc

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

@@ -0,0 +1,12 @@
+# CONFIG_SITE.Common.solaris-x86-gnu
+#
+# $Id$
+#
+# Site Specific definitions for solaris-x86-gnu target
+# Only the local epics system manager should modify this file
+
+# solaris 10 default location
+#GNU_DIR=/usr/sfw
+
+# APS site override
+GNU_DIR = /usr/local

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

@@ -0,0 +1,11 @@
+# CONFIG_SITE.Common.solaris-x86_64-gnu
+#
+# $Id$
+#
+# Site Specific definitions for solaris-x86_64-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-x86-gnu
+
+COMMANDLINE_LIBRARY = EPICS

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

@@ -5,8 +5,3 @@
 # 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.darwin-ppc.Common

@@ -5,5 +5,3 @@
 #
 # Site override definitions for darwin-ppc host builds
 #-------------------------------------------------------
-
-CROSS_COMPILER_TARGET_ARCHS = # RTEMS-uC5282 RTEMS-mvme5500  RTEMS-mvme2100

configure/os/CONFIG_SITE.darwin-ppcx86.Common

@@ -5,8 +5,3 @@
 #
 # Site override definitions for darwin-ppcx86 host builds
 #-------------------------------------------------------
-
-#
-# Need this to get OS X readline rather than Fink (PPC-only) readline
-#
-OP_SYS_LDFLAGS +=  -L/usr/lib

configure/os/CONFIG_SITE.darwin-x86.Common

@@ -1,9 +1,7 @@
-# CONFIG_SITE.darwin-ppc.Common
+# CONFIG_SITE.darwin-x86.Common
 #
 # $Id$
 # This file is maintained by the build community.
 #
-# Site override definitions for darwin-ppc host builds
+# Site override definitions for darwin-x86 host builds
 #-------------------------------------------------------
-
-CROSS_COMPILER_TARGET_ARCHS = # RTEMS-uC5282 # RTEMS-mvme5500  RTEMS-mvme2100

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

@@ -6,16 +6,3 @@
 # 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_YES = /opt/tornado20/
-#VX_CONFIG_DIR_YES = $(VX_DIR)/target/config
-#VX_INCLUDE_YES = /usr/local/crossgcc/m68k/m68k-wrs-vxworks/sys-include
-#VX_GNU_YES = /usr/local/crossgcc/m68k/
-#VX_GNU_BIN_YES = $(VX_GNU)/bin
-#VX_GNU_LIB_YES = /usr/local/crossgcc/m68k/lib/gcc-lib/m68k-wrs-vxworks/2.95.2
-

configure/os/CONFIG_SITE.linux-x86.vxWorksCommon

@@ -6,9 +6,4 @@
 # Definitions for linux-x86 host - vxWorks target builds
 #-------------------------------------------------------
  
-# Example override lines for user built cross-compiler
-#GNU_DIR=/home/phoebus/JBA/gnu
-#GNU_TARGET_INCLUDE_DIR=$(GNU_DIR)/$(GNU_TARGET)/include
-#CMPLR_SUFFIX=
-#CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
 

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

@@ -6,16 +6,3 @@
 # 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.win32-x86-mingw.Common

@@ -9,8 +9,3 @@
 # 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)
-

documentation/ConvertingR3.13AppsToR3.14.html

@@ -13,13 +13,10 @@
 <h2>Converting an EPICS R3.13 application to R3.14</h2>
 </center>
 
-<p><br>
-This document describes how to convert a R3.13 vxWorks application so that it
+<p>This document describes how to convert a R3.13 vxWorks application so that it
 builds with release R3.14. It describes procedures such that:</p>
 <ul>
   <li>The application uses the configure rules which are new to R3.14.</li>
-</ul>
-<ul>
   <li>The OSI (Operating System Independent) features of R3.14 are available,
     i.e. iocCore products can be build for vxWorks as well as other
     platforms, e.g. solaris and linux.</li>
@@ -27,109 +24,135 @@ builds with release R3.14. It describes procedures such that:</p>
 
 <h3>Gnumake clean uninstall</h3>
 
-<p>First do a gnumake clean uninstall in the application's root directory to
-remove all files created by earlier builds.</p>
+<p>First do a <tt>gnumake clean uninstall</tt> in the application's root
+directory to remove all files created by earlier builds.</p>
 
 <h3>Create a new R3.14 application</h3>
+
 <p>We will remove junkApp later.</p>
-<pre>mkdir &lt;top&gt;
-cd &lt;top&gt;
-&lt;full path to 3.14 base&gt;/bin/&lt;host_arch&gt;/makeBaseApp.pl -t example junk
-</pre>
 
-<h3>Copy all *App and iocBoot directories and files to the new &lt;top&gt;
+<blockquote>
+  <pre>mkdir <i>top</i>
+cd <i>top</i>
+<i>/path/to/base-3.14</i>/bin/<i>host_arch</i>/makeBaseApp.pl -t example junk</pre>
+  </blockquote>
+
+<h3>Copy all *App and iocBoot directories and files to the new <i>top</i>
 directory</h3>
-<pre>cd &lt;oldtop&gt; 
-find *App iocBoot -print | cpio -pvmd &lt;fullpath name to new top&gt;</pre>
 
-<h3>Modify &lt;top&gt;/configure/RELEASE</h3>
+<blockquote>
+  <pre>cd <i>oldtop</i> 
+find *App iocBoot -print | cpio -pvmd <i>/path/to/new/top</i></pre>
+  </blockquote>
+
+<h3>Modify <i>top</i>/configure/RELEASE</h3>
 
 <p>Copy definitions of external modules excluding EPICS_BASE and
 TEMPLATES_TOP from old application RELEASE file. <br>
 If sequence programs (*.st or *.stt files) exist in your application, add the
-SNCSEQ location definition for the R3.14 seq external module</p>
+SNCSEQ location definition for the R3.14 sncseq external module</p>
 
-<p><tt>SNCSEQ =&lt;full path to seq module top&gt;</tt></p>
-The R3.14 seq module must exist and be built with the same EPICS base R3.14 release.
+<blockquote>
+  <pre>SNCSEQ = <i>/path/to/sncseq</i></pre>
+  </blockquote>
 
-<h3>Modify the Makefiles in &lt;top&gt;/*App directories.</h3>
+<p>The R3.14 sncseq module must exist and be built with the same EPICS base
+R3.14 release.</p>
 
-<p>Change <tt>"include $(TOP)/config/CONFIG_APP"</tt> to <tt>"include
-$(TOP)/configure/CONFIG"</tt></p>
+<h3>Modify the Makefiles in <i>top</i>/*App directories.</h3>
 
-<p>Change " i<tt>nclude $(TOP)/config/RULES_DIRS</tt>" to  "<tt>include
-$(TOP)/configure/RULES_DIRS"</tt></p>
+<p>Change <q><tt>include $(TOP)/config/CONFIG_APP</tt></q> to <q><tt>include
+$(TOP)/configure/CONFIG</tt></q></p>
 
-<h3>Modify the Makefiles in &lt;top&gt;/*App/*Db directories.</h3>
+<p>Change <q><tt>include $(TOP)/config/RULES_DIRS</tt></q> to <q><tt>include
+$(TOP)/configure/RULES_DIRS</tt></q></p>
 
-<p>Remove existing Makefile <br>
-Rename Makefile.Host to Makefile <br>
-Modify Makefile as follows:</p>
+<h3>Modify the Makefiles in <i>top</i>/*App/*Db directories.</h3>
 
-<p>Change "<tt>TOP=../../.."</tt> to "<tt>TOP=../.."</tt></p>
+<p>Remove existing <q><tt>Makefile</tt></q>.</p>
 
-<p>Change    "i<tt>nclude $(TOP)/config/CONFIG_APP</tt>" to "<tt>include
-$(TOP)/configure/CONFIG"</tt></p>
+<p>Rename <q><tt>Makefile.Host</tt></q> to <q><tt>Makefile</tt></q></p>
 
-<p>Change "<tt>include $(TOP)/config/RULES.Db" </tt>to <tt>"include
-$(TOP)/configure/RULES"</tt></p>
+<p>Modify the <tt>Makefile</tt> as follows:</p>
+
+<p>Change <q><tt>TOP=../../..</tt></q> to <q><tt>TOP=../..</tt></q></p>
+
+<p>Change <q><tt>include $(TOP)/config/CONFIG_APP</tt></q> to <q><tt>include
+$(TOP)/configure/CONFIG</tt></q></p>
+
+<p>Change <q><tt>include $(TOP)/config/RULES.Db</tt></q>to <q><tt>include
+$(TOP)/configure/RULES</tt></q></p>
 
 <p>Place all definitions between the include lines.</p>
 
 <p>Place any rules after the last include line.</p>
 
-<h3>Modify the Makefiles in &lt;top&gt;/*App/src directories.</h3>
+<h3>Modify the Makefiles in <i>top</i>/*App/src directories.</h3>
 
 <p>This is the hardest step. The definitions in Makefile.Host and Makefile.Vx
 must be manually converted to the new configure definitions.</p>
 
 <p>First replace Makefile with the Makefile from junkApp/src.</p>
-<pre>rm Makefile
+
+<blockquote>
+  <pre>rm Makefile
 cp ../../junkApp/src/Makefile .</pre>
+  </blockquote>
 
-<p>We can remove the junkApp now.</p>
-<pre>/bin/rm -fr ../../junkApp</pre>
+<p>We can remove the junkApp now (unless you have other App/src directories
+still to convert):</p>
 
-<p>This new Make file  has comments explaining how to build the various host
+<blockquote>
+  <pre>rm -rf ../../junkApp</pre>
+  </blockquote>
+
+<p>This new Makefile  has comments explaining how to build the various host
 and ioc products. Lets consider some examples</p>
 <ul>
   <li>Host programs
     <p>Makefile.Host contains definitions like:</p>
-    <pre>PROD += caExample
+    <blockquote>
+      <pre>PROD += caExample
 caExample_SRCS += caExample.c
 PROD_LIBS +=  ca Db Com
 ca_DIR  = $(EPICS_BASE_LIB)
 Db_DIR  = $(EPICS_BASE_LIB)
-Com_DIR = $(EPICS_BASE_LIB)
-      </pre>
+Com_DIR = $(EPICS_BASE_LIB)</pre>
+      </blockquote>
     <p>In Makefile these are:</p>
-    <pre>PROD_HOST += caExample
+    <blockquote>
+      <pre>PROD_HOST += caExample
 caExample_SRCS += caExample.c
-caExample_LIBS += $(EPICS_BASE_HOST_LIBS)
-      </pre>
+caExample_LIBS += $(EPICS_BASE_HOST_LIBS)</pre>
+      </blockquote>
   </li>
   <li>Record Support - generate xxxRecord.h file
     <p>Makefile.Host (or perhaps Makefile.Vx) contains:</p>
-    <pre>RECTYPES += xxxRecord.h
-      </pre>
+    <blockquote>
+      <pre>RECTYPES += xxxRecord.h</pre>
+      </blockquote>
     <p>In Makefile this is:</p>
-    <pre>DBDINC += xxxRecord
-      </pre>
+    <blockquote>
+      <pre>DBDINC += xxxRecord</pre>
+      </blockquote>
   </li>
   <li>Generating the .dbd file for all record/device/driver support
     <p>Makefile.Host (or perhaps Makefile.Vx) contains:</p>
-    <pre>DBDEXPAND = exampleInclude.dbd
-DBDNAME = exampleApp.dbd
-      </pre>
+    <blockquote>
+      <pre>DBDEXPAND = exampleInclude.dbd
+DBDNAME = exampleApp.dbd</pre>
+      </blockquote>
     <p>In Makefile this is:</p>
-    <pre>DBD += example.dbd
-      </pre>
+    <blockquote>
+      <pre>DBD += example.dbd</pre>
+      </blockquote>
     <p>NOTES: Change exampleApp.dbd to example.dbd in all st.cmd files. Also
     this definition assumes that file exampleInclude.dbd exists.</p>
   </li>
   <li>Create the ioc application:
     <p>Makefile.Vx contains statements like:</p>
-    <pre>SRCS.c += ../xxxRecord.c
+    <blockquote>
+      <pre>SRCS.c += ../xxxRecord.c
 SRCS.c += ../devXxxSoft.c
 
 LIBOBJS += xxxRecord.o
@@ -139,11 +162,11 @@ LIBOBJS += sncExample.o
 include ../baseLIBOBJS
 
 LIBNAME = exampleLib
-INSTALLS += iocCore seq
-      </pre>
+INSTALLS += iocCore seq</pre>
+      </blockquote>
     <p>In Makefile these become:</p>
-<pre>
-LIBRARY_vxWorks += exampleIoc
+    <blockquote>
+      <pre>LIBRARY_vxWorks += exampleIoc
 exampleIoc_SRCS += xxxRecord.c
 exampleIoc_SRCS += devXxxSoft.c
 exampleIoc_LIBS += $(EPICS_BASE_IOC_LIBS)
@@ -158,9 +181,8 @@ example_LIBS += $(EPICS_BASE_IOC_LIBS)
 example_SRCS += example_registerRecordDeviceDriver.cpp
 
 #The following adds support from base/src/vxWorks
-example_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
-
-      </pre>
+example_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary</pre>
+      </blockquote>
   </li>
 </ul>
 
@@ -169,223 +191,224 @@ baseLIBOBJS, Makefile.Host, and Makefile.Vx</p>
 
 <h3>File base.dbd no longer needed</h3>
 
+<p>You now can add the line</p>
+
 <blockquote>
-  You now can add the line include "base.dbd" to your
-  &lt;appname&gt;Include.dbd file and remove the file
-  &lt;name&gt;App/src/base.dbd from your src directory. The base.dbd from
-  base/dbd will be included.  However, if you only want a subset of
-  record definitions from base you should keep your base.dbd
-file.</blockquote>
+  <pre>include "base.dbd"</pre>
+  </blockquote>
+
+<p>to your <i>appname</i>Include.dbd file and remove the file
+<i>name</i>App/src/base.dbd from your src directory. The base.dbd from base/dbd
+will be used instead. If you only want to load a subset of the record
+definitions from base you can keep your own copy of base.dbd, but you should
+copy the one from your R3.14 base and edit that rather than trying to re-use the
+R3.13 version from your old application.</p>
 
 <h3>Record support</h3>
 
-<blockquote>
-  Add the following line after all existing #includes
-
-  <blockquote>
-    <pre>#include "epicsExport.h"</pre>
-  </blockquote>
-  The structure rset is now a typedef so change
-
-  <blockquote>
-    <pre>struct rset &lt;recordname&gt;RSET={ ...</pre>
-  </blockquote>
-  to
-
-  <blockquote>
-    <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,&lt;recordname&gt;RSET);</pre>
-  </blockquote>
-</blockquote>
-
-<h3>Device support</h3>
+<p>Add the following line after all existing #includes</p>
 
 <blockquote>
-  Add the following line after all existing #includes
-
-  <blockquote>
-    <pre>#include "epicsExport.h"</pre>
+  <pre>#include "epicsExport.h"</pre>
   </blockquote>
-  and add the following line after the dset definition:
-  struct  { ...} dev&lt;devname&gt;= { ...}; 
 
-  <blockquote>
-    <pre>epicsExportAddress(dset,dev&lt;devname&gt;);</pre>
-  </blockquote>
-</blockquote>
-
-<h3>Driver support</h3>
+<p>The structure rset is now a typedef so change</p>
 
 <blockquote>
-  Add the following line after all existing #includes
-
-  <blockquote>
-    <pre>#include "epicsExport.h"</pre>
+  <pre>struct rset <i>recordname</i>RSET = { ... };</pre>
   </blockquote>
-  and add the following line after the drvet dev&lt;devname&gt; definition
-
-  <blockquote>
-    <pre>epicsExportAddress(drvet,drv&lt;devname&gt;);</pre>
-  </blockquote>
-</blockquote>
-
-<h3>Registration code changed</h3>
-
-<blockquote>
-  Registration code for application specific functions, e.g. subroutine
-  record init and process functions, has been changed as follows
-
-  <p>1) Include the registration support header files:</p>
-
-  <blockquote>
-    <pre>#include "dbDefs.h"
-#include "registryFunction.h"</pre>
-  </blockquote>
-  2) Include the export definitions header file after including all other
-  header files:
-
-  <blockquote>
-    <pre>#include "epicsExport.h"</pre>
-  </blockquote>
-  3) Make the application specific functions static functions, e.g.
-
-  <blockquote>
-    <pre>static long mySubInit(subRecord *precord,processMethod process)
-static long mySubProcess(subRecord *precord)</pre>
-  </blockquote>
-  4) Define a registryFunctionRef array of the application specific functions
-  to be registered, e.g.
-
-  <blockquote>
-    <pre>static registryFunctionRef mySubRef[] = {
-    {"mySubInit",(REGISTRYFUNCTION)mySubInit},
-    {"mySubProcess",(REGISTRYFUNCTION)mySubProcess}
-};</pre>
-  </blockquote>
-  5) Add a new function to do the registration of the registryFunctionRef
-  array elements, e.g.
-
-  <blockquote>
-    <pre>void mySub(void)
-{
-    registryFunctionRefAdd(mySubRef,NELEMENTS(mySubRef));
-}</pre>
-  </blockquote>
-  6) Call the epicsExportRegistrar with the new registration function: e.g.
-
-  <blockquote>
-    <pre>epicsExportRegistrar(mySub);</pre>
-  </blockquote>
-  7) Remove the existing function lines in &lt;appname&gt;Include.dbd: e.g.
-  remove
-
-  <blockquote>
-    <pre>function("mySubInit")
-function("mySubProcess")</pre>
-  </blockquote>
-  8) Add a registrar statement to &lt;name&gt;Include.dbd with the new
-  registration function as parameter: e.g. add
-
-  <blockquote>
-    <pre>registrar("mySub")</pre>
-  </blockquote>
-</blockquote>
-
-<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>
+<blockquote>
+  <pre>rset <i>recordname</i>RSET = { ... };</pre>
+  </blockquote>
 
-<p>Change "<tt>include $(TOP)/config/RULES.ioc</tt>" to "<tt>include
-$(TOP)/configure/RULES.ioc"</tt></p>
+<p>and add the following line after the <q>rset <i>recordname</i>RSET = { ...
+};</q> definition.</p>
+
+<blockquote>
+  <pre>epicsExportAddress(rset,<i>recordname</i>RSET);</pre>
+  </blockquote>
+
+<h3>Device support</h3>
+
+<p>Add the following line after all existing #includes</p>
+
+<blockquote>
+  <pre>#include "epicsExport.h"</pre>
+  </blockquote>
+
+<p>and add the following line after the dset definition <q>struct { ... }
+dev<i>name</i> = { ... };</q></p>
+
+<blockquote>
+  <pre>epicsExportAddress(dset,dev<i>name</i>);</pre>
+  </blockquote>
+
+<h3>Driver support</h3>
+
+<p>Add the following line after all existing #includes</p>
+
+<blockquote>
+  <pre>#include "epicsExport.h"</pre>
+  </blockquote>
+
+<p>and add the following line after the drvet drv<i>name</i> definition</p>
+
+<blockquote>
+  <pre>epicsExportAddress(drvet,drv<i>name</i>);</pre>
+  </blockquote>
+
+<h3>Registration code changed</h3>
+
+<p>Registration code for application specific functions, e.g. subroutine record
+init and process functions, must been changed as follows</p>
+
+<ol>
+  <li>Include the following header files after all existing #includes:
+    <blockquote>
+      <pre>#include "registerFunction.h"
+#include "epicsExport.h"</pre>
+      </blockquote></li>
+
+  <li>Make the application specific functions static functions, e.g.
+    <blockquote>
+      <pre>static long mySubInit(subRecord *precord)
+static long mySubProcess(subRecord *precord)</pre>
+      </blockquote></li>
+
+  <li>Add an epicsExportFunction statement for each of the functions to be
+    registered, e.g.
+    <blockquote>
+      <pre>epicsExportFunction(mySubInit);
+epicsExportFunction(mySubProcess);</pre>
+      </blockquote></li>
+
+  <li>Add a function statement for each of the functions to be registered in a
+    .dbd file that is included in the application, e.g.
+    <blockquote>
+      <pre>function("mySubInit")
+function("mySubProcess")</pre>
+      </blockquote></li>
+</ol>
+
+<h3>Modify the Makefiles in <i>top</i>/iocBoot directory.</h3>
+
+<p>Change <q><tt>include $(TOP)/config/CONFIG_APP</tt></q> to <q><tt>include
+$(TOP)/configure/CONFIG</tt></q></p>
+
+<p>If they do not already exist, add the lines</p>
+
+<blockquote>
+  <pre>DIRS += $(wildcard *ioc*)
+DIRS += $(wildcard as*)</pre>
+</blockquote>
+
+<p>Change <q><tt>include $(TOP)/config/RULES.iocBoot</tt></q> to <q><tt>include
+$(TOP)/configure/RULES_DIRS</tt></q>.</p>
+
+<h3>Modify the Makefiles in <i>top</i>/iocBoot/ioc* directories.</h3>
+
+<p>Change <q><tt>include $(TOP)/config/CONFIG_APP</tt></q> to <q><tt>include
+$(TOP)/configure/CONFIG</tt></q></p>
+
+<p>Change</p>
+
+<blockquote>
+  <pre>ARCH = &lt;old arch specification e.g. mv167&gt;</pre>
+  </blockquote>
+
+<p>to</p>
+
+<blockquote>
+  <pre>ARCH = &lt;new arch specification e.g. vxWorks-68040&gt;</pre>
+  </blockquote>
+
+<p>Change <q><tt>include $(TOP)/config/RULES.ioc</tt></q> to <q><tt>include
+$(TOP)/configure/RULES.ioc</tt></q></p>
 
 <p>If it exists remove the line</p>
 
-<p><tt>buildInstall: cdCommands </tt></p>
+<blockquote>
+  <pre>buildInstall: cdCommands</pre>
+  </blockquote>
 
 <p>Add the line</p>
-<p><tt>TARGETS = cdCommands</tt></p>
+
+<blockquote>
+  <pre>TARGETS = cdCommands</pre>
+  </blockquote>
+
 <p>before the include for RULES.ioc line.</p>
 
-<h3>Modify st.cmd in &lt;top&gt;/iocBoot/ioc* directories.</h3>
+<h3>Modify st.cmd in <i>top</i>/iocBoot/ioc* directories.</h3>
 
 <p>Remove the lines</p>
-<pre>ld &lt; seq
+
+<blockquote>
+  <pre>ld &lt; seq
 ld &lt; iocCore</pre>
+  </blockquote>
 
-<p>Change "<tt>ld &lt; &lt;libname&gt;Lib</tt>" to "<tt>ld &lt;
-&lt;libname&gt;.munch"</tt></p>
+<p>Change <q><tt>ld &lt; <i>name</i>Lib</tt></q> to
 
-<p>Change "<tt>cd appbin</tt>" to "<tt>cd topbin</tt>"</p>
+<blockquote>
+  <pre>ld 0,0, "<i>name</i>.munch"</pre>
+
+  <p>(The <tt>ld</tt> command in vxWorks 5.5.2 doesn't clean up its standard
+  input properly, so we now recommend passing the filename to it directly
+  instead.)</p> </blockquote>
+
+<p>Change <q><tt>cd appbin</tt></q> to <q><tt>cd topbin</tt></q></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>
+<blockquote>
+  <pre>dbLoadDatabase("../../dbd/<i>name</i>App.dbd")</pre>
+  </blockquote>
 
-<p>where &lt;name&gt; is replaced with the name of your dbd file.</p>
+to
+
+<blockquote>
+  <pre>dbLoadDatabase("../../dbd/<i>name</i>.dbd")
+<i>name</i>_registerRecordDeviceDriver(pdbbase)</pre>
+  </blockquote>
+
+<p>where <i>name</i> 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>
+<p>If any source file makes calls to recGbl routines make sure it includes
+<tt>recGbl.h</tt>. If it doesn't the compiler will issue warning messages and
+the ioc may issue the message: <q>undefined symbol: _recGblSetSevr</q>.</p>
 
 <h3>Record support changes</h3>
 
-<p>The steppermotor, scan, and pid records are no longer in base.  If these
+<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
+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
+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>
+<blockquote>
+  <pre>PID = <i>/path/to/modules</i>/pid</pre>
+  </blockquote>
 
-<p>to config/RELEASE and add <br>
+<p>to config/RELEASE and add</p>
 
-<p></p>
+<blockquote>
+  <pre>LIBOBJS += $(PID_BIN)/pidRecord.o</pre>
+  </blockquote>
 
-<p><tt>LIBOBJS += $(PID_BIN)/pidRecord.o</tt></p>
-to your application src/Makefile.
+<p>to your application src/Makefile.</p>
 
 <p>You should consider changing any existing old steppermotor records to the
-new EPICS  motor record  module supported by Beamline Controls and Data
+new EPICS motor record module supported by Beamline Controls and Data
 Acquisition at APS.</p>
 
 <h3>RecDynLink.o and devPtSoft changes</h3>
@@ -394,8 +417,8 @@ Acquisition at APS.</p>
 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>
+definition bin directory in your application src directory files. See
+<q>Hardware support changes</q> below for instructions.</p>
 
 <h3>Hardware support changes</h3>
 
@@ -408,35 +431,41 @@ application, comment out references to them in base.dbd.</p>
 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
+<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>
+<blockquote>
+  <pre>LIBOBJS += $(EPICS_BASE_BIN)/symb</pre>
+  </blockquote>
 
 <p>from baseLIBOBJS and add</p>
 
-<p>         <tt>LIBOBJS+=$(SYMB_BIN)/symb</tt></p>
+<blockquote>
+  <pre>LIBOBJS += $(SYMB_BIN)/symb</pre>
+  </blockquote>
 
-<p>to your application src/Makefile, <br>
-and add the line</p>
+<p>to your application src/Makefile, and add the line</p>
 
-<p><tt>SYMB=&lt;full path definition for the built module SYMB&gt;</tt></p>
+<blockquote>
+  <pre>SYMB = &lt;full path definition for the built module SYMB&gt;</pre>
+  </blockquote>
 
-<p>into your application config/RELEASE file .</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
+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>
+should add the definition</p>
 
-<p><tt>MSI=&lt;full path name to msi executable&gt;</tt></p>
+<blockquote>
+  <pre>MSI = &lt;full path name to msi executable&gt;</pre>
+  </blockquote>
 
 <p>to your application config/RELEASE file.</p>
-<br>
- </body>
+</body>
 </html>