From 373122de2f3e3a6e937e527044ae3b62ba939c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sun, 30 Oct 2016 00:13:42 +0300 Subject: Use := instead of = for list of files This will make sure we don't look twice. Also make a single call to find the common file formats rather than many calls. --- plugins/ct.mk | 8 +++++--- plugins/erlydtl.mk | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/ct.mk b/plugins/ct.mk index f6cc590..71a61de 100644 --- a/plugins/ct.mk +++ b/plugins/ct.mk @@ -6,11 +6,13 @@ # Configuration. CT_OPTS ?= + ifneq ($(wildcard $(TEST_DIR)),) - CT_SUITES ?= $(sort $(subst _SUITE.erl,,$(notdir $(call core_find,$(TEST_DIR)/,*_SUITE.erl)))) -else - CT_SUITES ?= +ifndef CT_SUITES +CT_SUITES := $(sort $(subst _SUITE.erl,,$(notdir $(call core_find,$(TEST_DIR)/,*_SUITE.erl)))) +endif endif +CT_SUITES ?= # Core targets. diff --git a/plugins/erlydtl.mk b/plugins/erlydtl.mk index dd9621e..7c09ae3 100644 --- a/plugins/erlydtl.mk +++ b/plugins/erlydtl.mk @@ -16,7 +16,7 @@ dtl_verbose = $(dtl_verbose_$(V)) # Core targets. DTL_PATH := $(abspath $(DTL_PATH)) -DTL_FILES = $(call core_find,$(DTL_PATH),*.dtl) +DTL_FILES := $(sort $(call core_find,$(DTL_PATH),*.dtl)) ifneq ($(DTL_FILES),) -- cgit v1.2.3