diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-10-12 17:53:51 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2015-10-20 11:10:48 +0200 |
| commit | 51fd10caac23abcf89fe781bef685392d2809b2d (patch) | |
| tree | ab703497b08e2f4421369430a3e6613f0d9d0c06 /rabbitmq-components.mk | |
| parent | 706cf18bcae67b03a803c15eeabc38a80d9e85d1 (diff) | |
| download | rabbitmq-server-git-51fd10caac23abcf89fe781bef685392d2809b2d.tar.gz | |
Update erlang.mk and rabbitmq-components.mk
Diffstat (limited to 'rabbitmq-components.mk')
| -rw-r--r-- | rabbitmq-components.mk | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index a78ff1ad24..baf06c9519 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -14,12 +14,13 @@ endif RABBITMQ_REPO_BASE ?= https://github.com/rabbitmq -dep_amqp_client = git_rmq rabbitmq-erlang-client $(current_rmq_ref) $(base_rmq_ref) -dep_java_client = git_rmq rabbitmq-java-client $(current_rmq_ref) $(base_rmq_ref) -dep_rabbit = git_rmq rabbitmq-server $(current_rmq_ref) $(base_rmq_ref) -dep_rabbit_common = git_rmq rabbitmq-common $(current_rmq_ref) $(base_rmq_ref) -dep_rabbitmq_codegen = git_rmq rabbitmq-codegen $(current_rmq_ref) $(base_rmq_ref) -dep_rabbitmq_shovel = git_rmq rabbitmq-shovel $(current_rmq_ref) $(base_rmq_ref) +dep_amqp_client = git_rmq rabbitmq-erlang-client $(current_rmq_ref) $(base_rmq_ref) +dep_rabbit = git_rmq rabbitmq-server $(current_rmq_ref) $(base_rmq_ref) +dep_rabbit_common = git_rmq rabbitmq-common $(current_rmq_ref) $(base_rmq_ref) +dep_rabbitmq_codegen = git_rmq rabbitmq-codegen $(current_rmq_ref) $(base_rmq_ref) +dep_rabbitmq_java_client = git_rmq rabbitmq-java-client $(current_rmq_ref) $(base_rmq_ref) +dep_rabbitmq_shovel = git_rmq rabbitmq-shovel $(current_rmq_ref) $(base_rmq_ref) +dep_rabbitmq_test = git_rmq rabbitmq-test $(current_rmq_ref) $(base_rmq_ref) ifeq ($(origin current_rmq_ref),undefined) ifneq ($(wildcard .git),) @@ -70,6 +71,27 @@ deps:: check-rabbitmq-components.mk list-deps: check-rabbitmq-components.mk endif +# If this project is under the Umbrella project, we override $(DEPS_DIR) to point +# to the Umbrella's one. + +ifneq ($(PROJECT),rabbitmq_public_umbrella) +ifneq ($(wildcard ../../UMBRELLA.md),) +DEPS_DIR ?= $(abspath ..) +UNDER_UMBRELLA = 1 +$(info === DEPS_DIR = $(DEPS_DIR)) +endif +endif + +# When under the Umbrella, we must prevent `make distclean` from +# removing $(DEPS_DIR). + +ifeq ($(UNDER_UMBRELLA),1) +ifneq ($(filter distclean distclean-deps,$(MAKECMDGOALS)),) +SKIP_DEPS = 1 +$(info === Disable make distclean) +endif +endif + check-rabbitmq-components.mk: $(verbose) cmp -s rabbitmq-components.mk \ $(DEPS_DIR)/rabbit_common/mk/rabbitmq-components.mk || \ |