Merge branch 'master' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse

diff --git a/Makefile.am b/Makefile.am
index 44640b7..a6b9ea2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,15 +4,8 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc libloginhelper-1.0.pc
 
 EXTRA_DIST = \
-       intltool-extract.in \
-       intltool-merge.in   \
-       intltool-update.in  \
        cspi-1.0.pc.in \
        cspi-1.0-uninstalled.pc.in \
        libloginhelper-1.0.pc.in \
        libspi-1.0.pc.in \
        libspi-1.0-uninstalled.pc.in
-
-DISTCLEANFILES = intltool-extract \
-       intltool-merge  \
-       intltool-update

diff --git a/xml/Makefile.am b/xml/Makefile.am
index eb22872..7a68824 100644 (file)
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -29,7 +29,9 @@ XML_SPEC= \
 spec.xml: $(XML_SPEC)
        xsltproc --xinclude $(top_srcdir)/tools/identity.xsl $< >$@
 
-EXTRA_DIST = $(XML_SPEC)
+# I'm only adding spec.xml because it is needed to build other files that
+# are currently being distributed. -MPG
+EXTRA_DIST = $(XML_SPEC) spec.xml
 
 BUILT_SOURCES = spec.xml
 CLEANFILES = spec.xml