From 31c93f4ad6b55b90ccb07a047acb941af645c059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 27 Nov 2018 19:35:10 +0100 Subject: Remove some unnecessary -pa arguments They're already in ERL_LIBS. --- plugins/ct.mk | 2 +- plugins/erlydtl.mk | 2 +- plugins/eunit.mk | 2 +- plugins/shell.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/ct.mk b/plugins/ct.mk index bc1d0bd..a6a400e 100644 --- a/plugins/ct.mk +++ b/plugins/ct.mk @@ -36,7 +36,7 @@ help:: CT_RUN = ct_run \ -no_auto_compile \ -noinput \ - -pa $(CURDIR)/ebin $(DEPS_DIR)/*/ebin $(APPS_DIR)/*/ebin $(TEST_DIR) \ + -pa $(CURDIR)/ebin $(TEST_DIR) \ -dir $(TEST_DIR) \ -logdir $(CT_LOGS_DIR) diff --git a/plugins/erlydtl.mk b/plugins/erlydtl.mk index 7c09ae3..c88252e 100644 --- a/plugins/erlydtl.mk +++ b/plugins/erlydtl.mk @@ -57,6 +57,6 @@ endef ebin/$(PROJECT).app:: $(DTL_FILES) | ebin/ $(if $(strip $?),\ $(dtl_verbose) $(call erlang,$(call erlydtl_compile.erl,$(call core_native_path,$?)),\ - -pa ebin/ $(DEPS_DIR)/erlydtl/ebin/)) + -pa ebin/)) endif diff --git a/plugins/eunit.mk b/plugins/eunit.mk index 8c08334..600010d 100644 --- a/plugins/eunit.mk +++ b/plugins/eunit.mk @@ -46,7 +46,7 @@ define eunit.erl halt() endef -EUNIT_ERL_OPTS += -pa $(TEST_DIR) $(DEPS_DIR)/*/ebin $(APPS_DIR)/*/ebin $(CURDIR)/ebin +EUNIT_ERL_OPTS += -pa $(TEST_DIR) $(CURDIR)/ebin ifdef t ifeq (,$(findstring :,$(t))) diff --git a/plugins/shell.mk b/plugins/shell.mk index 9d2280f..d241b9f 100644 --- a/plugins/shell.mk +++ b/plugins/shell.mk @@ -7,7 +7,7 @@ # Configuration. SHELL_ERL ?= erl -SHELL_PATHS ?= $(CURDIR)/ebin $(APPS_DIR)/*/ebin $(DEPS_DIR)/*/ebin $(TEST_DIR) +SHELL_PATHS ?= $(CURDIR)/ebin $(TEST_DIR) SHELL_OPTS ?= ALL_SHELL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(SHELL_DEPS)) -- cgit v1.2.3