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

[platform/core/uifw/at-spi2-atk.git] / registryd / Makefile.am

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 50f2528..76a1555 100644 (file)
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -1,7 +1,7 @@
-server_dot_in = Accessibility_Registry.server.in
+#server_dot_in = Accessibility_Registry.server.in
 
-$(server_dot_in): $(server_dot_in).in
-       sed -e "s|\@REGISTRYD_PATH\@|$(libexecdir)|" $< > $@ 
+#$(server_dot_in): $(server_dot_in).in
+#      sed -e "s|\@REGISTRYD_PATH\@|$(libexecdir)|" $< > $@ 
 
 libexec_PROGRAMS = at-spi-registryd
 
@@ -9,6 +9,7 @@ INCLUDES = -I$(top_srcdir)          \
            -I$(top_builddir)        \
            -I$(top_builddir)/libspi \
            -I$(top_srcdir)/libspi   \
+           $(WARN_CFLAGS)      \
            $(REGISTRYD_CFLAGS)
 
 at_spi_registryd_SOURCES =             \
@@ -18,14 +19,16 @@ at_spi_registryd_SOURCES =          \
        deviceeventcontroller.h \
        registry-main.c         \
        registry.c              \
-       registry.h
+       registry.h              \
+       server-glue.h \
+       ucs2keysym.c
 
-LDADD = $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(REGISTRYD_LIBS) 
+LDADD = $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) 
 
-serverinfodir = $(libdir)/bonobo/servers
-serverinfo_DATA = Accessibility_Registry.server
+#serverinfodir = $(libdir)/bonobo/servers
+#serverinfo_DATA = Accessibility_Registry.server
 
 @INTLTOOL_SERVER_RULE@
 
-EXTRA_DIST = Accessibility_Registry.server.in.in $(serverinfo_DATA)
-CLEANFILES = $(serverinfo_DATA) $(server_dot_in)
+EXTRA_DIST = Accessibility_Registry.server.in.in
+#CLEANFILES = $(serverinfo_DATA) $(server_dot_in)