Merge branch 'E3-924' into 'master'

E3 924: General require cleanup

See merge request e3/e3-require!92

configure/E3/DEFINES_FT

@@ -20,7 +20,7 @@ if [ -n "$$patches" ]; then \
     git apply --directory=$(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 $$i; \
   done; \
 else \
-  echo ">>> No patches to apply" >&2; \
+  echo ">>> No patches to apply"; \
 fi
 endef
 
@@ -32,7 +32,7 @@ if [ -n "$$patches" ]; then \
     git apply -R --directory=$(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 $$i;\
   done \
 else \
-  echo ">>> No patches to revert" >&2; \
+  echo ">>> No patches to revert"; \
 fi
 endef
 

require-ess/tools/driver.makefile

@@ -83,14 +83,9 @@ MODULE_LOCATION =${EPICS_MODULES}/$(or ${PRJ},$(error PRJ not defined))/$(or ${L
 # Override config here:
 -include ${MAKEHOME}/config
 
-# Use fancy glob to find latest versions.
-SHELL = /bin/bash -O extglob
-
 # Some shell commands:
 RMDIR = rm -rf
 LN = ln -s
-EXISTS = test -e
-NM = nm
 RM = rm -f
 CP = cp
 MKDIR = mkdir -p -m 775
@@ -101,7 +96,6 @@ VERSIONREGEX = [0-9]+\.[0-9]+\.[0-9]+(\+[0-9]+)?
 # Some generated file names:
 VERSIONFILE = ${PRJ}_version_${LIBVERSION}.c
 REGISTRYFILE = ${PRJ}_registerRecordDeviceDriver.cpp
-SUBFUNCFILE = ${PRJ}_subRecordFunctions.dbd
 DEPFILE = ${PRJ}.dep
 METAFILE = ${PRJ}_meta.yaml
 
@@ -114,16 +108,6 @@ HEADERS=
 BASH_ENV=
 ENV=
 
-# There is no 64 bit support before 3.14.12
-ifneq ($(filter %_64,$(EPICS_HOST_ARCH)),)
-ifeq ($(wildcard $(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)),)
-EPICS_HOST_ARCH:=$(patsubst %_64,%,$(EPICS_HOST_ARCH))
-USR_CFLAGS_$(EPICS_HOST_ARCH) += -m32
-USR_CXXFLAGS_$(EPICS_HOST_ARCH) += -m32
-USR_LDFLAGS_$(EPICS_HOST_ARCH) += -m32
-endif
-endif
-
 # Default target is "build" for all versions.
 # Don't install anything (different from default EPICS make rules).
 default: build
@@ -194,13 +178,7 @@ USR_CPPFLAGS+=-DUSE_TYPED_RSET
 endif
 
 SHRLIB_VERSION=
-# do not link *everything* with readline (and curses)
-COMMANDLINE_LIBRARY =
-# Relax (3.13) cross compilers (default is STRICT) to allow sloppier syntax.
-CMPLR=STD
-GCC_STD = $(GCC)
-CXXCMPLR=ANSI
-G++_ANSI = $(G++) -ansi
+
 OBJ=.o
 
 COMMON_DIR = O.${EPICSVERSION}_Common
@@ -215,7 +193,6 @@ ifndef T_A
 
 AUTOSRCS := $(filter-out ~%,$(wildcard *.c *.cc *.cpp *.st *.stt *.gt))
 SRCS = $(if ${SOURCES},$(filter-out -none-,${SOURCES}),${AUTOSRCS})
-#SRCS += ${SOURCES_${EPICSVERSION}}
 export SRCS
 
 DBD_SRCS = $(if ${DBDS},$(filter-out -none-,${DBDS}),$(wildcard menu*.dbd *Record.dbd) $(strip $(filter-out %Include.dbd dbCommon.dbd %Record.dbd,$(wildcard *.dbd)) ${BPTS}))