From 22cc2bb3de8a894884d6b682183a75b1626a28ff Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Fri, 25 Jul 2008 15:28:14 -0500 Subject: [PATCH] Move spi-stateset.c and spi-stateset.h into spi-common --- cspi/Makefile.am | 1 - spi-common/Makefile.am | 6 +++++- {cspi => spi-common}/spi-stateset.c | 0 {cspi => spi-common}/spi-stateset.h | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) rename {cspi => spi-common}/spi-stateset.c (100%) rename {cspi => spi-common}/spi-stateset.h (98%) diff --git a/cspi/Makefile.am b/cspi/Makefile.am index 1b2275c..58a184c 100644 --- 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/spi-common/Makefile.am b/spi-common/Makefile.am index 5028bef..13c67bf 100644 --- 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 --- 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 G_BEGIN_DECLS -- 2.7.4