diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-09-19 11:37:56 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-09-19 11:57:08 +0200 |
| commit | 03cac547bd36aade0453628889f57aa5bb18625f (patch) | |
| tree | c61353b51315dcdf4494875c3c5e3bcf6b660dc8 | |
| parent | 64e6258a9f6b32d518f3550623268e7e9a173c09 (diff) | |
| download | rabbitmq-server-git-03cac547bd36aade0453628889f57aa5bb18625f.tar.gz | |
Makefile: Explicitely list all DEPS
Sync rabbitmq-components.mk with rabbitmq-common to remove automatic
DEPS handling.
[#130086871]
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | rabbitmq-components.mk | 46 |
2 files changed, 2 insertions, 48 deletions
@@ -4,8 +4,8 @@ VERSION ?= $(call get_app_version,src/$(PROJECT).app.src) # Release artifacts are put in $(PACKAGES_DIR). PACKAGES_DIR ?= $(abspath PACKAGES) -DEPS = ranch $(PLUGINS) -TEST_DEPS = amqp_client meck proper +DEPS = ranch rabbit_common $(PLUGINS) +TEST_DEPS = rabbitmq_ct_helpers amqp_client meck proper define usage_xml_to_erl $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, src/rabbit_%_usage.erl, $(subst -,_,$(1)))) diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index dbad95d738..e0f4c91287 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -5,16 +5,6 @@ ifeq ($(.DEFAULT_GOAL),) .DEFAULT_GOAL = all endif -# Automatically add rabbitmq-common to the dependencies, at least for -# the Makefiles. -ifneq ($(PROJECT),rabbit_common) -ifneq ($(PROJECT),rabbitmq_public_umbrella) -ifeq ($(filter rabbit_common,$(DEPS)),) -DEPS += rabbit_common -endif -endif -endif - # -------------------------------------------------------------------- # RabbitMQ components. # -------------------------------------------------------------------- @@ -248,42 +238,6 @@ prepare-dist:: @: # -------------------------------------------------------------------- -# Run a RabbitMQ node (moved from rabbitmq-run.mk as a workaround). -# -------------------------------------------------------------------- - -# Add "rabbit" to the build dependencies when the user wants to start -# a broker or to the test dependencies when the user wants to test a -# project. -# -# NOTE: This should belong to rabbitmq-run.mk. Unfortunately, it is -# loaded *after* erlang.mk which is too late to add a dependency. That's -# why rabbitmq-components.mk knows the list of targets which start a -# broker and add "rabbit" to the dependencies in this case. - -ifneq ($(PROJECT),rabbit) -ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS)),) -RUN_RMQ_TARGETS = run-broker \ - run-tls-broker \ - run-background-broker \ - run-node \ - run-background-node \ - start-background-node \ - start-background-broker \ - start-rabbit-on-node - -ifneq ($(filter $(RUN_RMQ_TARGETS),$(MAKECMDGOALS)),) -BUILD_DEPS += rabbit -endif -endif - -ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS) $(TEST_DEPS)),) -ifneq ($(filter check tests,$(MAKECMDGOALS)),) -TEST_DEPS += rabbit -endif -endif -endif - -# -------------------------------------------------------------------- # rabbitmq-components.mk checks. # -------------------------------------------------------------------- |