diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2018-01-30 15:23:25 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2018-01-30 15:23:25 +0100 |
| commit | 2fbece4d3c0ebc539ff5adf193dcdf06dbc35df0 (patch) | |
| tree | 76ead9511c2a98e2b8df25ba868eff6f87defc07 | |
| parent | 556d5093b5f654c276f3b40cacdaabe10864dd42 (diff) | |
| download | rabbitmq-server-git-2fbece4d3c0ebc539ff5adf193dcdf06dbc35df0.tar.gz | |
Update rabbitmq-components.mk
| -rw-r--r-- | rabbitmq-components.mk | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index b2b5f363cb..80b5e0dba9 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -303,7 +303,7 @@ prepare-dist:: @: # -------------------------------------------------------------------- -# rabbitmq-components.mk checks. +# Umbrella-specific settings. # -------------------------------------------------------------------- # If this project is under the Umbrella project, we override $(DEPS_DIR) @@ -325,28 +325,3 @@ ifneq ($(filter distclean distclean-deps,$(MAKECMDGOALS)),) SKIP_DEPS = 1 endif endif - -UPSTREAM_RMQ_COMPONENTS_MK = $(DEPS_DIR)/rabbit_common/mk/rabbitmq-components.mk - -ifeq ($(PROJECT),rabbit_common) -check-rabbitmq-components.mk: - @: -else -check-rabbitmq-components.mk: - $(verbose) cmp -s rabbitmq-components.mk \ - $(UPSTREAM_RMQ_COMPONENTS_MK) || \ - (echo "error: rabbitmq-components.mk must be updated!" 1>&2; \ - false) -endif - -ifeq ($(PROJECT),rabbit_common) -rabbitmq-components-mk: - @: -else -rabbitmq-components-mk: - $(gen_verbose) cp -a $(UPSTREAM_RMQ_COMPONENTS_MK) . -ifeq ($(DO_COMMIT),yes) - $(verbose) git diff --quiet rabbitmq-components.mk \ - || git commit -m 'Update rabbitmq-components.mk' rabbitmq-components.mk -endif -endif |