summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-08-28 18:28:16 +0200
committerJean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr>2015-10-20 11:10:48 +0200
commit0f1efd266866ff7af9492425e4ec718867ccb98a (patch)
tree1c6e0f0474f563c39fb8b65a7044b3934d1cd0c9
parent866a755344f479ebfdf7cdd6b763b9de570327cf (diff)
downloadrabbitmq-server-git-0f1efd266866ff7af9492425e4ec718867ccb98a.tar.gz
Update erlang.mk
-rw-r--r--erlang.mk20
1 files changed, 18 insertions, 2 deletions
diff --git a/erlang.mk b/erlang.mk
index fd33028587..23509e9d7d 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -16,7 +16,7 @@
ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
-ERLANG_MK_VERSION = 1.2.0-653-gd3d9bb1
+ERLANG_MK_VERSION = 1.2.0-657-ga84d0eb
# Core configuration.
@@ -4410,7 +4410,8 @@ define dep_autopatch_rebar.erl
end
end || P <- Plugins],
[RunPlugin(P, preprocess) || P <- Plugins],
- [RunPlugin(P, pre_compile) || P <- Plugins]
+ [RunPlugin(P, pre_compile) || P <- Plugins],
+ [RunPlugin(P, compile) || P <- Plugins]
end
end(),
halt()
@@ -4549,6 +4550,21 @@ $(foreach dep,$(DEPS),$(eval $(call dep_target,$(dep))))
distclean-deps:
$(gen_verbose) rm -rf $(DEPS_DIR)
+# External plugins.
+
+DEP_PLUGINS ?=
+
+define core_dep_plugin
+-include $(DEPS_DIR)/$(1)
+
+$(DEPS_DIR)/$(1): $(DEPS_DIR)/$(2) ;
+endef
+
+$(foreach p,$(DEP_PLUGINS),\
+ $(eval $(if $(findstring /,$p),\
+ $(call core_dep_plugin,$p,$(firstword $(subst /, ,$p))),\
+ $(call core_dep_plugin,$p/plugins.mk,$p))))
+
# Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License.