aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2017-05-15 20:55:06 +0200
committerLoïc Hoguin <[email protected]>2017-05-15 21:37:08 +0200
commit0305622f259c11258cc9d56fa46af28d2206bd43 (patch)
tree84d17c6ac8b8a55455acae1f14a9e9463e823fed /core
parent9292409f21393ec539cdf40720d26b43914f6018 (diff)
downloaderlang.mk-0305622f259c11258cc9d56fa46af28d2206bd43.tar.gz
erlang.mk-0305622f259c11258cc9d56fa46af28d2206bd43.tar.bz2
erlang.mk-0305622f259c11258cc9d56fa46af28d2206bd43.zip
Add tweaks and tests for the WITHOUT feature
Diffstat (limited to 'core')
-rw-r--r--core/core.mk10
1 files changed, 3 insertions, 7 deletions
diff --git a/core/core.mk b/core/core.mk
index 89cfa25..63265d3 100644
--- a/core/core.mk
+++ b/core/core.mk
@@ -18,6 +18,7 @@ ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
export ERLANG_MK_FILENAME
ERLANG_MK_VERSION = rolling
+ERLANG_MK_WITHOUT =
# Make 3.81 and 3.82 are deprecated.
@@ -29,9 +30,6 @@ ifeq ($(MAKE_VERSION),3.82)
$(warning Please upgrade to GNU Make 4 or later: https://erlang.mk/guide/installation.html)
endif
-# Ignored plugins
-ERLANG_MK_WITHOUT = ""
-
# Core configuration.
PROJECT ?= $(notdir $(CURDIR))
@@ -187,16 +185,14 @@ ERLANG_MK_COMMIT ?=
ERLANG_MK_BUILD_CONFIG ?= build.config
ERLANG_MK_BUILD_DIR ?= .erlang.mk.build
-WITHOUT ?= $(ERLANG_MK_WITHOUT)
-WITHOUT := $(strip $(WITHOUT))
-
+erlang-mk: WITHOUT ?= $(ERLANG_MK_WITHOUT)
erlang-mk:
git clone $(ERLANG_MK_REPO) $(ERLANG_MK_BUILD_DIR)
ifdef ERLANG_MK_COMMIT
cd $(ERLANG_MK_BUILD_DIR) && git checkout $(ERLANG_MK_COMMIT)
endif
if [ -f $(ERLANG_MK_BUILD_CONFIG) ]; then cp $(ERLANG_MK_BUILD_CONFIG) $(ERLANG_MK_BUILD_DIR)/build.config; fi
- $(MAKE) -C $(ERLANG_MK_BUILD_DIR) WITHOUT='$(WITHOUT)'
+ $(MAKE) -C $(ERLANG_MK_BUILD_DIR) WITHOUT='$(strip $(WITHOUT))'
cp $(ERLANG_MK_BUILD_DIR)/erlang.mk ./erlang.mk
rm -rf $(ERLANG_MK_BUILD_DIR)