Build fixes.

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

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 6ae2ce2..a327658 100644 (file)
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -1,49 +1,55 @@
-libexec_PROGRAMS = at-spi-registryd
+libexec_PROGRAMS = at-spi2-registryd
 
-at_spi_registryd_CFLAGS = $(DBUS_GLIB_CFLAGS)  \
-                         $(GOBJ_CFLAGS)        \
-                         $(ATK_CFLAGS)         \
-                         $(GDK_CFLAGS)         \
-                         -I$(top_srcdir)       \
-                         -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
+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)\"
 
-at_spi_registryd_LDADD = $(DBUS_GLIB_LIBS)     \
-                        $(GOBJ_CFLAGS)         \
-                        $(ATK_LIBS)            \
-                        $(GDK_LIBS)            \
-                        $(X_LIBS)              \
-                        $(SM_LIBS)             \
-                        $(XTST_LIBS)           \
-                        $(XEVIE_LIBS)          \
-                        $(top_builddir)/droute/libdroute.la\
-                        $(top_builddir)/spi-common/libspicommon.la
+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)
 
-at_spi_registryd_SOURCES =     \
+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
 
-default_sessiondir = $(sysconfdir)/xdg/autostart
-default_session_in_in_files =                          \
-       at-spi-registryd.desktop.in.in
-default_session_in_files = $(default_session_in_in_files:.desktop.in.in=.desktop.in)
-default_session_DATA = $(default_session_in_files:.desktop.in=.desktop)
+servicedir       = $(DBUS_SERVICES_DIR)
+service_in_files = org.a11y.atspi.Registry.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
 
-%.desktop: %.desktop.in Makefile.am
-       sed -e "s,\@registryddir\@,$(libexecdir)," \
-       < $< > $@
-%.desktop.in: %.desktop.in.in Makefile.am
-       sed -e "s,\@registryddir\@,$(libexecdir)," \
-       < $< > $@
+$(service_DATA): $(service_in_files) Makefile
+       sed -e "s|[@]LIBEXECDIR[@]|$(libexecdir)|" $(srcdir)/$@.in > $@
 
-CLEANFILES =                   \
-       $(default_session_DATA) \
-       $(default_session_in_files)
 
-DISTCLEANFILES =               \
-       $(default_session_in_in_files)
+DISTCLEANFILES = org.a11y.atspi.Registry.service
+EXTRA_DIST = org.a11y.atspi.Registry.service.in