diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-16 14:57:54 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-16 14:57:54 +0100 |
| commit | a3cf7d226fd1568f57e409efb6aade676683f832 (patch) | |
| tree | 24b8d8811adafde854d8bf5edc92aab13d7a463e | |
| parent | 606b7f97b0ae4e434f86038ad983b94e9e83f670 (diff) | |
| download | rabbitmq-server-git-a3cf7d226fd1568f57e409efb6aade676683f832.tar.gz | |
be smart about when building plugins
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/Makefile | 2 |
3 files changed, 12 insertions, 7 deletions
@@ -14,7 +14,7 @@ DOCS_DIR=docs INCLUDES=$(wildcard $(INCLUDE_DIR)/*.hrl) $(INCLUDE_DIR)/rabbit_framing.hrl SOURCES=$(wildcard $(SOURCE_DIR)/*.erl) $(SOURCE_DIR)/rabbit_framing_amqp_0_9_1.erl $(SOURCE_DIR)/rabbit_framing_amqp_0_8.erl $(USAGES_ERL) BEAM_TARGETS=$(patsubst $(SOURCE_DIR)/%.erl, $(EBIN_DIR)/%.beam, $(SOURCES)) -TARGETS=$(EBIN_DIR)/rabbit.app $(INCLUDE_DIR)/rabbit_framing.hrl $(BEAM_TARGETS) +TARGETS=$(EBIN_DIR)/rabbit.app $(INCLUDE_DIR)/rabbit_framing.hrl $(BEAM_TARGETS) plugins WEB_URL=http://www.rabbitmq.com/ MANPAGES=$(patsubst %.xml, %.gz, $(wildcard $(DOCS_DIR)/*.[0-9].xml)) WEB_MANPAGES=$(patsubst %.xml, %.man.xml, $(wildcard $(DOCS_DIR)/*.[0-9].xml) $(DOCS_DIR)/rabbitmq-service.xml) @@ -57,7 +57,7 @@ endif ERLC_OPTS=-I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall -v +debug_info $(call boolean_macro,$(USE_SPECS),use_specs) $(call boolean_macro,$(USE_PROPER_QC),use_proper_qc) VERSION=0.0.0 -PLUGINS_SRC_DIR= +PLUGINS_SRC_DIR?=$(shell [ -d "plugins-src" ] && echo "plugins-src" || echo ) PLUGINS_DIST_DIR?=provided_plugins TARBALL_NAME=rabbitmq-server-$(VERSION) TARGET_SRC_DIR=dist/$(TARBALL_NAME) @@ -104,11 +104,16 @@ endif all: $(TARGETS) .PHONY: plugins +ifneq "$(PLUGINS_SRC_DIR)" "" plugins: - [ -d "plugins-src" ] || { echo 'No plugins source distribution found (try linking public-umbrella to plugins-src/)'; false; } - -ln -s .. plugins-src/rabbitmq-server + [ -d "$(PLUGINS_SRC_DIR)" ] || { echo "No plugins source distribution found (try linking public-umbrella to $(PLUGINS_SRC_DIR)"; false; } + -ln -s .. "$(PLUGINS_SRC_DIR)/rabbitmq-server" mkdir -p provided_plugins - $(MAKE) -C plugins-src plugins-dist PLUGINS_DIST_DIR=$(CURDIR)/provided_plugins VERSION=$(VERSION) + $(MAKE) -C "$(PLUGINS_SRC_DIR)" plugins-dist PLUGINS_DIST_DIR="$(CURDIR)/provided_plugins" VERSION=$(VERSION) +else +plugins: +# Not building plugins +endif $(DEPS_FILE): $(SOURCES) $(INCLUDES) rm -f $@ diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index cd63109ff7..be37646234 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -44,7 +44,7 @@ endif cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate server: prepare - PLUGINS_DIST_DIR=$(PLUGINS_DIST_DIR) rpmbuild -ba --nodeps SPECS/rabbitmq-server.spec $(DEFINES) $(OS_DEFINES) + rpmbuild -ba --nodeps SPECS/rabbitmq-server.spec $(DEFINES) $(OS_DEFINES) clean: rm -rf SOURCES SPECS RPMS SRPMS BUILD tmp diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index 956cc60242..1b2fdd9e20 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -34,7 +34,7 @@ package: clean $(UNPACKED_DIR)/debian/rabbitmq-script-wrapper chmod a+x $(UNPACKED_DIR)/debian/rules UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR) - cd $(UNPACKED_DIR); PLUGINS_DIST_DIR=$(PLUGINS_DIST_DIR) GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) + cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) rm -rf $(UNPACKED_DIR) clean: |