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

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 3b0a5e2..5507ea5 100644 (file)
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -27,7 +27,6 @@ libspiatk_la_SOURCES =                \
        hypertext.c             \
        atk-dbus.c              \
        image.c                 \
-       keymasks.h              \
        selection.c             \
        spi-private.h           \
        table.c                 \

diff --git a/configure.ac b/configure.ac
index cd49f79..079b175 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,9 @@ AC_SUBST(LT_AGE)
 
 AM_INIT_AUTOMAKE([-Wall foreign])
 
+dnl translation of any at-spi strings: used only for .server
+IT_PROG_INTLTOOL([0.35.0])
+
 AC_PROG_CC
 AM_PATH_PYTHON(2.4)
 AM_DISABLE_STATIC

diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xml/Makefile.am b/xml/Makefile.am
index 163b599..eb22872 100644 (file)
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -37,6 +37,7 @@ CLEANFILES = spec.xml
 INTROSPECT_FILES = $(addprefix introspection/,$(patsubst %.xml,%,$(filter org.freedesktop.atspi%,$(XML_SPEC))))
 
 $(INTROSPECT_FILES): introspection/%: %.xml ../tools/spec-to-introspect.xsl
+       @mkdir -p introspection
        xsltproc ../tools/spec-to-introspect.xsl $< |sed -e 's@xmlns:tp="http://telepathy\.freedesktop\.org/wiki/DbusSpec.extensions-v0"@@g' >$@
 
 introspectdir = $(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)