Skip to content
Snippets Groups Projects
Commit dfa75e05 authored by Wayne Lewis's avatar Wayne Lewis
Browse files

Remove EPICS base 3 references

parent c70d6a33
No related branches found
No related tags found
1 merge request!72e3-577: remove base v3
...@@ -31,9 +31,6 @@ include $(REQUIRE_CONFIG)/CONFIG_EPICS ...@@ -31,9 +31,6 @@ include $(REQUIRE_CONFIG)/CONFIG_EPICS
include $(REQUIRE_CONFIG)/CONFIG_EXPORT include $(REQUIRE_CONFIG)/CONFIG_EXPORT
VARS_EXCLUDES+=BASE_3_14
VARS_EXCLUDES+=BASE_3_15
VARS_EXCLUDES+=BASE_3_16
VARS_EXCLUDES+=BASE_7_0 VARS_EXCLUDES+=BASE_7_0
VARS_EXCLUDES+=EPICS_VERSION VARS_EXCLUDES+=EPICS_VERSION
VARS_EXCLUDES+=EPICS_REVISION VARS_EXCLUDES+=EPICS_REVISION
......
...@@ -507,7 +507,6 @@ COMMON_DIR = ../O.${EPICSVERSION}_Common ...@@ -507,7 +507,6 @@ COMMON_DIR = ../O.${EPICSVERSION}_Common
# Remove include directory for this module from search path. # Remove include directory for this module from search path.
INSTALL_INCLUDES = INSTALL_INCLUDES =
EPICS_INCLUDES =
# Add include directory of foreign modules to include file search path. # Add include directory of foreign modules to include file search path.
# #
...@@ -572,9 +571,6 @@ endif # MINOR ...@@ -572,9 +571,6 @@ endif # MINOR
LDFLAGS += ${PROVIDES} ${USR_LDFLAGS_${T_A}} LDFLAGS += ${PROVIDES} ${USR_LDFLAGS_${T_A}}
# Create and include dependency files. # Create and include dependency files.
# 3.14.8 uses HDEPENDS to select depends mode
# 3.14.12 uses 'HDEPENDSCFLAGS -MMD' (does not catch #include <...>)
# 3.15 uses 'HDEPENDS_COMPFLAGS = -MM -MF $@' (does not catch #include <...>)
HDEPENDS = HDEPENDS =
HDEPENDS_METHOD = COMP HDEPENDS_METHOD = COMP
HDEPENDS_COMPFLAGS = -c HDEPENDS_COMPFLAGS = -c
...@@ -595,9 +591,6 @@ SRC_INCLUDES = $(addprefix -I, $(wildcard $(foreach d,$(call uniq, $(filter-out ...@@ -595,9 +591,6 @@ SRC_INCLUDES = $(addprefix -I, $(wildcard $(foreach d,$(call uniq, $(filter-out
# Look for includes from standard locations relative to vendor libraries # Look for includes from standard locations relative to vendor libraries
USR_INCLUDES += $(addprefix -I,$(wildcard $(patsubst %/lib/$(T_A)/,../%/include,$(call uniq,$(dir $(VLIBS))) $(patsubst %/lib/,../%/include,$(call uniq,$(dir $(VLIBS))))))) USR_INCLUDES += $(addprefix -I,$(wildcard $(patsubst %/lib/$(T_A)/,../%/include,$(call uniq,$(dir $(VLIBS))) $(patsubst %/lib/,../%/include,$(call uniq,$(dir $(VLIBS)))))))
# Different macro name for 3.14.8.
GENERIC_SRC_INCLUDES = $(SRC_INCLUDES)
# Create dbd file for snl code. # Create dbd file for snl code.
DBDFILES += $(patsubst %.st,%_snl.dbd,$(notdir $(filter %.st,${SRCS}))) DBDFILES += $(patsubst %.st,%_snl.dbd,$(notdir $(filter %.st,${SRCS})))
DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS}))) DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS})))
...@@ -605,8 +598,7 @@ DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS}))) ...@@ -605,8 +598,7 @@ DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS})))
# Create dbd file for GPIB code. # Create dbd file for GPIB code.
DBDFILES += $(patsubst %.gt,%.dbd,$(notdir $(filter %.gt,${SRCS}))) DBDFILES += $(patsubst %.gt,%.dbd,$(notdir $(filter %.gt,${SRCS})))
# snc location in 3.14: From latest version of module seq or fall back to globally installed snc. # snc location
#SNC=$(lastword $(dir ${EPICS_BASE})seq/bin/$(EPICS_HOST_ARCH)/snc $(shell ls -dv ${EPICS_MODULES}/seq/$(or $(seq_VERSION),$(VERSIONGLOB))/bin/${EPICS_HOST_ARCH}/snc 2>/dev/null))
SNCALL=$(shell ls -dv $(E3_SITEMODS_PATH)/sequencer/$(call FETCH_BUILD_NUMBER,$(E3_SITEMODS_PATH),sequencer)/bin/$(EPICS_HOST_ARCH) 2> /dev/null) SNCALL=$(shell ls -dv $(E3_SITEMODS_PATH)/sequencer/$(call FETCH_BUILD_NUMBER,$(E3_SITEMODS_PATH),sequencer)/bin/$(EPICS_HOST_ARCH) 2> /dev/null)
SNC=$(lastword $(SNCALL))/snc SNC=$(lastword $(SNCALL))/snc
...@@ -665,11 +657,9 @@ endif ...@@ -665,11 +657,9 @@ endif
# Fix incompatible release rules. # Fix incompatible release rules.
RELEASE_DBDFLAGS = -I ${EPICS_BASE}/dbd RELEASE_DBDFLAGS = -I ${EPICS_BASE}/dbd
RELEASE_INCLUDES = -I${EPICS_BASE}/include RELEASE_INCLUDES = -I${EPICS_BASE}/include
# For EPICS 3.15: # For EPICS 3.15+:
RELEASE_INCLUDES += -I${EPICS_BASE}/include/compiler/${CMPLR_CLASS} RELEASE_INCLUDES += -I${EPICS_BASE}/include/compiler/${CMPLR_CLASS}
RELEASE_INCLUDES += -I${EPICS_BASE}/include/os/${OS_CLASS} RELEASE_INCLUDES += -I${EPICS_BASE}/include/os/${OS_CLASS}
# Dor EPICS 3.13:
EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS)
# Find all sources and set vpath accordingly. # Find all sources and set vpath accordingly.
$(foreach file, ${SRCS} ${TEMPLS} ${DBDINSTALLS} ${SCR}, $(eval vpath $(notdir ${file}) ../$(dir ${file}))) $(foreach file, ${SRCS} ${TEMPLS} ${DBDINSTALLS} ${SCR}, $(eval vpath $(notdir ${file}) ../$(dir ${file})))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment