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

Conflicts:

	configure.ac

diff --git a/configure.ac b/configure.ac
index 747966b..857e2a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,8 +28,8 @@ AC_SUBST(LT_AGE)
 
 AM_INIT_AUTOMAKE([-Wall foreign])
 
-#Not yet performing translation
-#IT_PROG_INTLTOOL([0.35.0])
+dnl translation of any at-spi strings: used only for .server
+dnl IT_PROG_INTLTOOL([0.35.0])
 
 AC_PROG_CC
 AM_PATH_PYTHON(2.4)

diff --git a/cspi/Makefile.am b/cspi/Makefile.am
index 1b2275c..58a184c 100644 (file)
--- a/cspi/Makefile.am
+++ b/cspi/Makefile.am
@@ -28,7 +28,6 @@ libcspi_la_SOURCES =          \
        spi-main.c              \
        spi-registry.c \
        spi-selection.c \
-       spi-stateset.c \
        spi-streamablecontent.c \
        spi-table.c \
        spi-text.c \

diff --git a/cspi/spi-accessible.c b/cspi/spi-accessible.c
index 958c20c..7e324fa 100644 (file)
--- a/cspi/spi-accessible.c
+++ b/cspi/spi-accessible.c
@@ -22,7 +22,7 @@
  */
 
 #include <stdlib.h> /* for malloc */
-#include "spi-stateset.h"
+#include "spi-common/spi-stateset.h"
 #include <cspi/spi-private.h>
 
 static const char *role_names [] =

diff --git a/spi-common/Makefile.am b/spi-common/Makefile.am
index 5028bef..13c67bf 100644 (file)
--- a/spi-common/Makefile.am
+++ b/spi-common/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LTLIBRARIES = libspicommon.la
 
 libspicommon_la_CFLAGS = $(DBUS_GLIB_CFLAGS)\
+                       $(ATK_CFLAGS) \
                        -DATSPI_INTROSPECTION_PATH=\"$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"\
                        -I$(top_builddir)\
                        -I$(top_srcdir)
@@ -14,6 +15,7 @@ spicommoninclude_HEADERS =            \
        generated-types.h \
        keymasks.h \
        spi-dbus.h \
+       spi-stateset.h \
        spi-types.h
 
 BUILT_SOURCES = generated-types.h
@@ -25,7 +27,9 @@ libspicommon_la_SOURCES =     \
        event-types.h           \
        spi-types.h             \
        spi-dbus.h              \
-       spi-dbus.c
+       spi-dbus.c \
+       spi-stateset.h \
+       spi-stateset.c
 
 generated-types.h: $(top_srcdir)/xml/spec.xml $(top_srcdir)/tools/c-constants-generator.xsl
        xsltproc --stringparam mixed-case-prefix Accessibility_ $(top_srcdir)/tools/c-constants-generator.xsl $< >$@

diff --git a/cspi/spi-stateset.c b/spi-common/spi-stateset.c
similarity index 100%
rename from cspi/spi-stateset.c
rename to spi-common/spi-stateset.c

diff --git a/cspi/spi-stateset.h b/spi-common/spi-stateset.h
similarity index 98%
rename from cspi/spi-stateset.h
rename to spi-common/spi-stateset.h
index 99c4e9f..08e7148 100644 (file)
--- a/cspi/spi-stateset.h
+++ b/spi-common/spi-stateset.h
@@ -24,7 +24,7 @@
 #ifndef SPI_STATE_SET_H_
 #define SPI_STATE_SET_H_
 
-#include "spi-private.h"
+#include "spi-types.h"
 #include <atk/atkstateset.h>
 
 G_BEGIN_DECLS

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