diff options
| author | Tony Garnock-Jones <tonygarnockjones@gmail.com> | 2010-06-06 14:31:09 +1200 |
|---|---|---|
| committer | Tony Garnock-Jones <tonygarnockjones@gmail.com> | 2010-06-06 14:31:09 +1200 |
| commit | a41546f34187a2789dabe2f054a42e679c033690 (patch) | |
| tree | 3da60ca9af99358b82af0f1181c656972e2516e2 /tools | |
| parent | f557f155ec3c7f52101415261fafcc8c56ed6ed2 (diff) | |
| download | rabbitmq-c-github-ask-a41546f34187a2789dabe2f054a42e679c033690.tar.gz | |
Fix up packaging: xmlto was getting confused in build/source separation
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 43 | ||||
| -rw-r--r-- | tools/doc/Makefile.am | 45 |
2 files changed, 47 insertions, 41 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 1500a67..2c47385 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS=doc + bin_PROGRAMS = amqp-publish amqp-get amqp-consume amqp-declare-queue amqp-delete-queue AM_CFLAGS = -I$(top_srcdir)/librabbitmq @@ -12,44 +14,3 @@ amqp_get_SOURCES = get.c common.c amqp_consume_SOURCES = consume.c common.c amqp_declare_queue_SOURCES = declare_queue.c common.c amqp_delete_queue_SOURCES = delete_queue.c common.c - -EXTRA_DIST = \ - doc/publish.xml \ - doc/consume.xml \ - doc/get.xml \ - doc/declare_queue.xml \ - doc/delete_queue.xml \ - doc/librabbitmq-tools.xml - -if TOOLS_DOC -man_MANS = \ - doc/amqp-publish.1 \ - doc/amqp-consume.1 \ - doc/amqp-get.1 \ - doc/amqp-declare-queue.1 \ - doc/amqp-delete-queue.1 \ - doc/librabbitmq-tools.7 -MOSTLYCLEANFILES = doc/man-date.ent - -# automake complains about % pattern rules, and suffix rules don't -# support multiple dependencies, so we have to expand all these out. -doc/amqp-publish.1: doc/publish.xml doc/man-date.ent - $(XMLTO) man -o doc $< -doc/amqp-consume.1: doc/consume.xml doc/man-date.ent - $(XMLTO) man -o doc $< -doc/amqp-get.1: doc/get.xml doc/man-date.ent - $(XMLTO) man -o doc $< -doc/amqp-declare-queue.1: doc/declare_queue.xml doc/man-date.ent - $(XMLTO) man -o doc $< -doc/amqp-delete-queue.1: doc/delete_queue.xml doc/man-date.ent - $(XMLTO) man -o doc $< -doc/librabbitmq-tools.7: doc/librabbitmq-tools.xml doc/man-date.ent - $(XMLTO) man -o doc $< - -doc/man-date.ent: - date +'%Y-%m-%d' >$@ - -clean:: - rm -f doc/man-date.ent - -endif diff --git a/tools/doc/Makefile.am b/tools/doc/Makefile.am new file mode 100644 index 0000000..db674d0 --- /dev/null +++ b/tools/doc/Makefile.am @@ -0,0 +1,45 @@ +EXTRA_DIST = \ + publish.xml \ + consume.xml \ + get.xml \ + declare_queue.xml \ + delete_queue.xml \ + librabbitmq-tools.xml + +if TOOLS_DOC +man_MANS = \ + amqp-publish.1 \ + amqp-consume.1 \ + amqp-get.1 \ + amqp-declare-queue.1 \ + amqp-delete-queue.1 \ + librabbitmq-tools.7 +MOSTLYCLEANFILES = man-date.ent + +# automake complains about % pattern rules, and suffix rules don't +# support multiple dependencies, so we have to expand all these out. +# +# Also, xmlto's --searchpath doesn't get passed through to xmllint, so +# we disable xmllint validation with --skip-validation for the benefit +# of build/source separation as required by distcheck, debian +# packaging etc. +amqp-publish.1: publish.xml man-date.ent + $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< +amqp-consume.1: consume.xml man-date.ent + $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< +amqp-get.1: get.xml man-date.ent + $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< +amqp-declare-queue.1: declare_queue.xml man-date.ent + $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< +amqp-delete-queue.1: delete_queue.xml man-date.ent + $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< +librabbitmq-tools.7: librabbitmq-tools.xml man-date.ent + $(XMLTO) --skip-validation --searchpath $(CURDIR) man $< + +man-date.ent: + date +'%Y-%m-%d' >$@ + +clean:: + rm -f man-date.ent + +endif |