diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-09-20 11:53:50 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-09-20 11:53:50 +0200 |
| commit | bcde0c9bfd2642d28f949cb17150cc8d13f37a3e (patch) | |
| tree | bc94aa1ad4725bf7b8c23335c67b77ef9dd3df8e | |
| parent | 2de387b77200d5067c8a092e80a16ad11c9f7b32 (diff) | |
| download | rabbitmq-server-git-bcde0c9bfd2642d28f949cb17150cc8d13f37a3e.tar.gz | |
Makefile: Explicitely list all DEPS
Sync rabbitmq-components.mk with rabbitmq-common to remove automatic
DEPS handling.
[#130086871]
| -rw-r--r-- | deps/rabbitmq_sharding/Makefile | 3 | ||||
| -rw-r--r-- | deps/rabbitmq_sharding/rabbitmq-components.mk | 46 |
2 files changed, 2 insertions, 47 deletions
diff --git a/deps/rabbitmq_sharding/Makefile b/deps/rabbitmq_sharding/Makefile index d833469013..34a928f913 100644 --- a/deps/rabbitmq_sharding/Makefile +++ b/deps/rabbitmq_sharding/Makefile @@ -1,6 +1,7 @@ PROJECT = rabbitmq_sharding -TEST_DEPS = rabbit amqp_client rabbitmq_consistent_hash_exchange +DEPS = rabbit_common rabbit +TEST_DEPS = rabbitmq_ct_helpers amqp_client DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk diff --git a/deps/rabbitmq_sharding/rabbitmq-components.mk b/deps/rabbitmq_sharding/rabbitmq-components.mk index dbad95d738..e0f4c91287 100644 --- a/deps/rabbitmq_sharding/rabbitmq-components.mk +++ b/deps/rabbitmq_sharding/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. # -------------------------------------------------------------------- |