Skip to content
This repository was archived by the owner on Nov 17, 2020. It is now read-only.

Commit f6650ef

Browse files
committed
Makefile: Explicitely list all DEPS
Sync rabbitmq-components.mk with rabbitmq-common to remove automatic DEPS handling. [#130086871]
1 parent 90385b7 commit f6650ef

File tree

2 files changed

+2
-48
lines changed

2 files changed

+2
-48
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PROJECT = rabbitmq_auth_backend_http
22

3-
DEPS = amqp_client mochiweb
4-
TEST_DEPS = rabbit
3+
DEPS = rabbit_common rabbit amqp_client mochiweb
4+
TEST_DEPS = rabbitmq_ct_helpers
55

66
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
77

rabbitmq-components.mk

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@ ifeq ($(.DEFAULT_GOAL),)
55
.DEFAULT_GOAL = all
66
endif
77

8-
# Automatically add rabbitmq-common to the dependencies, at least for
9-
# the Makefiles.
10-
ifneq ($(PROJECT),rabbit_common)
11-
ifneq ($(PROJECT),rabbitmq_public_umbrella)
12-
ifeq ($(filter rabbit_common,$(DEPS)),)
13-
DEPS += rabbit_common
14-
endif
15-
endif
16-
endif
17-
188
# --------------------------------------------------------------------
199
# RabbitMQ components.
2010
# --------------------------------------------------------------------
@@ -247,42 +237,6 @@ list-dist-deps::
247237
prepare-dist::
248238
@:
249239

250-
# --------------------------------------------------------------------
251-
# Run a RabbitMQ node (moved from rabbitmq-run.mk as a workaround).
252-
# --------------------------------------------------------------------
253-
254-
# Add "rabbit" to the build dependencies when the user wants to start
255-
# a broker or to the test dependencies when the user wants to test a
256-
# project.
257-
#
258-
# NOTE: This should belong to rabbitmq-run.mk. Unfortunately, it is
259-
# loaded *after* erlang.mk which is too late to add a dependency. That's
260-
# why rabbitmq-components.mk knows the list of targets which start a
261-
# broker and add "rabbit" to the dependencies in this case.
262-
263-
ifneq ($(PROJECT),rabbit)
264-
ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS)),)
265-
RUN_RMQ_TARGETS = run-broker \
266-
run-tls-broker \
267-
run-background-broker \
268-
run-node \
269-
run-background-node \
270-
start-background-node \
271-
start-background-broker \
272-
start-rabbit-on-node
273-
274-
ifneq ($(filter $(RUN_RMQ_TARGETS),$(MAKECMDGOALS)),)
275-
BUILD_DEPS += rabbit
276-
endif
277-
endif
278-
279-
ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS) $(TEST_DEPS)),)
280-
ifneq ($(filter check tests,$(MAKECMDGOALS)),)
281-
TEST_DEPS += rabbit
282-
endif
283-
endif
284-
endif
285-
286240
# --------------------------------------------------------------------
287241
# rabbitmq-components.mk checks.
288242
# --------------------------------------------------------------------

0 commit comments

Comments
 (0)