diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-10-26 12:00:37 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-10-26 12:00:37 +0100 |
| commit | af19ac0684ef604a63aec27bdc4cf1aa73549b30 (patch) | |
| tree | 36964d1bd2271c60aba527eb5f4bb33efd7c351f | |
| parent | 3f7c064ee70857b1f840c2e848fa88638c900fe9 (diff) | |
| download | rabbitmq-server-git-af19ac0684ef604a63aec27bdc4cf1aa73549b30.tar.gz | |
make source-dist: Properly list distributed components
I was waiting for the erlang.mk branch to be merged.
| -rw-r--r-- | Makefile | 33 |
1 files changed, 22 insertions, 11 deletions
@@ -3,17 +3,6 @@ VERSION ?= $(call get_app_version,src/$(PROJECT).app.src) DEPS = $(PLUGINS) -SRCDIST_DEPS ?= rabbitmq_shovel - -ifneq ($(IS_DEP),1) -ifneq ($(filter source-dist packages package-%,$(MAKECMDGOALS)),) -DEPS += $(SRCDIST_DEPS) -endif -ifneq ($(wildcard git-revisions.txt),) -DEPS += $(SRCDIST_DEPS) -endif -endif - define usage_xml_to_erl $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, src/rabbit_%_usage.erl, $(subst -,_,$(1)))) endef @@ -44,6 +33,28 @@ ERLANG_MK_REPO = https://github.com/rabbitmq/erlang.mk.git ERLANG_MK_COMMIT = rabbitmq-tmp include rabbitmq-components.mk + +# When we distribute RabbitMQ, we want to include all plugins. Therefore +# we take the listed components, then we filter out the broker itself, +# the test framework, the non-Erlang clients and the dependencies +# already listed. +DISTRIBUTED_DEPS := $(filter-out \ + rabbit \ + rabbitmq_test \ + rabbitmq_java_client \ + rabbitmq_dotnet_client \ + $(DEPS), \ + $(RABBITMQ_COMPONENTS)) + +ifneq ($(IS_DEP),1) +ifneq ($(filter source-dist packages package-%,$(MAKECMDGOALS)),) +DEPS += $(DISTRIBUTED_DEPS) +endif +ifneq ($(wildcard git-revisions.txt),) +DEPS += $(DISTRIBUTED_DEPS) +endif +endif + include erlang.mk # -------------------------------------------------------------------- |