diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG index d4c2f7004483de5fd680734d2923f761c6b0a64c..2e4bf28ae2b21e0e60f47b9cd684026afd1c8ed2 100644 --- a/configure/modules/CONFIG +++ b/configure/modules/CONFIG @@ -5,6 +5,6 @@ include $(REQUIRE_CONFIG)/CONFIG_E3_PATH include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE include $(REQUIRE_CONFIG)/CONFIG_EPICS include $(REQUIRE_CONFIG)/CONFIG_SUDO -include $(REQUIRE_CONFIG)/CONFIG_EXPORT include $(REQUIRE_CONFIG)/CONFIG_DKMS +include $(REQUIRE_CONFIG)/CONFIG_EXPORT diff --git a/configure/modules/CONFIG_DKMS b/configure/modules/CONFIG_DKMS index 0eb5a6aba83f8e079d68c3c9683770dc676c82ae..76d1d5a9e997505fcd2e502c8b8e95e08652e784 100644 --- a/configure/modules/CONFIG_DKMS +++ b/configure/modules/CONFIG_DKMS @@ -1,2 +1,5 @@ -DKMS:=/usr/sbin/dkms -DKMS_ARGS:=-m $(E3_MODULE_NAME) -v $(E3_MODULE_VERSION) +DKMS := /usr/sbin/dkms +DKMS_ARGS := -m $(E3_MODULE_NAME) -v $(E3_MODULE_VERSION) + +VARS_EXCLUDES+=DKMS_ARGS +VARS_EXCLUDES+=DKMS diff --git a/configure/modules/CONFIG_SUDO b/configure/modules/CONFIG_SUDO index 10840800849af4acddd9585fabe33689a03ac616..f410fc1b5d5256c189949005a755d3a8581db842 100644 --- a/configure/modules/CONFIG_SUDO +++ b/configure/modules/CONFIG_SUDO @@ -23,3 +23,10 @@ E3_MODULE_SRC_PATH_INFO := $(shell test -d $(E3_MODULE_SRC_PATH) 1>&2 2> /dev/nu ifeq "$(E3_MODULE_SRC_PATH_INFO)" "1" INIT_E3_MODULE_SRC = 1 endif + + +VARS_EXCLUDES+=SUDO2 +VARS_EXCLUDES+=SUDO +VARS_EXCLUDES+=SUDOBASH +VARS_EXCLUDES+=SUDO_INFO +VARS_EXCLUDES+=E3_MODULE_SRC_PATH_INFO \ No newline at end of file diff --git a/configure/modules/RULES_DKMS b/configure/modules/RULES_DKMS index 020e659c459ada1e4bdbc7a8ad7644aa7be5fca2..9498c642c3611fcad904826f82a12f9ce299865f 100644 --- a/configure/modules/RULES_DKMS +++ b/configure/modules/RULES_DKMS @@ -21,9 +21,3 @@ dkms_uninstall: .PHONY: dkms_build dkms_install dkms_remove dkms_uninstall - - -VARS_EXCLUDES+=KMOD_NAME -VARS_EXCLUDES+=DKMS_ARGS -VARS_EXCLUDES+=DKMS -VARS_EXCLUDES+=SUDO2 diff --git a/configure/modules/RULES_E3 b/configure/modules/RULES_E3 index 6793cf53948de849f9f06cfd6b08ea0fac4fe6ea..4bc23e07f552bae095189c0e5aa2edad02098684 100644 --- a/configure/modules/RULES_E3 +++ b/configure/modules/RULES_E3 @@ -2,6 +2,8 @@ .PHONY: help default install uninstall build rebuild clean conf +default: help + # # help is defined in # # https://gist.github.com/rcmachado/af3db315e31383502660 help: @@ -21,7 +23,7 @@ help: $(MAKEFILE_LIST) | column -ts: -default: help + ## Install : $(E3_MODULE_NAME) install: install_module install_links diff --git a/configure/modules/RULES_E3_SITEAPPS b/configure/modules/RULES_E3_SITEAPPS index 3ba513ade718be18af2b952ed59cefe5c9fbf2f7..4d32fff4c608d62cbd8f449ddfe3c14dc5d31d21 100644 --- a/configure/modules/RULES_E3_SITEAPPS +++ b/configure/modules/RULES_E3_SITEAPPS @@ -4,5 +4,5 @@ .PHONY: install_links # GNU find -install_links: +install_links: hdrs diff --git a/configure/modules/RULES_SITEAPPS b/configure/modules/RULES_SITEAPPS index 44d21896a4bd2212597cf8f71f852d78a287caeb..62e6b7a586f5ea26232745a7666b58e0c1b80b7d 100644 --- a/configure/modules/RULES_SITEAPPS +++ b/configure/modules/RULES_SITEAPPS @@ -5,9 +5,10 @@ include $(REQUIRE_CONFIG)/DEFINES_FT include $(REQUIRE_CONFIG)/RULES_PATCH include $(REQUIRE_CONFIG)/RULES_E3_SITEAPPS -include $(REQUIRE_CONFIG)/RULES_VARS include $(REQUIRE_CONFIG)/RULES_VLIBS +include $(REQUIRE_CONFIG)/RULES_DKMS include $(REQUIRE_CONFIG)/RULES_PROD +include $(REQUIRE_CONFIG)/RULES_VARS ifneq (,$(findstring dev,$(MAKECMDGOALS))) -include $(REQUIRE_CONFIG)/RULES_DEV diff --git a/configure/modules/RULES_SITEMODS b/configure/modules/RULES_SITEMODS index 0ada2ab357d3d43eae3534f96cb5f4ac03230c16..24bf49d93c88f88a6807e758be6e36da6d4b34aa 100644 --- a/configure/modules/RULES_SITEMODS +++ b/configure/modules/RULES_SITEMODS @@ -5,10 +5,11 @@ include $(REQUIRE_CONFIG)/DEFINES_FT include $(REQUIRE_CONFIG)/RULES_PATCH include $(REQUIRE_CONFIG)/RULES_E3_SITELIBS -include $(REQUIRE_CONFIG)/RULES_VARS + include $(REQUIRE_CONFIG)/RULES_VLIBS include $(REQUIRE_CONFIG)/RULES_DKMS include $(REQUIRE_CONFIG)/RULES_PROD +include $(REQUIRE_CONFIG)/RULES_VARS ifneq (,$(findstring dev,$(MAKECMDGOALS))) -include $(REQUIRE_CONFIG)/RULES_DEV diff --git a/configure/modules/RULES_VARS b/configure/modules/RULES_VARS index 0447f76a5731aca3b59fb756097f45dc26305bef..543249fe4178ddffbc58216b1a29eae612da3392 100644 --- a/configure/modules/RULES_VARS +++ b/configure/modules/RULES_VARS @@ -1,4 +1,5 @@ + E3_MODULES_VARIABLES:=$(sort $(filter-out $(VARS_EXCLUDES) VARS_EXCLUDES,$(.VARIABLES))) .PHONY : env vars header