2009-07-05 Mark Doffman <mark.doffman@codethink.co.uk>

        Remove the common library, move the code
        and headers directly in to registry daemon folder.

diff --git a/Makefile.am b/Makefile.am
index 34e1f53..b9b105c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=xml tools dbind droute common registryd
+SUBDIRS=xml tools dbind droute registryd
 
 ACLOCAL_AMFLAGS=-I m4
 

diff --git a/common/Makefile.am b/common/Makefile.am
deleted file mode 100644 (file)
index 02bb2bc..0000000
--- a/common/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-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)
-
-libspicommon_la_LIBADD = $(DBUS_GLIB_LIBS)
-
-libspicommon_la_SOURCES =      \
-       de-marshaller.h \
-       de-marshaller.c \
-       de-types.h \
-       keymasks.h \
-       paths.h
-
-#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/configure.ac b/configure.ac
index bbe1667..6501bf5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -143,7 +143,6 @@ AC_CONFIG_FILES([Makefile
                 xml/Makefile
                 tools/Makefile
                 droute/Makefile
-                common/Makefile
                 registryd/Makefile
                 dbind/Makefile
                 dbind/dbind-config.h])

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 48fb181..254216f 100644 (file)
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -15,10 +15,14 @@ at_spi_registryd_LDADD = $(DBUS_GLIB_LIBS)  \
                         $(XTST_LIBS)           \
                         $(XEVIE_LIBS)          \
                         $(top_builddir)/droute/libdroute.la\
-                        $(top_builddir)/dbind/libdbind.la\
-                        $(top_builddir)/common/libspicommon.la
+                        $(top_builddir)/dbind/libdbind.la
 
 at_spi_registryd_SOURCES =     \
+       de-marshaller.h         \
+       de-marshaller.c         \
+       de-types.h              \
+       keymasks.h              \
+       paths.hi                \
        registry-main.c         \
        registry.c              \
        registry.h              \

diff --git a/common/de-marshaller.c b/registryd/de-marshaller.c
similarity index 100%
rename from common/de-marshaller.c
rename to registryd/de-marshaller.c

diff --git a/common/de-marshaller.h b/registryd/de-marshaller.h
similarity index 100%
rename from common/de-marshaller.h
rename to registryd/de-marshaller.h

diff --git a/common/de-types.h b/registryd/de-types.h
similarity index 100%
rename from common/de-types.h
rename to registryd/de-types.h

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index eba3883..55f2eeb 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -53,13 +53,13 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkwindow.h>
 
-#include <common/paths.h>
-#include <common/keymasks.h>
-#include <common/de-types.h>
-#include <common/de-marshaller.h>
-
 #include <droute/droute.h>
 
+#include "paths.h"
+#include "keymasks.h"
+#include "de-types.h"
+#include "de-marshaller.h"
+
 #include "deviceeventcontroller.h"
 #include "reentrant-list.h"
 

diff --git a/common/keymasks.h b/registryd/keymasks.h
similarity index 100%
rename from common/keymasks.h
rename to registryd/keymasks.h

diff --git a/common/paths.h b/registryd/paths.h
similarity index 100%
rename from common/paths.h
rename to registryd/paths.h

diff --git a/registryd/registry-main.c b/registryd/registry-main.c
index e29075a..64cfe52 100644 (file)
--- a/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@ -26,9 +26,9 @@
 #include <string.h>
 #include <glib/gmain.h>
 
-#include <common/paths.h>
 #include <droute/droute.h>
 
+#include "paths.h"
 #include "registry.h"
 #include "deviceeventcontroller.h"
 

diff --git a/registryd/registry.c b/registryd/registry.c
index 2b19db0..8a3d8f0 100644 (file)
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -23,9 +23,9 @@
  */
 
 #include <config.h>
-#include <common/paths.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include "paths.h"
 #include "registry.h"
 
 enum