diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-09-02 19:27:22 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-09-02 19:27:22 +0300 |
| commit | 1c959076f376da63152dd757ecce9476023aca04 (patch) | |
| tree | 25493542515f5332a8ef89e38d5c6770f03f054e /Makefile | |
| parent | 864b9d9bf8d37f09798372f788637de95bf71d15 (diff) | |
| parent | 1e3c0b48edee2fdd4ed713faabf4ee5521ea7e59 (diff) | |
| download | rabbitmq-server-git-1c959076f376da63152dd757ecce9476023aca04.tar.gz | |
Merge branch 'stable' into rabbitmq-server-803-stable
Conflicts:
Makefile
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 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 proper $(filter-out rabbitmq_test,$(TEST_DEPS)) - include erlang.mk # -------------------------------------------------------------------- |