diff options
| author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-01-13 12:23:38 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-01-13 12:23:38 +0100 |
| commit | 7c98f51b6c52d5b819317c7b4b249641417d2bb6 (patch) | |
| tree | 900bd93590e80e0f6ee839e44a890063505ec1f8 /Makefile | |
| parent | 636142506ccf1fb65058fe0ae8d997edcc25af65 (diff) | |
| parent | 670d986641cebf3db4d24c4c18b0cbc8132a9829 (diff) | |
| download | rabbitmq-server-git-7c98f51b6c52d5b819317c7b4b249641417d2bb6.tar.gz | |
Merge pull request #491 from rabbitmq/rabbitmq-server-94rabbitmq_v3_7_0_milestone1
Switch to Lager for logging
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -4,7 +4,9 @@ VERSION ?= $(call get_app_version,src/$(PROJECT).app.src) # Release artifacts are put in $(PACKAGES_DIR). PACKAGES_DIR ?= $(abspath PACKAGES) -DEPS = ranch $(PLUGINS) +DEPS = ranch lager $(PLUGINS) + +dep_lager = git https://github.com/rabbitmq/lager.git master define usage_xml_to_erl $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, src/rabbit_%_usage.erl, $(subst -,_,$(1)))) @@ -21,7 +23,8 @@ EXTRA_SOURCES += $(USAGES_ERL) .DEFAULT_GOAL = all $(PROJECT).d:: $(EXTRA_SOURCES) -DEP_PLUGINS = rabbit_common/mk/rabbitmq-run.mk \ +DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \ + rabbit_common/mk/rabbitmq-run.mk \ rabbit_common/mk/rabbitmq-dist.mk \ rabbit_common/mk/rabbitmq-tools.mk @@ -95,8 +98,6 @@ USE_PROPER_QC := $(shell $(ERL) -eval 'io:format({module, proper} =:= code:ensur RMQ_ERLC_OPTS += $(if $(filter true,$(USE_PROPER_QC)),-Duse_proper_qc) endif -ERLC_OPTS += $(RMQ_ERLC_OPTS) - clean:: clean-extra-sources clean-extra-sources: @@ -111,8 +112,6 @@ TARGETS_IN_RABBITMQ_TEST = $(patsubst %,%-in-rabbitmq_test,\ .PHONY: $(TARGETS_IN_RABBITMQ_TEST) -TEST_ERLC_OPTS += $(RMQ_ERLC_OPTS) - tests:: tests-in-rabbitmq_test $(TARGETS_IN_RABBITMQ_TEST): $(ERLANG_MK_RECURSIVE_TEST_DEPS_LIST) \ |