1 files changed, 58 insertions, 31 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ee31d17..761ee03 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,51 +1,78 @@
+abs_top_builddir = @abs_top_builddir@
+
+noinst_SCRIPTS = telepathy-glib-env
+
+telepathy-glib-env: telepathy-glib-env.in Makefile
+	sed -e 's![@]abs_top_builddir[@]!$(abs_top_builddir)!' $< > $@
+	chmod +x $@
+
+if ENABLE_INSTALLED_TESTS
+toolsdir = @tpglibtestsdir@/tools
+tools_SCRIPTS = \
+	with-session-bus.sh \
+	test-wrapper.sh \
+	libglibcodegen.py \
+	libtpcodegen.py \
+	$(NULL)
+endif
+
 EXTRA_DIST = \
     c-constants-gen.py \
     check-coding-style.mk \
     check-c-style.sh \
     check-misc.sh \
     check-whitespace.sh \
-    doc-generator.py \
     doc-generator.xsl \
+    flymake.mk \
+    git-which-branch.sh \
     glib-client-gen.py \
     glib-client-marshaller-gen.py \
+    glib-errors-check-gen.py \
+    glib-errors-str-gen.py \
     glib-ginterface-gen.py \
     glib-gtypes-generator.py \
     glib-interfaces-gen.py \
-    glib-signals-marshal-gen.py \
-    identity.xsl \
+    gobject-foo.py \
     lcov.am \
-    libglibcodegen.py \
     libtpcodegen.py \
-    log-strip.py \
+    libglibcodegen.py \
     make-release-mail.py \
-    specparser.py \
+    make-version-script.py \
+    manager-file.py \
+    shave.mk \
     telepathy.am \
+    telepathy-glib.supp \
+    telepathy-glib-env.in \
     test-wrapper.sh \
-    valgrind.mk \
     with-session-bus.sh \
     xincludator.py
 
-CLEANFILES = *.pyc *.pyo
-
-#
-# FIXME: The following stuff break makedist
-#
-#all: $(EXTRA_DIST)
-
-#libglibcodegen.py: libtpcodegen.py
-#	test -e $<
-#	$(AM_V_GEN)touch $@
-
-#glib-ginterface-gen.py glib-gtypes-generator.py glib-interfaces-gen.py \
-#glib-signals-marshal-gen.py c-constants-gen.py: %: libglibcodegen.py
-#	test -e $<
-#	$(AM_V_GEN)touch $@
-
-#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
+CLEANFILES = libtpcodegen.pyc libtpcodegen.pyo libglibcodegen.pyc libglibcodegen.pyo $(noinst_SCRIPTS)
+
+all: $(EXTRA_DIST)
+
+libglibcodegen.py: libtpcodegen.py
+	$(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
+c-constants-gen.py: libglibcodegen.py
+	$(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
+glib-client-marshaller-gen.py: libglibcodegen.py
+	$(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
+glib-errors-enum-body-gen.py: libglibcodegen.py
+	$(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
+glib-errors-enum-header-gen.py: libglibcodegen.py
+	$(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
+glib-ginterface-gen.py: libglibcodegen.py
+	$(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
+glib-gtypes-generator.py: libglibcodegen.py
+	$(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
+glib-interfaces-gen.py: libglibcodegen.py
+	$(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
+
+TELEPATHY_SPEC_SRCDIR = $(top_srcdir)/../telepathy-spec
+maintainer-update-from-telepathy-spec:
+	set -e && cd $(srcdir) && \
+	for x in $(EXTRA_DIST); do \
+		if test -f $(TELEPATHY_SPEC_SRCDIR)/tools/$$x; then \
+			cp $(TELEPATHY_SPEC_SRCDIR)/tools/$$x $$x; \
+		fi; \
+	done