[Telepathy-commits] [telepathy-gabble/master] Copy telepathy.am from telepathy-glib

[Simon McVittie]

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

diff --git a/Makefile.am b/Makefile.am
index 44bc674..313de5e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,26 +4,9 @@ SUBDIRS = docs tools extensions src data m4 tests
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-debug
 
-dist-hook:
-	chmod u+w ${distdir}/ChangeLog
-	if test -d ${top_srcdir}/.git; then \
-		git log --stat > ${distdir}/ChangeLog || \
-		git log > ${distdir}/ChangeLog; \
-	fi
-
 check-twisted: all
 	$(MAKE) -C tests/twisted check-twisted
 
 check-all: check check-twisted
 
-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@/
+include tools/telepathy.am
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 711a5ba..99cd2a0 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -12,6 +12,7 @@ EXTRA_DIST = \
     identity.xsl \
     libglibcodegen.py \
     libtpcodegen.py \
+    telepathy.am \
     xep.xsl
 
 CLEANFILES = *.pyc *.pyo
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