diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-03-24 12:18:18 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-03-24 12:18:18 +0000 |
| commit | 4805e61b933337de98bcfb301c114663d39ddef9 (patch) | |
| tree | 765f675c386628db11cfbe806a6b62350906fac0 | |
| parent | c93312651d40092e4d85a6a00d65cdd4774cdf10 (diff) | |
| parent | 1f913f8e27fdd59373b072bb7bc7f219dd461f71 (diff) | |
| download | rabbitmq-server-4805e61b933337de98bcfb301c114663d39ddef9.tar.gz | |
Merging default into bug 22550
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 3 |
3 files changed, 23 insertions, 5 deletions
@@ -209,7 +209,7 @@ distclean: clean $(SOURCE_DIR)/%_usage.erl: xsltproc --stringparam modulename "`basename $@ .erl`" \ $(DOCS_DIR)/usage.xsl $< | sed -e s/\\\"/\\\\\\\"/g | sed -e s/%QUOTE%/\\\"/g | \ - fmt -s > $@ + fold -s > $@ # We rename the file before xmlto sees it since xmlto will use the name of # the file to make internal links. @@ -240,8 +240,8 @@ install: all docs_all install_dirs done for section in 1 5; do \ mkdir -p $(MAN_DIR)/man$$section; \ - for manpage in $(DOCS_DIR)/*.$$section.pod; do \ - cp $(DOCS_DIR)/`basename $$manpage .pod`.gz $(MAN_DIR)/man$$section; \ + for manpage in $(DOCS_DIR)/*.$$section.gz; do \ + cp $$manpage $(MAN_DIR)/man$$section; \ done; \ done @@ -251,4 +251,20 @@ install_dirs: $(foreach XML, $(USAGES_XML), $(eval $(call usage_dep, $(XML)))) +# Note that all targets which depend on clean must have clean in their +# name. Also any target that doesn't depend on clean should not have +# clean in its name, unless you know that you don't need any of the +# automatic dependency generation for that target (eg cleandb). + +# We want to load the dep file if *any* target *doesn't* contain +# "clean" - i.e. if removing all clean-like targets leaves something + +ifeq "$(MAKECMDGOALS)" "" +TESTABLEGOALS:=$(.DEFAULT_GOAL) +else +TESTABLEGOALS:=$(MAKECMDGOALS) +endif + +ifneq "$(strip $(patsubst clean%,,$(patsubst %clean,,$(TESTABLEGOALS))))" "" -include $(DEPS_FILE) +endif diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 3ba150cb..f2f29169 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -46,6 +46,7 @@ -spec(stop/0 :: () -> 'ok'). -spec(action/4 :: (atom(), erlang_node(), [string()], fun ((string(), [any()]) -> 'ok')) -> 'ok'). +-spec(usage/0 :: () -> no_return()). -endif. @@ -129,7 +130,7 @@ parse_args([], _) -> stop() -> ok. -usage() -> +usage() -> rabbit_ctl_usage:usage(). action(stop, Node, [], Inform) -> diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 7b09a91d..9ff2c5cb 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -42,6 +42,7 @@ -spec(start/0 :: () -> no_return()). -spec(stop/0 :: () -> 'ok'). +-spec(usage/0 :: () -> no_return()). -endif. @@ -85,7 +86,7 @@ parse_args([Command | Args]) -> stop() -> ok. -usage() -> +usage() -> rabbit_multi_usage:usage(). action(start_all, [NodeCount], RpcTimeout) -> |