diff --git a/configure/CONFIG b/configure/CONFIG index 2b63d799534642f6668381add1905aa03dce47c7..8772be7505d5eb1af55d86c2f74542cbffe5e1e6 100644 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -14,7 +14,7 @@ include $(TOP)/configure/CONFIG_MODULE endif 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 diff --git a/configure/RULES b/configure/RULES index 978c976f8d298955277c6cd5ad14c7cda98db013..96cc1d180eecd24481bf84947a41d983b4b7bab6 100644 --- a/configure/RULES +++ b/configure/RULES @@ -1,5 +1,5 @@ -include $(REQUIRE_CONFIG)/RULES_SITEMODS +include $(E3_REQUIRE_CONFIG)/RULES_SITEMODS include $(TOP)/configure/module/RULES_MODULE -include $(TOP)/configure/module/RULES_DKMS_L diff --git a/configure/module/RULES_MODULE b/configure/module/RULES_MODULE index b8df260665c81e17847bb010e97dfa167e38d2f6..80566955f120c7c1155c2fcd90fd3ab082f67042 100644 --- a/configure/module/RULES_MODULE +++ b/configure/module/RULES_MODULE @@ -1,8 +1,5 @@ # -.PHONY: db hdrs epics epics-clean - -db: conf - $(QUIET) $(E3_MODULE_MAKE_CMDS) db +.PHONY: hdrs epics epics-clean hdrs: # $(SUDO) install -m 755 -d $(E3_MODULES_INSTALL_LOCATION_INC)/pv diff --git a/memDisplay.Makefile b/memDisplay.Makefile index 1f1a223d907e3e1ebc9f8f44d4bf6ba57472f8bb..373900a88e137de3afc9ed0c02d7891f5bd56fb6 100644 --- a/memDisplay.Makefile +++ b/memDisplay.Makefile @@ -25,13 +25,6 @@ where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) include $(E3_REQUIRE_TOOLS)/driver.makefile -include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS - -ifneq ($(strip $(SYMBOLNAME_DEP_VERSION)),) -symbolname_VERSION=$(SYMBOLNAME_DEP_VERSION) -endif - - APP:=memDisplay @@ -46,7 +39,6 @@ DBDS = memDisplay.dbd # db rule is the default in RULES_E3, so add the empty one -db: # .PHONY: vlibs vlibs: