root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Makefile: Explicitely list all DEPS 

Sync rabbitmq-components.mk with rabbitmq-common to remove automatic
DEPS handling.

[#130086871]
This commit is contained in:
Jean-Sébastien Pédron 2016-09-19 13:48:10 +02:00
parent 758308af9f
commit 6e56d54bb1
2 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/rabbitmq_event_exchange/Makefile vendored
View File

@ -1,7 +1,7 @@
PROJECT = rabbitmq_event_exchange PROJECT = rabbitmq_event_exchange
TEST_DEPS += amqp_client DEPS = rabbit_common rabbit
TEST_DEPS += rabbit TEST_DEPS = rabbitmq_ct_helpers amqp_client
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

46
deps/rabbitmq_event_exchange/rabbitmq-components.mk vendored
View File

@ -5,16 +5,6 @@ ifeq ($(.DEFAULT_GOAL),)
.DEFAULT_GOAL = all .DEFAULT_GOAL = all
endif 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. # RabbitMQ components.
# -------------------------------------------------------------------- # --------------------------------------------------------------------
@ -247,42 +237,6 @@ list-dist-deps::
prepare-dist:: 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. # rabbitmq-components.mk checks.
# -------------------------------------------------------------------- # --------------------------------------------------------------------