Push docs and a doc-tarball to the web on releasev1.4.0

* Makefile.am: add doc-publish target and make release-publish depend on
this.  This automatically uploads the new API documentation on release
* docs/reference/Makefile.am: upload the html documentation and a tarball of
the documentation to the cairographics.org site

3 files changed, 19 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index c1fdfe6..a7ea467 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
 
 2007-07-12  Jonathon Jongsma  <jjongsma@gnome.org>
 
+	* Makefile.am: add doc-publish target and make release-publish depend on
+	this.  This automatically uploads the new API documentation on release
+	* docs/reference/Makefile.am: upload the html documentation and a tarball of
+	the documentation to the cairographics.org site
+
+2007-07-12  Jonathon Jongsma  <jjongsma@gnome.org>
+
 	* docs/reference/Makefile.am: hacky workaround to get distcheck to pass
 
 2007-07-10  Jonathon Jongsma  <jjongsma@gnome.org>
diff --git a/Makefile.am b/Makefile.am
index 223e6e9..8d5ce0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,7 +77,10 @@ release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file)
 	ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_file) $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
 	$(GIT) tag -s -m "$(PACKAGE) release $(VERSION)" v$(VERSION)
 
-release-publish: release-upload releases/$(sha1_file)
+doc-publish:
+	(cd docs/reference && $(MAKE) $(AM_MAKEFLAGS) publish)
+
+release-publish: release-upload doc-publish releases/$(sha1_file)
 	@echo ""
 	@echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
 	@echo "including the following:"
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 59c27e0..14c9f3a 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -16,15 +16,18 @@ $(index_html): $(DOXYGEN_CONFIGFILE) $(wildcard $(top_srcdir)/cairomm/*.h) $(HTM
 	doxygen $(DOXYGEN_CONFIGFILE) \
 	2> doxygen-warnings.txt | tee doxygen-output.txt && cat doxygen-warnings.txt
 
-html: $(index_html)
+CAIROMM_DOC_TARNAME=$(PACKAGE)-doc.tar.gz
 
-cairomm-reference-html.tar.gz: $(index_html)
-	tar cf - html | gzip -c --best >$@
+doc-tarball : $(CAIROMM_DOC_TARNAME)
+
+$(CAIROMM_DOC_TARNAME): $(index_html)
+	tar cf - html | gzip -c --best > $@
 
 referencedir = $(datadir)/doc/libcairomm-1.0/reference/html
 
-publish:	html
-	rsync -avz --rsh ssh --cvs-exclude html/ $(WEB_SERVER):$(WEB_SERVER_PATH)
+publish: $(index_html) doc-tarball
+	rsync -avz --rsh ssh html/ $(WEB_SERVER):$(WEB_SERVER_PATH)
+	rsync -avz --rsh ssh $(CAIROMM_DOC_TARNAME) $(WEB_SERVER):$(WEB_SERVER_PATH)
 
 install-reference: $(index_html)
 	@$(NORMAL_INSTALL)