diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-08-27 17:12:32 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2015-10-20 11:10:48 +0200 |
| commit | 556f6e0bb1f38e32495b9941c8c78d368fb62c5f (patch) | |
| tree | 7965cb86595e60ec124be57e43ed964d8d33d858 | |
| parent | 10bf6e442bdfd2cd0604181f21ad4840321568e3 (diff) | |
| download | rabbitmq-server-git-556f6e0bb1f38e32495b9941c8c78d368fb62c5f.tar.gz | |
Use rabbit_common .ez archive instead of deps/
| -rw-r--r-- | Makefile | 21 |
1 files changed, 15 insertions, 6 deletions
@@ -1,6 +1,6 @@ PROJECT = rabbit -DEPS = rabbit_common +DEPS += rabbit_common dep_rabbit_common = git file:///home/dumbbell/Projects/pivotal/other-repos/rabbitmq-common master define usage_xml_to_erl @@ -23,6 +23,16 @@ ERLANG_MK_DISABLE_PLUGINS = edoc include erlang.mk +# TODO: Simplify this when support is added to erlang.mk. +ERLANG_MK_3RDPARTY_PLUGINS = $(DEPS_DIR)/rabbit_common/mk/rabbitmq-dist.mk +-include $(ERLANG_MK_3RDPARTY_PLUGINS) +$(ERLANG_MK_3RDPARTY_PLUGINS): $(DEPS_DIR)/rabbit_common + @: + +# -------------------------------------------------------------------- +# Compilation. +# -------------------------------------------------------------------- + COMPILE_FIRST = $(basename \ $(notdir \ $(shell grep -lw '^behaviour_info' src/*.erl))) @@ -136,19 +146,18 @@ RABBITMQ_MNESIA_DIR ?= $(TMPDIR)/rabbitmq-$(RABBITMQ_NODENAME)-mnesia RABBITMQ_PLUGINS_EXPAND_DIR ?= $(TMPDIR)/rabbitmq-$(RABBITMQ_NODENAME)-plugins-scratch RABBITMQ_LOG_BASE ?= $(TMPDIR) -RABBITMQ_DEPS_EBIN = $(patsubst %,-pa $(DEPS_DIR)/%/ebin,$(DEPS)) - BASIC_SCRIPT_ENVIRONMENT_SETTINGS=\ RABBITMQ_NODE_IP_ADDRESS="$(RABBITMQ_NODE_IP_ADDRESS)" \ RABBITMQ_NODE_PORT="$(RABBITMQ_NODE_PORT)" \ RABBITMQ_LOG_BASE="$(RABBITMQ_LOG_BASE)" \ RABBITMQ_MNESIA_DIR="$(RABBITMQ_MNESIA_DIR)" \ - RABBITMQ_PLUGINS_EXPAND_DIR="$(RABBITMQ_PLUGINS_EXPAND_DIR)" + RABBITMQ_PLUGINS_EXPAND_DIR="$(RABBITMQ_PLUGINS_EXPAND_DIR)" \ + ERL_LIBS="$(CURDIR)/dist:$(filter-out $(DEPS_DIR),$(subst :, ,$(ERL_LIBS)))" -run: all +run: dist $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ RABBITMQ_ALLOW_INPUT=true \ - RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) $(RABBITMQ_DEPS_EBIN)" \ + RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \ ./scripts/rabbitmq-server run-background: all |