Skip to content
Snippets Groups Projects
Commit 416c4b65 authored by Anders Lindh Olsson's avatar Anders Lindh Olsson 🎱
Browse files

Merge branch 'prepare_next_release' into 'master'

E3-962: Apply changes for the next e3 release

See merge request e3/deprecated/e3-file!3
parents 165966d8 515817c9
No related branches found
No related tags found
1 merge request!3E3-962: Apply changes for the next e3 release
......@@ -5,7 +5,7 @@ include $(TOP)/configure/RELEASE
include $(TOP)/configure/CONFIG_MODULE
E3_REQUIRE_LOCATION := $(EPICS_BASE)/$(E3_REQUIRE_NAME)/$(E3_REQUIRE_VERSION)
REQUIRE_CONFIG := $(E3_REQUIRE_LOCATION)/configure
include $(REQUIRE_CONFIG)/CONFIG
include $(E3_REQUIRE_LOCATION)/configure/CONFIG
include $(REQUIRE_CONFIG)/RULES_E3
include $(REQUIRE_CONFIG)/DEFINES_FT
include $(REQUIRE_CONFIG)/RULES_PATCH
include $(REQUIRE_CONFIG)/RULES_E3_SITELIBS
include $(E3_REQUIRE_CONFIG)/RULES_E3
include $(E3_REQUIRE_CONFIG)/DEFINES_FT
include $(E3_REQUIRE_CONFIG)/RULES_PATCH
include $(E3_REQUIRE_CONFIG)/RULES_E3_SITELIBS
include $(REQUIRE_CONFIG)/RULES_VLIBS
include $(REQUIRE_CONFIG)/RULES_VARS
include $(E3_REQUIRE_CONFIG)/RULES_VLIBS
include $(E3_REQUIRE_CONFIG)/RULES_VARS
include $(TOP)/configure/module/RULES_MODULE
-include $(TOP)/configure/module/RULES_DKMS_L
......
#
.PHONY: db hdrs
db: conf
$(QUIET) $(E3_MODULE_MAKE_CMDS) db
.PHONY: hdrs
hdrs:
# $(SUDO) install -m 755 -d $(E3_MODULES_INSTALL_LOCATION_INC)/pv
......
......@@ -27,17 +27,8 @@
## The following lines are mandatory, please don't change them.
where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
include $(E3_REQUIRE_TOOLS)/driver.makefile
include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
ifneq ($(strip $(ASYN_DEP_VERSION)),)
asyn_VERSION=$(ASYN_DEP_VERSION)
endif
ifneq ($(strip $(STREAM_DEP_VERSION)),)
stream_VERSION=$(STREAM_DEP_VERSION)
endif
APP:=fileApp
APPDB:=$(APP)/Db
......@@ -60,9 +51,7 @@ SOURCES += $(APPSRC)/StringArrayFormatConverter.cpp
SCRIPTS += $(wildcard ../iocsh/*.iocsh)
db:
.PHONY: db
.PHONY:
vlibs:
......
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