summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2008-04-22 17:10:17 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2008-04-22 17:10:17 +0000
commit352bbbea9cfd292befb14027f3505d3e13cdf706 (patch)
treed99dc5d3792c4375e8a4da60e79e5dcf55f51b79 /docs
parent0fce1384aaeceb9a3cfa8cf689cb8f30c428b5f2 (diff)
Build documentation by default
Diffstat (limited to 'docs')
-rw-r--r--docs/Makefile.am43
-rw-r--r--docs/README6
2 files changed, 17 insertions, 32 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 032d1f6a1..c54e82664 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,34 +1,25 @@
+tools_dir = $(top_srcdir)/tools
+
man_MANS = telepathy-gabble.8
+doc_DATA = \
+ olpc.html \
+ muc-bytestream.html \
+ tubes.html
+
+EXTRA_DIST = \
+ $(man_MANS:.8=.8.in) \
+ $(doc_DATA:.html=.xml)
-EXTRA_DIST = $(man_MANS:.8=.8.in)
-CLEANFILES = $(man_MANS)
+CLEANFILES = \
+ $(man_MANS) \
+ $(doc_DATA)
%.8: %.8.in Makefile
sed -e 's,[@]libexecdir[@],@libexecdir@,' < $< > $@
-# ---- Proto-XEPs (not automatically generated, see README) ----
-
-PROTO_XEP_XML = \
- olpc.xml \
- muc-bytestream.xml \
- tubes.xml
-PROTO_XEP_HTML = $(PROTO_XEP_XML:.xml=.html)
-
-proto-xep-html: $(PROTO_XEP_HTML)
-.PHONY: proto-xep-html
+$(doc_DATA): %.html: %.xml $(tools_dir)/xep.xsl
+ $(XSLTPROC) $(tools_dir)/xep.xsl $< > $@
-$(PROTO_XEP_HTML): %.html: %.xml xep.xsl
- $(XSLTPROC) xep.xsl $< > $@
-.PHONY: proto-xep-html
-
-proto-xep-upload: proto-xep-html
- rsync -P $(PROTO_XEP_HTML) projects.collabora.co.uk:public_html/
+proto-xep-upload: $(doc_DATA)
+ rsync -P $(doc_DATA) projects.collabora.co.uk:public_html/
.PHONY: proto-xep-upload
-
-xep.xsl:
- @echo "Please get xep.xsl from xmpp.org svn - see README for details"
- @echo "This command might work:"
- @echo "wget 'http://svn.xmpp.org:18080/browse/~raw,r=1214/XMPP/trunk/extensions/xep.xsl'"
- @exit 1
-
-EXTRA_DIST += $(PROTO_XEP_XML)
diff --git a/docs/README b/docs/README
deleted file mode 100644
index be323e079..000000000
--- a/docs/README
+++ /dev/null
@@ -1,6 +0,0 @@
-To produce HTML versions of the "Tubes over XMPP" and "MUC Bytestreams"
-proto-XEPs, you'll need to obtain xep.xsl from
-svn://svn.xmpp.org:7398/xmpp/trunk/extensions/ and put it in this directory.
-It's not distributed with Gabble due to unclear licensing. As a result,
-the proto-XEPs aren't compiled to HTML by a normal build - you have to run
-"make -C docs proto-xep-html" explicitly.