From 969640fe845d84490fd680f90ecaa8833e99c710 Mon Sep 17 00:00:00 2001 From: Jeong Han Lee <jeonghan.lee@gmail.com> Date: Tue, 13 Nov 2018 22:54:30 +0100 Subject: [PATCH] tweak few vars --- configure/modules/CONFIG | 2 +- configure/modules/CONFIG_DKMS | 7 +++++-- configure/modules/CONFIG_SUDO | 7 +++++++ configure/modules/RULES_DKMS | 6 ------ configure/modules/RULES_E3 | 4 +++- configure/modules/RULES_E3_SITEAPPS | 2 +- configure/modules/RULES_SITEAPPS | 3 ++- configure/modules/RULES_SITEMODS | 3 ++- configure/modules/RULES_VARS | 1 + 9 files changed, 22 insertions(+), 13 deletions(-) diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG index d4c2f700..2e4bf28a 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 0eb5a6ab..76d1d5a9 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 10840800..f410fc1b 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 020e659c..9498c642 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 6793cf53..4bc23e07 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 3ba513ad..4d32fff4 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 44d21896..62e6b7a5 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 0ada2ab3..24bf49d9 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 0447f76a..543249fe 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 -- GitLab