diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-09-12 13:30:23 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-09-12 13:30:23 +0300 |
| commit | 60c2a6163fe1fbc360763f24c1456261fa7d22c2 (patch) | |
| tree | d32fb536c2c2e9abc595a02eb2ccc2a033f053a8 /Makefile | |
| parent | acc39e857742cfb2ebbeb6675fd233913edf9552 (diff) | |
| parent | dc8a921682342e2b44a3dd59a76b08643ff3c0b5 (diff) | |
| download | rabbitmq-server-git-60c2a6163fe1fbc360763f24c1456261fa7d22c2.tar.gz | |
Merge branch 'stable' into rabbitmq-server-950
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -5,6 +5,7 @@ VERSION ?= $(call get_app_version,src/$(PROJECT).app.src) PACKAGES_DIR ?= $(abspath PACKAGES) DEPS = ranch $(PLUGINS) +TEST_DEPS = amqp_client meck proper define usage_xml_to_erl $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, src/rabbit_%_usage.erl, $(subst -,_,$(1)))) @@ -68,9 +69,6 @@ DEPS += $(DISTRIBUTED_DEPS) endif endif -# FIXME: Remove rabbitmq_test as TEST_DEPS from here for now. -TEST_DEPS := amqp_client meck $(filter-out rabbitmq_test,$(TEST_DEPS)) - include erlang.mk # -------------------------------------------------------------------- |