diff options
| author | Simon McVittie <http://smcv.pseudorandom.co.uk/> | 2008-11-19 14:28:53 +0000 |
|---|---|---|
| committer | Simon McVittie <http://smcv.pseudorandom.co.uk/> | 2008-11-19 14:28:53 +0000 |
| commit | 172d4672ab85a4ff02b63d4275a26539d57a44bc (patch) | |
| tree | 197dd1edeb3080a2b5107d23b7ca2870f556e1ce | |
| parent | fa2ede39e67950938da25f0be114f23b4601e239 (diff) | |
| download | telepathy-farstream-172d4672ab85a4ff02b63d4275a26539d57a44bc.tar.gz | |
Include tools/telepathy.am from telepathy-glib
Also add documentation-uploading to Makefile.am (from telepathy-glib again)
| -rw-r--r-- | Makefile.am | 24 | ||||
| -rw-r--r-- | tools/Makefile.am | 11 | ||||
| -rw-r--r-- | tools/telepathy.am | 27 |
3 files changed, 57 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 59f553e..e1b17f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,23 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = telepathy-farsight doc +SUBDIRS = m4 tools telepathy-farsight doc -dist-hook: - chmod a+w ${distdir}/ChangeLog - git log >${distdir}/ChangeLog +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc -DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc +EXTRA_DIST = \ + autogen.sh \ + gtk-doc.make + +maintainer-upload-release: _maintainer-upload-release-local +_maintainer-upload-release-local: _maintainer-upload-release-check + rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX doc/lib/html/ \ + telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-farsight/ + +BRANCH = misc +UPLOAD_BRANCH_TO = people.freedesktop.org:public_html/telepathy-farsight + +upload-branch-docs: all + rsync -rtzvPp --chmod=a+rX doc/lib/html/ \ + $(UPLOAD_BRANCH_TO)-$(BRANCH)/ + +include tools/telepathy.am diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 0000000..8875022 --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1,11 @@ +EXTRA_DIST = \ + telepathy.am + +TELEPATHY_GLIB_SRCDIR = $(top_srcdir)/../telepathy-glib +maintainer-update-from-telepathy-glib: + set -e && cd $(srcdir) && \ + for x in $(EXTRA_DIST); do \ + if test -f $(TELEPATHY_GLIB_SRCDIR)/tools/$$x; then \ + cp $(TELEPATHY_GLIB_SRCDIR)/tools/$$x $$x; \ + fi; \ + done diff --git a/tools/telepathy.am b/tools/telepathy.am new file mode 100644 index 0000000..d061b89 --- /dev/null +++ b/tools/telepathy.am @@ -0,0 +1,27 @@ +## Useful top-level Makefile.am snippets for Telepathy projects. + +dist-hook: + chmod u+w ${distdir}/ChangeLog + if test -d ${top_srcdir}/.git; then \ + git log --stat > ${distdir}/ChangeLog || \ + git log > ${distdir}/ChangeLog; \ + fi + +maintainer-upload-release: _maintainer-upload-release + +_maintainer-upload-release-check: + @case @VERSION@ in \ + (*.*.*.*) \ + echo "@VERSION@ is not a release" >&2; \ + exit 2; \ + ;; \ + esac + test -f @PACKAGE@-@VERSION@.tar.gz + test -f @PACKAGE@-@VERSION@.tar.gz.asc + gpg --verify @PACKAGE@-@VERSION@.tar.gz.asc + +_maintainer-upload-release: _maintainer-upload-release-check + rsync -vzP @PACKAGE@-@VERSION@.tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz + rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc + +## vim:set ft=automake: |