[Telepathy-commits] [telepathy-glib/master] Move "common" top-level Makefile stuff to tools/telepathy.am for easier sharing

[Simon McVittie]

---
 Makefile.am        |   18 +-----------------
 tools/Makefile.am  |    1 +
 tools/telepathy.am |   22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 tools/telepathy.am

diff --git a/Makefile.am b/Makefile.am
index 9feebc7..25670f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,20 +14,4 @@ check-local::
 	egrep -A 5 '[F]IXME|[T]ODO|[X]XX' $(srcdir)/telepathy-glib/*.[ch] \
 		> FIXME.out || true
 
-# Use git log --stat if it works, else plain git log
-dist-hook:
-	chmod u+w ${distdir}/ChangeLog
-	if test -d ${top_srcdir}/.git; then \
-		git log --stat > ${distdir}/ChangeLog || \
-		git log > ${distdir}/ChangeLog; \
-	fi
-
-if OFFICIAL_RELEASE
-maintainer-upload-release:
-	test -f telepathy-glib- at VERSION@.tar.gz
-	test -f telepathy-glib- at VERSION@.tar.gz.asc
-	gpg --verify telepathy-glib- at VERSION@.tar.gz.asc
-	rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX docs/reference/html/ \
-		telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib
-	rsync -vzP telepathy-glib- at VERSION@.tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/telepathy-glib/
-endif
+include tools/telepathy.am
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 0b4ceb8..576ee65 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST = \
     libtpcodegen.py \
     libglibcodegen.py \
     make-version-script.py \
+    telepathy.am \
     telepathy-glib-env.in \
     with-session-bus.sh
 
diff --git a/tools/telepathy.am b/tools/telepathy.am
new file mode 100644
index 0000000..f0fe870
--- /dev/null
+++ b/tools/telepathy.am
@@ -0,0 +1,22 @@
+## 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:
+	@case @VERSION@ in \
+		(*.*.*.*) \
+			echo "@VERSION@ is not a release" >&2; \
+			exit 2; \
+			;; \
+	esac
+	test -f @PACKAGE at -@VERSION at .tar.gz
+	test -f @PACKAGE at -@VERSION at .tar.gz.asc
+	gpg --verify @PACKAGE at -@VERSION at .tar.gz.asc
+	rsync -vzP @PACKAGE at -@VERSION at .tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE at -@VERSION at .tar.gz
+
+## vim:set ft=automake:
-- 
1.5.6.5