121 files changed, 50 insertions, 65 deletions
diff --git a/Makefile.am b/Makefile.am
index 2dc007505..e60b9fcee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,11 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib m4
+SUBDIRS = m4 tools spec telepathy-glib tests docs
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-debug
+
+pkgconfigdir = ${libdir}/pkgconfig
+pkgconfig_DATA = telepathy-glib.pc telepathy-glib-unstable.pc
 
 EXTRA_DIST = \
     check-coding-style.mk \
@@ -8,7 +13,11 @@ EXTRA_DIST = \
     check-whitespace.sh \
     gtk-doc.make
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-debug
+CLEANFILES = FIXME.out
+
+check-local::
+	egrep -A 5 '[F]IXME|[T]ODO|[X]XX' $(srcdir)/telepathy-glib/*.[ch] \
+		> FIXME.out || true
 
 dist-hook:
 	chmod u+w ${distdir}/ChangeLog
diff --git a/_boring b/_boring
index 33c316c66..3c33ab047 100644
--- a/_boring
+++ b/_boring
@@ -63,31 +63,20 @@
 \-bindings.(c|h)$
 \-gen.h$
 \.pc$
-^data/gabble.manager$
-^(data|tests)/org.freedesktop.Telepathy.ConnectionManager.gabble.service$
-^src/telepathy-gabble$
-^lib/check_self_contained$
-^lib/spec/spec-gen\.am$
-^lib/telepathy-glib/_gen($|/)
-^src/write-mgr-file$
-^tests/test-base64$
-^tests/test-gabble-presence$
-^tests/test-handles$
-^tests/run-with-tmp-session-bus\.conf$
-^lib/tests/test-[-a-z]+$
+^spec/spec-gen\.am$
+^telepathy-glib/_gen($|/)
+^tests/test-[-a-z]+$
 (^|/)cscope\.out$
 (^|/)core$
 ^debian($|/)
 ^tags$
-^telepathy-gabble-0
-^lib/docs/reference/xml($|/)
-^lib/docs/reference/tmpl/.*\.sgml$
-^lib/docs/reference/tmpl/.*\.sgml$
-^lib/docs/reference/.*\.stamp$
-^lib/docs/reference/html($|/)
-^lib/docs/reference/telepathy-glib\.(args|hierarchy|interfaces|prerequisites|signals)$
-^lib/docs/reference/telepathy-glib-(undocumented|unused|decl|decl-list)\.txt$
-^lib/tools/update-spec-gen-am\.sh$
-^lib/FIXME\.out$
-^tests/gabble-[1-9][0-9]*\.log$
-^tests/exec-with-log\.sh$
+^telepathy-glib-0
+^docs/reference/xml($|/)
+^docs/reference/tmpl/.*\.sgml$
+^docs/reference/tmpl/.*\.sgml$
+^docs/reference/.*\.stamp$
+^docs/reference/html($|/)
+^docs/reference/telepathy-glib\.(args|hierarchy|interfaces|prerequisites|signals)$
+^docs/reference/telepathy-glib-(undocumented|unused|decl|decl-list)\.txt$
+^tools/update-spec-gen-am\.sh$
+^FIXME\.out$
diff --git a/autogen.sh b/autogen.sh
index 38d05dc77..4d22e8775 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,9 +8,9 @@ fi
 
 gtkdocize
 
-( cd lib/spec && sh ../tools/update-spec-gen-am.sh spec-gen.am )
-$MAKE -C lib/telepathy-glib -f stable-interfaces.mk _gen/stable-interfaces.txt
-( cd lib/telepathy-glib && sh ../tools/update-spec-gen-am.sh _gen/spec-gen.am _gen _gen/stable-interfaces.txt )
+( cd spec && TOP_SRCDIR=.. sh ../tools/update-spec-gen-am.sh spec-gen.am )
+$MAKE -C telepathy-glib -f stable-interfaces.mk _gen/stable-interfaces.txt
+( cd telepathy-glib && TOP_SRCDIR=.. sh ../tools/update-spec-gen-am.sh _gen/spec-gen.am _gen _gen/stable-interfaces.txt )
 
 autoreconf -i
 
diff --git a/configure.ac b/configure.ac
index c1578ebf9..03f9fd462 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,15 +177,13 @@ AC_CHECK_FUNCS(signal)
 AC_CHECK_HEADERS(signal.h)
 
 AC_OUTPUT( Makefile \
-	   lib/telepathy-glib.pc \
-	   lib/telepathy-glib-unstable.pc \
-	   lib/Makefile \
-	   lib/docs/Makefile \
-	   lib/docs/reference/Makefile \
-	   lib/spec/Makefile \
-	   lib/telepathy-glib/Makefile \
-	   lib/tests/Makefile \
-	   lib/tools/Makefile \
-	   lib/tools/update-spec-gen-am.sh \
+	   telepathy-glib.pc \
+	   telepathy-glib-unstable.pc \
+	   docs/Makefile \
+	   docs/reference/Makefile \
+	   spec/Makefile \
+	   telepathy-glib/Makefile \
+	   tests/Makefile \
+	   tools/Makefile \
 	   m4/Makefile \
 )
diff --git a/lib/.git-darcs-dir b/docs/.git-darcs-dir
index e69de29bb..e69de29bb 100644
--- a/lib/.git-darcs-dir
+++ b/docs/.git-darcs-dir
diff --git a/lib/docs/Makefile.am b/docs/Makefile.am
index f3ddc22dd..f3ddc22dd 100644
--- a/lib/docs/Makefile.am
+++ b/docs/Makefile.am
diff --git a/lib/docs/.git-darcs-dir b/docs/reference/.git-darcs-dir
index e69de29bb..e69de29bb 100644
--- a/lib/docs/.git-darcs-dir
+++ b/docs/reference/.git-darcs-dir
diff --git a/lib/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 1eaf15f8d..408f11ab3 100644
--- a/lib/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -33,14 +33,14 @@ SCAN_OPTIONS=
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
-# If _gen is a subdirectory of $(top_srcdir)/lib/telepathy-glib then we
+# If _gen is a subdirectory of $(top_srcdir)/telepathy-glib then we
 # already get it scanned by virtue of setting DOC_SOURCE_DIR. If
 # it's not a subdirectory, we'll have to add a second --source-dir
 # so both get scanned (we want the declarations and doc-comments in
 # the generated source to take effect).
 if OUT_OF_TREE_BUILD
-SCAN_OPTIONS += --source-dir=$(abs_top_builddir)/lib/telepathy-glib/_gen
-MKDB_OPTIONS += --source-dir=$(abs_top_builddir)/lib/telepathy-glib/_gen
+SCAN_OPTIONS += --source-dir=$(abs_top_builddir)/telepathy-glib/_gen
+MKDB_OPTIONS += --source-dir=$(abs_top_builddir)/telepathy-glib/_gen
 endif
 
 # Extra options to supply to gtkdoc-mktmpl
@@ -54,8 +54,8 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/lib/telepathy-glib/*.h $(top_builddir)/lib/telepathy-glib/_gen/*.h
-CFILE_GLOB=$(top_srcdir)/lib/telepathy-glib/*.c $(top_builddir)/lib/telepathy-glib/_gen/*.c
+HFILE_GLOB=$(top_srcdir)/telepathy-glib/*.h $(top_builddir)/telepathy-glib/_gen/*.h
+CFILE_GLOB=$(top_srcdir)/telepathy-glib/*.c $(top_builddir)/telepathy-glib/_gen/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -79,10 +79,10 @@ expand_content_files=
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=-I$(top_srcdir)/lib -I$(top_builddir)/lib \
+INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
 	 @DBUS_CFLAGS@ @GLIB_CFLAGS@
 GTKDOC_LIBS=@DBUS_LIBS@ @GLIB_LIBS@ \
-	    $(top_builddir)/lib/telepathy-glib/libtelepathy-glib.la
+	    $(top_builddir)/telepathy-glib/libtelepathy-glib.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/lib/docs/reference/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib-docs.sgml
index 4bdede5cb..4bdede5cb 100644
--- a/lib/docs/reference/telepathy-glib-docs.sgml
+++ b/docs/reference/telepathy-glib-docs.sgml
diff --git a/lib/docs/reference/telepathy-glib-overrides.txt b/docs/reference/telepathy-glib-overrides.txt
index e69de29bb..e69de29bb 100644
--- a/lib/docs/reference/telepathy-glib-overrides.txt
+++ b/docs/reference/telepathy-glib-overrides.txt
diff --git a/lib/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index f85f3f37d..f85f3f37d 100644
--- a/lib/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
diff --git a/lib/docs/reference/telepathy-glib.types b/docs/reference/telepathy-glib.types
index e6ab2538f..e6ab2538f 100644
--- a/lib/docs/reference/telepathy-glib.types
+++ b/docs/reference/telepathy-glib.types
diff --git a/lib/docs/reference/.git-darcs-dir b/docs/reference/tmpl/.git-darcs-dir
index e69de29bb..e69de29bb 100644
--- a/lib/docs/reference/.git-darcs-dir
+++ b/docs/reference/tmpl/.git-darcs-dir
diff --git a/lib/docs/reference/tmpl/dummy.sgml b/docs/reference/tmpl/dummy.sgml
index e69de29bb..e69de29bb 100644
--- a/lib/docs/reference/tmpl/dummy.sgml
+++ b/docs/reference/tmpl/dummy.sgml
diff --git a/lib/docs/reference/tp-svc.xml b/docs/reference/tp-svc.xml
index 8c35d6de1..8c35d6de1 100644
--- a/lib/docs/reference/tp-svc.xml
+++ b/docs/reference/tp-svc.xml
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index cb7e3e637..000000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-SUBDIRS = tools spec telepathy-glib tests docs
-EXTRA_DIST = telepathy-glib.pc.in
-
-pkgconfigdir = ${libdir}/pkgconfig
-pkgconfig_DATA = telepathy-glib.pc telepathy-glib-unstable.pc
-
-check-local::
-	egrep -A 5 '[F]IXME|[T]ODO|[X]XX' $(srcdir)/telepathy-glib/*.[ch] \
-		> FIXME.out || true
-
-CLEANFILES = FIXME.out
diff --git a/lib/tools/.git-darcs-dir b/lib/tools/.git-darcs-dir
deleted file mode 100644
index e69de29bb..000000000
--- a/lib/tools/.git-darcs-dir
+++ /dev/null
diff --git a/lib/docs/reference/tmpl/.git-darcs-dir b/spec/.git-darcs-dir
index e69de29bb..e69de29bb 100644
--- a/lib/docs/reference/tmpl/.git-darcs-dir
+++ b/spec/.git-darcs-dir
diff --git a/lib/spec/Channel.xml b/spec/Channel.xml
index 16149af2d..16149af2d 100644
--- a/lib/spec/Channel.xml
+++ b/spec/Channel.xml
diff --git a/lib/spec/Channel_Interface_Chat_State.xml b/spec/Channel_Interface_Chat_State.xml
index 29c011115..29c011115 100644
--- a/lib/spec/Channel_Interface_Chat_State.xml
+++ b/spec/Channel_Interface_Chat_State.xml
diff --git a/lib/spec/Channel_Interface_DTMF.xml b/spec/Channel_Interface_DTMF.xml
index 98957e029..98957e029 100644
--- a/lib/spec/Channel_Interface_DTMF.xml
+++ b/spec/Channel_Interface_DTMF.xml
diff --git a/lib/spec/Channel_Interface_Group.xml b/spec/Channel_Interface_Group.xml
index 922d8e568..922d8e568 100644
--- a/lib/spec/Channel_Interface_Group.xml
+++ b/spec/Channel_Interface_Group.xml
diff --git a/lib/spec/Channel_Interface_Hold.xml b/spec/Channel_Interface_Hold.xml
index 1f235212d..1f235212d 100644
--- a/lib/spec/Channel_Interface_Hold.xml
+++ b/spec/Channel_Interface_Hold.xml
diff --git a/lib/spec/Channel_Interface_Media_Signalling.xml b/spec/Channel_Interface_Media_Signalling.xml
index 4a0fcd254..4a0fcd254 100644
--- a/lib/spec/Channel_Interface_Media_Signalling.xml
+++ b/spec/Channel_Interface_Media_Signalling.xml
diff --git a/lib/spec/Channel_Interface_Password.xml b/spec/Channel_Interface_Password.xml
index a13c32fbc..a13c32fbc 100644
--- a/lib/spec/Channel_Interface_Password.xml
+++ b/spec/Channel_Interface_Password.xml
diff --git a/lib/spec/Channel_Interface_Transfer.xml b/spec/Channel_Interface_Transfer.xml
index 3ae490825..3ae490825 100644
--- a/lib/spec/Channel_Interface_Transfer.xml
+++ b/spec/Channel_Interface_Transfer.xml
diff --git a/lib/spec/Channel_Type_Contact_List.xml b/spec/Channel_Type_Contact_List.xml
index 3405ea595..3405ea595 100644
--- a/lib/spec/Channel_Type_Contact_List.xml
+++ b/spec/Channel_Type_Contact_List.xml
diff --git a/lib/spec/Channel_Type_Contact_Search.xml b/spec/Channel_Type_Contact_Search.xml
index 3c833678d..3c833678d 100644
--- a/lib/spec/Channel_Type_Contact_Search.xml
+++ b/spec/Channel_Type_Contact_Search.xml
diff --git a/lib/spec/Channel_Type_Room_List.xml b/spec/Channel_Type_Room_List.xml
index c2269a748..c2269a748 100644
--- a/lib/spec/Channel_Type_Room_List.xml
+++ b/spec/Channel_Type_Room_List.xml
diff --git a/lib/spec/Channel_Type_Streamed_Media.xml b/spec/Channel_Type_Streamed_Media.xml
index 5f27f1f03..5f27f1f03 100644
--- a/lib/spec/Channel_Type_Streamed_Media.xml
+++ b/spec/Channel_Type_Streamed_Media.xml
diff --git a/lib/spec/Channel_Type_Text.xml b/spec/Channel_Type_Text.xml
index 70d703583..70d703583 100644
--- a/lib/spec/Channel_Type_Text.xml
+++ b/spec/Channel_Type_Text.xml
diff --git a/lib/spec/Connection.xml b/spec/Connection.xml
index 15f695990..15f695990 100644
--- a/lib/spec/Connection.xml
+++ b/spec/Connection.xml
diff --git a/lib/spec/Connection_Interface_Aliasing.xml b/spec/Connection_Interface_Aliasing.xml
index 563741f69..563741f69 100644
--- a/lib/spec/Connection_Interface_Aliasing.xml
+++ b/spec/Connection_Interface_Aliasing.xml
diff --git a/lib/spec/Connection_Interface_Avatars.xml b/spec/Connection_Interface_Avatars.xml
index 34762baf3..34762baf3 100644
--- a/lib/spec/Connection_Interface_Avatars.xml
+++ b/spec/Connection_Interface_Avatars.xml
diff --git a/lib/spec/Connection_Interface_Capabilities.xml b/spec/Connection_Interface_Capabilities.xml
index 1385d1ce9..1385d1ce9 100644
--- a/lib/spec/Connection_Interface_Capabilities.xml
+++ b/spec/Connection_Interface_Capabilities.xml
diff --git a/lib/spec/Connection_Interface_Contact_Info.xml b/spec/Connection_Interface_Contact_Info.xml
index fe3fef590..fe3fef590 100644
--- a/lib/spec/Connection_Interface_Contact_Info.xml
+++ b/spec/Connection_Interface_Contact_Info.xml
diff --git a/lib/spec/Connection_Interface_Forwarding.xml b/spec/Connection_Interface_Forwarding.xml
index 2960a87fc..2960a87fc 100644
--- a/lib/spec/Connection_Interface_Forwarding.xml
+++ b/spec/Connection_Interface_Forwarding.xml
diff --git a/lib/spec/Connection_Interface_Presence.xml b/spec/Connection_Interface_Presence.xml
index 01ae6d32c..01ae6d32c 100644
--- a/lib/spec/Connection_Interface_Presence.xml
+++ b/spec/Connection_Interface_Presence.xml
diff --git a/lib/spec/Connection_Interface_Privacy.xml b/spec/Connection_Interface_Privacy.xml
index 24915093d..24915093d 100644
--- a/lib/spec/Connection_Interface_Privacy.xml
+++ b/spec/Connection_Interface_Privacy.xml
diff --git a/lib/spec/Connection_Interface_Renaming.xml b/spec/Connection_Interface_Renaming.xml
index 4583e80a5..4583e80a5 100644
--- a/lib/spec/Connection_Interface_Renaming.xml
+++ b/spec/Connection_Interface_Renaming.xml
diff --git a/lib/spec/Connection_Manager.xml b/spec/Connection_Manager.xml
index c398566dd..c398566dd 100644
--- a/lib/spec/Connection_Manager.xml
+++ b/spec/Connection_Manager.xml
diff --git a/lib/spec/Makefile.am b/spec/Makefile.am
index 6c23d4ff9..6c23d4ff9 100644
--- a/lib/spec/Makefile.am
+++ b/spec/Makefile.am
diff --git a/lib/spec/Media_Session_Handler.xml b/spec/Media_Session_Handler.xml
index e839a0af6..e839a0af6 100644
--- a/lib/spec/Media_Session_Handler.xml
+++ b/spec/Media_Session_Handler.xml
diff --git a/lib/spec/Media_Stream_Handler.xml b/spec/Media_Stream_Handler.xml
index 1652c708f..1652c708f 100644
--- a/lib/spec/Media_Stream_Handler.xml
+++ b/spec/Media_Stream_Handler.xml
diff --git a/lib/spec/Properties_Interface.xml b/spec/Properties_Interface.xml
index 177062691..177062691 100644
--- a/lib/spec/Properties_Interface.xml
+++ b/spec/Properties_Interface.xml
diff --git a/lib/spec/all.xml b/spec/all.xml
index be135ca38..be135ca38 100644
--- a/lib/spec/all.xml
+++ b/spec/all.xml
diff --git a/lib/spec/errors.xml b/spec/errors.xml
index db5935e1e..db5935e1e 100644
--- a/lib/spec/errors.xml
+++ b/spec/errors.xml
diff --git a/lib/telepathy-glib-unstable.pc.in b/telepathy-glib-unstable.pc.in
index 70c89c6eb..70c89c6eb 100644
--- a/lib/telepathy-glib-unstable.pc.in
+++ b/telepathy-glib-unstable.pc.in
diff --git a/lib/telepathy-glib.pc.in b/telepathy-glib.pc.in
index bb02f38cd..bb02f38cd 100644
--- a/lib/telepathy-glib.pc.in
+++ b/telepathy-glib.pc.in
diff --git a/lib/spec/.git-darcs-dir b/telepathy-glib/.git-darcs-dir
index e69de29bb..e69de29bb 100644
--- a/lib/spec/.git-darcs-dir
+++ b/telepathy-glib/.git-darcs-dir
diff --git a/lib/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index 2ff5ac4a6..2ff5ac4a6 100644
--- a/lib/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
diff --git a/lib/telepathy-glib/base-connection-manager.c b/telepathy-glib/base-connection-manager.c
index a87eed61e..a87eed61e 100644
--- a/lib/telepathy-glib/base-connection-manager.c
+++ b/telepathy-glib/base-connection-manager.c
diff --git a/lib/telepathy-glib/base-connection-manager.h b/telepathy-glib/base-connection-manager.h
index 2c9d6e47d..2c9d6e47d 100644
--- a/lib/telepathy-glib/base-connection-manager.h
+++ b/telepathy-glib/base-connection-manager.h
diff --git a/lib/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 5159a5b16..5159a5b16 100644
--- a/lib/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
diff --git a/lib/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index 7222d6737..7222d6737 100644
--- a/lib/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
diff --git a/lib/telepathy-glib/channel-factory-iface.c b/telepathy-glib/channel-factory-iface.c
index bb2ff4097..bb2ff4097 100644
--- a/lib/telepathy-glib/channel-factory-iface.c
+++ b/telepathy-glib/channel-factory-iface.c
diff --git a/lib/telepathy-glib/channel-factory-iface.h b/telepathy-glib/channel-factory-iface.h
index 25b13b7d0..25b13b7d0 100644
--- a/lib/telepathy-glib/channel-factory-iface.h
+++ b/telepathy-glib/channel-factory-iface.h
diff --git a/lib/telepathy-glib/channel-iface.c b/telepathy-glib/channel-iface.c
index 34cd72a10..34cd72a10 100644
--- a/lib/telepathy-glib/channel-iface.c
+++ b/telepathy-glib/channel-iface.c
diff --git a/lib/telepathy-glib/channel-iface.h b/telepathy-glib/channel-iface.h
index 3943b9c78..3943b9c78 100644
--- a/lib/telepathy-glib/channel-iface.h
+++ b/telepathy-glib/channel-iface.h
diff --git a/lib/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index ed46c6987..ed46c6987 100644
--- a/lib/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
diff --git a/lib/telepathy-glib/dbus.h b/telepathy-glib/dbus.h
index c6d428e3f..c6d428e3f 100644
--- a/lib/telepathy-glib/dbus.h
+++ b/telepathy-glib/dbus.h
diff --git a/lib/telepathy-glib/debug-ansi.h b/telepathy-glib/debug-ansi.h
index f805a1b55..f805a1b55 100644
--- a/lib/telepathy-glib/debug-ansi.h
+++ b/telepathy-glib/debug-ansi.h
diff --git a/lib/telepathy-glib/debug.c b/telepathy-glib/debug.c
index de59a58a0..de59a58a0 100644
--- a/lib/telepathy-glib/debug.c
+++ b/telepathy-glib/debug.c
diff --git a/lib/telepathy-glib/debug.h b/telepathy-glib/debug.h
index b5ed39880..b5ed39880 100644
--- a/lib/telepathy-glib/debug.h
+++ b/telepathy-glib/debug.h
diff --git a/lib/telepathy-glib/enums.h b/telepathy-glib/enums.h
index b809a9646..b809a9646 100644
--- a/lib/telepathy-glib/enums.h
+++ b/telepathy-glib/enums.h
diff --git a/lib/telepathy-glib/errors.c b/telepathy-glib/errors.c
index 67088dc66..67088dc66 100644
--- a/lib/telepathy-glib/errors.c
+++ b/telepathy-glib/errors.c
diff --git a/lib/telepathy-glib/errors.h b/telepathy-glib/errors.h
index 04c2f752d..04c2f752d 100644
--- a/lib/telepathy-glib/errors.h
+++ b/telepathy-glib/errors.h
diff --git a/lib/telepathy-glib/extra-gtkdoc.h b/telepathy-glib/extra-gtkdoc.h
index d9d293cdb..d9d293cdb 100644
--- a/lib/telepathy-glib/extra-gtkdoc.h
+++ b/telepathy-glib/extra-gtkdoc.h
diff --git a/lib/telepathy-glib/group-mixin.c b/telepathy-glib/group-mixin.c
index 606e3b902..606e3b902 100644
--- a/lib/telepathy-glib/group-mixin.c
+++ b/telepathy-glib/group-mixin.c
diff --git a/lib/telepathy-glib/group-mixin.h b/telepathy-glib/group-mixin.h
index f316e41e4..f316e41e4 100644
--- a/lib/telepathy-glib/group-mixin.h
+++ b/telepathy-glib/group-mixin.h
diff --git a/lib/telepathy-glib/handle-repo-dynamic.c b/telepathy-glib/handle-repo-dynamic.c
index 329e7c197..329e7c197 100644
--- a/lib/telepathy-glib/handle-repo-dynamic.c
+++ b/telepathy-glib/handle-repo-dynamic.c
diff --git a/lib/telepathy-glib/handle-repo-dynamic.h b/telepathy-glib/handle-repo-dynamic.h
index 44ca1e001..44ca1e001 100644
--- a/lib/telepathy-glib/handle-repo-dynamic.h
+++ b/telepathy-glib/handle-repo-dynamic.h
diff --git a/lib/telepathy-glib/handle-repo-static.c b/telepathy-glib/handle-repo-static.c
index 58304a343..58304a343 100644
--- a/lib/telepathy-glib/handle-repo-static.c
+++ b/telepathy-glib/handle-repo-static.c
diff --git a/lib/telepathy-glib/handle-repo-static.h b/telepathy-glib/handle-repo-static.h
index 63270d050..63270d050 100644
--- a/lib/telepathy-glib/handle-repo-static.h
+++ b/telepathy-glib/handle-repo-static.h
diff --git a/lib/telepathy-glib/handle-repo.c b/telepathy-glib/handle-repo.c
index 9744a3563..9744a3563 100644
--- a/lib/telepathy-glib/handle-repo.c
+++ b/telepathy-glib/handle-repo.c
diff --git a/lib/telepathy-glib/handle-repo.h b/telepathy-glib/handle-repo.h
index 5580205f8..5580205f8 100644
--- a/lib/telepathy-glib/handle-repo.h
+++ b/telepathy-glib/handle-repo.h
diff --git a/lib/telepathy-glib/handle-set.c b/telepathy-glib/handle-set.c
index c9c457596..c9c457596 100644
--- a/lib/telepathy-glib/handle-set.c
+++ b/telepathy-glib/handle-set.c
diff --git a/lib/telepathy-glib/handle.c b/telepathy-glib/handle.c
index 3039f6e35..3039f6e35 100644
--- a/lib/telepathy-glib/handle.c
+++ b/telepathy-glib/handle.c
diff --git a/lib/telepathy-glib/handle.h b/telepathy-glib/handle.h
index 8a757edf7..8a757edf7 100644
--- a/lib/telepathy-glib/handle.h
+++ b/telepathy-glib/handle.h
diff --git a/lib/telepathy-glib/heap.c b/telepathy-glib/heap.c
index 3f3ac4cdb..3f3ac4cdb 100644
--- a/lib/telepathy-glib/heap.c
+++ b/telepathy-glib/heap.c
diff --git a/lib/telepathy-glib/heap.h b/telepathy-glib/heap.h
index 37b737d08..37b737d08 100644
--- a/lib/telepathy-glib/heap.h
+++ b/telepathy-glib/heap.h
diff --git a/lib/telepathy-glib/interfaces.h b/telepathy-glib/interfaces.h
index 50ae62ec1..50ae62ec1 100644
--- a/lib/telepathy-glib/interfaces.h
+++ b/telepathy-glib/interfaces.h
diff --git a/lib/telepathy-glib/internal-debug.h b/telepathy-glib/internal-debug.h
index 96002978a..96002978a 100644
--- a/lib/telepathy-glib/internal-debug.h
+++ b/telepathy-glib/internal-debug.h
diff --git a/lib/telepathy-glib/internal-handle-repo.h b/telepathy-glib/internal-handle-repo.h
index f953ec5d5..f953ec5d5 100644
--- a/lib/telepathy-glib/internal-handle-repo.h
+++ b/telepathy-glib/internal-handle-repo.h
diff --git a/lib/telepathy-glib/intset.c b/telepathy-glib/intset.c
index 2215c1653..2215c1653 100644
--- a/lib/telepathy-glib/intset.c
+++ b/telepathy-glib/intset.c
diff --git a/lib/telepathy-glib/intset.h b/telepathy-glib/intset.h
index 1f726a48a..1f726a48a 100644
--- a/lib/telepathy-glib/intset.h
+++ b/telepathy-glib/intset.h
diff --git a/lib/telepathy-glib/properties-mixin.c b/telepathy-glib/properties-mixin.c
index c3d877d60..c3d877d60 100644
--- a/lib/telepathy-glib/properties-mixin.c
+++ b/telepathy-glib/properties-mixin.c
diff --git a/lib/telepathy-glib/properties-mixin.h b/telepathy-glib/properties-mixin.h
index ee3f5ddc3..ee3f5ddc3 100644
--- a/lib/telepathy-glib/properties-mixin.h
+++ b/telepathy-glib/properties-mixin.h
diff --git a/lib/telepathy-glib/run.c b/telepathy-glib/run.c
index a594c95d6..a594c95d6 100644
--- a/lib/telepathy-glib/run.c
+++ b/telepathy-glib/run.c
diff --git a/lib/telepathy-glib/run.h b/telepathy-glib/run.h
index 21c0ef3c4..21c0ef3c4 100644
--- a/lib/telepathy-glib/run.h
+++ b/telepathy-glib/run.h
diff --git a/lib/telepathy-glib/signals-marshal.list b/telepathy-glib/signals-marshal.list
index 3f517e2a3..3f517e2a3 100644
--- a/lib/telepathy-glib/signals-marshal.list
+++ b/telepathy-glib/signals-marshal.list
diff --git a/lib/telepathy-glib/stable-interfaces.mk b/telepathy-glib/stable-interfaces.mk
index a36d9e334..a36d9e334 100644
--- a/lib/telepathy-glib/stable-interfaces.mk
+++ b/telepathy-glib/stable-interfaces.mk
diff --git a/lib/telepathy-glib/svc-channel.h b/telepathy-glib/svc-channel.h
index 6eef569b1..6eef569b1 100644
--- a/lib/telepathy-glib/svc-channel.h
+++ b/telepathy-glib/svc-channel.h
diff --git a/lib/telepathy-glib/svc-connection-manager.h b/telepathy-glib/svc-connection-manager.h
index 31bb73a10..31bb73a10 100644
--- a/lib/telepathy-glib/svc-connection-manager.h
+++ b/telepathy-glib/svc-connection-manager.h
diff --git a/lib/telepathy-glib/svc-connection.h b/telepathy-glib/svc-connection.h
index f9c83dc57..f9c83dc57 100644
--- a/lib/telepathy-glib/svc-connection.h
+++ b/telepathy-glib/svc-connection.h
diff --git a/lib/telepathy-glib/svc-media-interfaces.h b/telepathy-glib/svc-media-interfaces.h
index e1d18b0ea..e1d18b0ea 100644
--- a/lib/telepathy-glib/svc-media-interfaces.h
+++ b/telepathy-glib/svc-media-interfaces.h
diff --git a/lib/telepathy-glib/svc-properties-interface.h b/telepathy-glib/svc-properties-interface.h
index 84e40155c..84e40155c 100644
--- a/lib/telepathy-glib/svc-properties-interface.h
+++ b/telepathy-glib/svc-properties-interface.h
diff --git a/lib/telepathy-glib/svc-unstable.h b/telepathy-glib/svc-unstable.h
index e27e6aad1..e27e6aad1 100644
--- a/lib/telepathy-glib/svc-unstable.h
+++ b/telepathy-glib/svc-unstable.h
diff --git a/lib/telepathy-glib/text-mixin.c b/telepathy-glib/text-mixin.c
index 6702662c0..6702662c0 100644
--- a/lib/telepathy-glib/text-mixin.c
+++ b/telepathy-glib/text-mixin.c
diff --git a/lib/telepathy-glib/text-mixin.h b/telepathy-glib/text-mixin.h
index 03c2da222..03c2da222 100644
--- a/lib/telepathy-glib/text-mixin.h
+++ b/telepathy-glib/text-mixin.h
diff --git a/lib/telepathy-glib/util.c b/telepathy-glib/util.c
index fb270856e..fb270856e 100644
--- a/lib/telepathy-glib/util.c
+++ b/telepathy-glib/util.c
diff --git a/lib/telepathy-glib/util.h b/telepathy-glib/util.h
index 3f36fa37c..3f36fa37c 100644
--- a/lib/telepathy-glib/util.h
+++ b/telepathy-glib/util.h
diff --git a/lib/telepathy-glib/.git-darcs-dir b/tests/.git-darcs-dir
index e69de29bb..e69de29bb 100644
--- a/lib/telepathy-glib/.git-darcs-dir
+++ b/tests/.git-darcs-dir
diff --git a/lib/tests/Makefile.am b/tests/Makefile.am
index a24cf1053..a24cf1053 100644
--- a/lib/tests/Makefile.am
+++ b/tests/Makefile.am
diff --git a/lib/tests/test-handle-set.c b/tests/test-handle-set.c
index 5077fc08a..5077fc08a 100644
--- a/lib/tests/test-handle-set.c
+++ b/tests/test-handle-set.c
diff --git a/lib/tests/test-heap.c b/tests/test-heap.c
index d20d1ce64..d20d1ce64 100644
--- a/lib/tests/test-heap.c
+++ b/tests/test-heap.c
diff --git a/lib/tests/test-internal-debug.c b/tests/test-internal-debug.c
index 62163a217..62163a217 100644
--- a/lib/tests/test-internal-debug.c
+++ b/tests/test-internal-debug.c
diff --git a/lib/tests/test-intset.c b/tests/test-intset.c
index 3c41d5f38..3c41d5f38 100644
--- a/lib/tests/test-intset.c
+++ b/tests/test-intset.c
diff --git a/lib/tests/test-util.c b/tests/test-util.c
index db1d74480..db1d74480 100644
--- a/lib/tests/test-util.c
+++ b/tests/test-util.c
diff --git a/lib/tests/.git-darcs-dir b/tools/.git-darcs-dir
index e69de29bb..e69de29bb 100644
--- a/lib/tests/.git-darcs-dir
+++ b/tools/.git-darcs-dir
diff --git a/lib/tools/Makefile.am b/tools/Makefile.am
index 45e9a374e..81e3f2351 100644
--- a/lib/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,4 +8,4 @@ EXTRA_DIST = \
     ls-interfaces.xsl \
     make-all-async.xsl \
     spec-to-introspect.xsl \
-    update-spec-gen-am.sh.in
+    update-spec-gen-am.sh
diff --git a/lib/tools/c-constants-generator.xsl b/tools/c-constants-generator.xsl
index 64b72e612..64b72e612 100644
--- a/lib/tools/c-constants-generator.xsl
+++ b/tools/c-constants-generator.xsl
diff --git a/lib/tools/c-interfaces-generator.xsl b/tools/c-interfaces-generator.xsl
index 5f2fa894c..5f2fa894c 100644
--- a/lib/tools/c-interfaces-generator.xsl
+++ b/tools/c-interfaces-generator.xsl
diff --git a/lib/tools/genginterface.py b/tools/genginterface.py
index b1d784ae5..b1d784ae5 100644
--- a/lib/tools/genginterface.py
+++ b/tools/genginterface.py
diff --git a/lib/tools/glib-errors-enum-body.xsl b/tools/glib-errors-enum-body.xsl
index 4a6e62b6c..4a6e62b6c 100644
--- a/lib/tools/glib-errors-enum-body.xsl
+++ b/tools/glib-errors-enum-body.xsl
diff --git a/lib/tools/glib-errors-enum-header.xsl b/tools/glib-errors-enum-header.xsl
index 5d2d12e90..5d2d12e90 100644
--- a/lib/tools/glib-errors-enum-header.xsl
+++ b/tools/glib-errors-enum-header.xsl
diff --git a/lib/tools/identity.xsl b/tools/identity.xsl
index 6630f84de..6630f84de 100644
--- a/lib/tools/identity.xsl
+++ b/tools/identity.xsl
diff --git a/lib/tools/ls-interfaces.xsl b/tools/ls-interfaces.xsl
index 7b970ce6f..7b970ce6f 100644
--- a/lib/tools/ls-interfaces.xsl
+++ b/tools/ls-interfaces.xsl
diff --git a/lib/tools/make-all-async.xsl b/tools/make-all-async.xsl
index 1dec391ff..1dec391ff 100644
--- a/lib/tools/make-all-async.xsl
+++ b/tools/make-all-async.xsl
diff --git a/lib/tools/spec-to-introspect.xsl b/tools/spec-to-introspect.xsl
index 1eefd3dbf..1eefd3dbf 100644
--- a/lib/tools/spec-to-introspect.xsl
+++ b/tools/spec-to-introspect.xsl
diff --git a/lib/tools/update-spec-gen-am.sh.in b/tools/update-spec-gen-am.sh
index edc8f61ac..dded98d9f 100644
--- a/lib/tools/update-spec-gen-am.sh.in
+++ b/tools/update-spec-gen-am.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-mk_specdir="lib/spec"
-mk_toolsdir="lib/tools"
+mk_specdir="spec"
+mk_toolsdir="tools"
 
-XSLTPROC=@XSLTPROC@
-top_srcdir=@abs_top_srcdir@
+test -n "$XSLTPROC" || XSLTPROC=xsltproc
+test -n "$TOP_SRCDIR" || TOP_SRCDIR=..
 
-toolsdir="${top_srcdir}/${mk_toolsdir}"
-specdir="${top_srcdir}/${mk_specdir}"
+toolsdir="${TOP_SRCDIR}/${mk_toolsdir}"
+specdir="${TOP_SRCDIR}/${mk_specdir}"
 
 outfile="$1"
 gendir="$2"
@@ -24,7 +24,7 @@ printf "\\t\\t\$(top_srcdir)/$mk_specdir/all.xml \\\\\\n"
 printf "\\t\\t\$(SPEC_INTERFACE_XMLS) \\\\\\n"
 printf "\\t\\t\$(top_srcdir)/$mk_toolsdir/ls-interfaces.xsl \\\\\\n"
 printf "\\t\\t\$(top_builddir)/$mk_toolsdir/update-spec-gen-am.sh\\n"
-printf "\\t\$(SHELL) \$(top_builddir)/$mk_toolsdir/update-spec-gen-am.sh $outfile $gendir $whitelist\\n"
+printf "\\tXSLTPROC=xsltproc TOP_SRCDIR=\$(top_srcdir) \$(SHELL) \$(top_builddir)/$mk_toolsdir/update-spec-gen-am.sh $outfile $gendir $whitelist\\n"
 echo
 
 for class in INTERFACES INTERFACE_XMLS GENERATED_CS GENERATED_HS \