diff --git a/configure/E3/CONFIG_EPICS b/configure/E3/CONFIG_EPICS index 432e0d3fdebe3f1c49d216f5000723c2b19c32e7..20902b72e24e085407cd3e1dad7a2d79636312d5 100644 --- a/configure/E3/CONFIG_EPICS +++ b/configure/E3/CONFIG_EPICS @@ -43,17 +43,7 @@ export M_ADCORE export M_OPCUA ## This is needed since the target "epics" (in configure/RULES_MODULE in most modules) -## uses SUDOBASH to run the make process: -# -#.PHONY: epics -#epics: -# $(QUIET)echo "EPICS_BASE:=$(EPICS_BASE)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE -# $(QUIET)echo "ASYN:=$(M_ASYN)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE -# $(QUIET)echo "CHECK_RELEASE:=YES" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE -# $(QUIET)echo "INSTALL_LOCATION:=$(M_DEVLIB2)" >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE -# $(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH)" -# -## And so that last line will only run if SUDOBASH is defined to be "bash -c" +## uses SUDOBASH to run the make process SUDOBASH := bash -c ### Exclude the following variables to display diff --git a/configure/E3/DECOUPLE_FLAGS b/configure/E3/DECOUPLE_FLAGS index 476159b45bc50c2028b81b053709696a0c98d4dc..befe8edba9bb76f94f1ee1c8b853f5e0f5744068 100644 --- a/configure/E3/DECOUPLE_FLAGS +++ b/configure/E3/DECOUPLE_FLAGS @@ -1,7 +1 @@ -# Legacy file. Needed since <module>.Makefiles include the boilerplate code -# -# where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) -# include ${E3_REQUIRE_TOOLS}/driver.makefile -# include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS -# -# which fails if this file does not exist. TODO: Remove this line from all modules +# Legacy file. Needed since <module>.Makefiles include this. diff --git a/configure/module/RULES_TEST b/configure/module/RULES_TEST index 5a6e2b8473f663b14bfa544ef6867e3f46f1b39e..9e424cd44c0d6561c7e0ba2cd711142815073757 100644 --- a/configure/module/RULES_TEST +++ b/configure/module/RULES_TEST @@ -1,4 +1,3 @@ .PHONY: test - test: pytest $(TEST_DIR) -v