diff options
| author | Jonny Lamb <jonnylamb@jonnylamb.com> | 2008-08-12 14:14:25 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@jonnylamb.com> | 2008-08-12 14:14:25 +0100 |
| commit | c39e758314c8bdda8b71eb7aad3870274d640ec8 (patch) | |
| tree | 10179326aeb92b3efed71bf31047a0dc7ed7bcc7 /docs | |
| parent | 4b0a253036d44d22e344d4e8b070035e521e5e45 (diff) | |
| parent | 3903a103107c43249619adcfae996b8c27e4e4d4 (diff) | |
Merge branch 'master' into tubes
Conflicts:
src/debug.c
src/debug.h
src/salut-bytestream-manager.h
src/salut-connection.c
src/salut-si-bytestream-manager.c
src/salut-tubes-channel.c
src/tube-stream.c
Signed-off-by: Jonny Lamb <jonnylamb@jonnylamb.com>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile.am | 38 | ||||
| -rw-r--r-- | docs/README | 6 |
2 files changed, 14 insertions, 30 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am index 306defe6..f5608c38 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,32 +1,22 @@ +tools_dir = $(top_srcdir)/tools + man_MANS = telepathy-salut.8 +html_DATA = clique.html + +EXTRA_DIST = \ + $(man_MANS:.8=.8.in) \ + $(html_DATA:.html=.xml) -EXTRA_DIST = $(man_MANS:.8=.8.in) -CLEANFILES = $(man_MANS) +CLEANFILES = \ + $(man_MANS) \ + $(html_DATA) %.8: %.8.in Makefile sed -e 's,[@]libexecdir[@],@libexecdir@,' < $< > $@ -# ---- Proto-XEPs (not automatically generated, see README) ---- - -PROTO_XEP_XML = \ - clique.xml -PROTO_XEP_HTML = $(PROTO_XEP_XML:.xml=.html) - -proto-xep-html: $(PROTO_XEP_HTML) -.PHONY: proto-xep-html +$(html_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: $(html_DATA) + rsync -P $(html_DATA) people.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 c133305a..00000000 --- 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 Salut 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. |