Build fixes.

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

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 19017a2..a327658 100644 (file)
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -1,18 +1,55 @@
-bin_PROGRAMS = registryd
+libexec_PROGRAMS = at-spi2-registryd
 
-INCLUDES = -I$(top_srcdir)          \
-           -I$(top_builddir)        \
-           -I$(top_builddir)/libspi \
-           -I$(top_srcdir)/libspi   \
-           $(REGISTRYD_CFLAGS)
+at_spi2_registryd_CFLAGS =     \
+       $(GLIB_CFLAGS)          \
+       $(GIO_CFLAGS)           \
+       $(DBUS_CFLAGS)  \
+       $(GOBJ_CFLAGS)          \
+       $(ATK_CFLAGS)           \
+       -I$(top_srcdir)         \
+       -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
 
-registryd_SOURCES = registryd.c
+at_spi2_registryd_LDADD =      \
+       ../atspi/libatspi.la \
+       $(GLIB_LIBS)            \
+       $(GIO_LIBS)             \
+       $(DBUS_LIBS)    \
+       $(GOBJ_CFLAGS)          \
+       $(ATK_LIBS)             \
+       $(X_LIBS)               \
+       $(SM_LIBS)              \
+       $(XTST_LIBS)            \
+       $(XEVIE_LIBS)           \
+       $(DL_LIBS)
 
-LDADD = ../libspi/libspi.la $(REGISTRYD_LIBS)
+at_spi2_registryd_SOURCES =    \
+       de-marshaller.h         \
+       de-marshaller.c         \
+       de-types.h              \
+       display.h               \
+       display.c               \
+       event-source.h          \
+       event-source.c          \
+       keymasks.h              \
+       paths.h                 \
+       registry-main.c         \
+       registry.c              \
+       registry.h              \
+       introspection.h         \
+       introspection.c         \
+       deviceeventcontroller.c \
+       deviceeventcontroller.h \
+       reentrant-list.c        \
+       reentrant-list.h        \
+       ucs2keysym.c
 
-oafinfodir = $(datadir)/oaf
-oafinfo_DATA = Accessibility_Registry.oaf
+servicedir       = $(DBUS_SERVICES_DIR)
+service_in_files = org.a11y.atspi.Registry.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
 
-@XML_I18N_MERGE_OAF_RULE@
+$(service_DATA): $(service_in_files) Makefile
+       sed -e "s|[@]LIBEXECDIR[@]|$(libexecdir)|" $(srcdir)/$@.in > $@
 
-EXTRA_DIST = Accessibility_Registry.oaf.in $(oafinfo_DATA)
+
+DISTCLEANFILES = org.a11y.atspi.Registry.service
+EXTRA_DIST = org.a11y.atspi.Registry.service.in