Skip to content
Snippets Groups Projects
Commit 969640fe authored by Jeong Han Lee's avatar Jeong Han Lee
Browse files

tweak few vars

parent 5686283e
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,6 @@ include $(REQUIRE_CONFIG)/CONFIG_E3_PATH ...@@ -5,6 +5,6 @@ include $(REQUIRE_CONFIG)/CONFIG_E3_PATH
include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
include $(REQUIRE_CONFIG)/CONFIG_EPICS include $(REQUIRE_CONFIG)/CONFIG_EPICS
include $(REQUIRE_CONFIG)/CONFIG_SUDO include $(REQUIRE_CONFIG)/CONFIG_SUDO
include $(REQUIRE_CONFIG)/CONFIG_EXPORT
include $(REQUIRE_CONFIG)/CONFIG_DKMS include $(REQUIRE_CONFIG)/CONFIG_DKMS
include $(REQUIRE_CONFIG)/CONFIG_EXPORT
DKMS:=/usr/sbin/dkms DKMS := /usr/sbin/dkms
DKMS_ARGS:=-m $(E3_MODULE_NAME) -v $(E3_MODULE_VERSION) DKMS_ARGS := -m $(E3_MODULE_NAME) -v $(E3_MODULE_VERSION)
VARS_EXCLUDES+=DKMS_ARGS
VARS_EXCLUDES+=DKMS
...@@ -23,3 +23,10 @@ E3_MODULE_SRC_PATH_INFO := $(shell test -d $(E3_MODULE_SRC_PATH) 1>&2 2> /dev/nu ...@@ -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" ifeq "$(E3_MODULE_SRC_PATH_INFO)" "1"
INIT_E3_MODULE_SRC = 1 INIT_E3_MODULE_SRC = 1
endif 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
...@@ -21,9 +21,3 @@ dkms_uninstall: ...@@ -21,9 +21,3 @@ dkms_uninstall:
.PHONY: dkms_build dkms_install dkms_remove 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
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
.PHONY: help default install uninstall build rebuild clean conf .PHONY: help default install uninstall build rebuild clean conf
default: help
# # help is defined in # # help is defined in
# # https://gist.github.com/rcmachado/af3db315e31383502660 # # https://gist.github.com/rcmachado/af3db315e31383502660
help: help:
...@@ -21,7 +23,7 @@ help: ...@@ -21,7 +23,7 @@ help:
$(MAKEFILE_LIST) | column -ts: $(MAKEFILE_LIST) | column -ts:
default: help
## Install : $(E3_MODULE_NAME) ## Install : $(E3_MODULE_NAME)
install: install_module install_links install: install_module install_links
......
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
.PHONY: install_links .PHONY: install_links
# GNU find # GNU find
install_links: install_links: hdrs
...@@ -5,9 +5,10 @@ include $(REQUIRE_CONFIG)/DEFINES_FT ...@@ -5,9 +5,10 @@ include $(REQUIRE_CONFIG)/DEFINES_FT
include $(REQUIRE_CONFIG)/RULES_PATCH include $(REQUIRE_CONFIG)/RULES_PATCH
include $(REQUIRE_CONFIG)/RULES_E3_SITEAPPS include $(REQUIRE_CONFIG)/RULES_E3_SITEAPPS
include $(REQUIRE_CONFIG)/RULES_VARS
include $(REQUIRE_CONFIG)/RULES_VLIBS include $(REQUIRE_CONFIG)/RULES_VLIBS
include $(REQUIRE_CONFIG)/RULES_DKMS
include $(REQUIRE_CONFIG)/RULES_PROD include $(REQUIRE_CONFIG)/RULES_PROD
include $(REQUIRE_CONFIG)/RULES_VARS
ifneq (,$(findstring dev,$(MAKECMDGOALS))) ifneq (,$(findstring dev,$(MAKECMDGOALS)))
-include $(REQUIRE_CONFIG)/RULES_DEV -include $(REQUIRE_CONFIG)/RULES_DEV
......
...@@ -5,10 +5,11 @@ include $(REQUIRE_CONFIG)/DEFINES_FT ...@@ -5,10 +5,11 @@ include $(REQUIRE_CONFIG)/DEFINES_FT
include $(REQUIRE_CONFIG)/RULES_PATCH include $(REQUIRE_CONFIG)/RULES_PATCH
include $(REQUIRE_CONFIG)/RULES_E3_SITELIBS include $(REQUIRE_CONFIG)/RULES_E3_SITELIBS
include $(REQUIRE_CONFIG)/RULES_VARS
include $(REQUIRE_CONFIG)/RULES_VLIBS include $(REQUIRE_CONFIG)/RULES_VLIBS
include $(REQUIRE_CONFIG)/RULES_DKMS include $(REQUIRE_CONFIG)/RULES_DKMS
include $(REQUIRE_CONFIG)/RULES_PROD include $(REQUIRE_CONFIG)/RULES_PROD
include $(REQUIRE_CONFIG)/RULES_VARS
ifneq (,$(findstring dev,$(MAKECMDGOALS))) ifneq (,$(findstring dev,$(MAKECMDGOALS)))
-include $(REQUIRE_CONFIG)/RULES_DEV -include $(REQUIRE_CONFIG)/RULES_DEV
......
E3_MODULES_VARIABLES:=$(sort $(filter-out $(VARS_EXCLUDES) VARS_EXCLUDES,$(.VARIABLES))) E3_MODULES_VARIABLES:=$(sort $(filter-out $(VARS_EXCLUDES) VARS_EXCLUDES,$(.VARIABLES)))
.PHONY : env vars header .PHONY : env vars header
......
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