meson: fix org.a11y.atspi.Registry.service

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

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index b4f929f..6a4b1d8 100644 (file)
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -1,33 +1,35 @@
+EXTRA_DIST = \
+       meson.build
+
 libexec_PROGRAMS = at-spi2-registryd
 
 at_spi2_registryd_CFLAGS =     \
        $(GLIB_CFLAGS)          \
-       $(DBUS_GLIB_CFLAGS)     \
+       $(GIO_CFLAGS)           \
+       $(DBUS_CFLAGS)          \
        $(GOBJ_CFLAGS)          \
        $(ATK_CFLAGS)           \
+       $(X11_CFLAGS)           \
        -I$(top_srcdir)         \
+       -I$(top_builddir)       \
+       -I$(top_builddir)/atspi \
        -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
 
 at_spi2_registryd_LDADD =      \
+       ../atspi/libatspi.la \
        $(GLIB_LIBS)            \
-       $(DBUS_GLIB_LIBS)       \
+       $(GIO_LIBS)             \
+       $(DBUS_LIBS)    \
        $(GOBJ_CFLAGS)          \
        $(ATK_LIBS)             \
-       $(X_LIBS)               \
-       $(SM_LIBS)              \
-       $(XTST_LIBS)            \
-       $(XEVIE_LIBS)           \
+       $(X11_LIBS)             \
        $(DL_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              \
+       keymasks.h              \
        paths.h                 \
        registry-main.c         \
        registry.c              \
@@ -37,16 +39,30 @@ at_spi2_registryd_SOURCES = \
        deviceeventcontroller.c \
        deviceeventcontroller.h \
        reentrant-list.c        \
-       reentrant-list.h        \
+       reentrant-list.h
+
+X11_SOURCES = \
+       deviceeventcontroller-x11.c \
+       display.h \
+       display.c \
+       event-source.c \
+       event-source.h \
        ucs2keysym.c
 
-servicedir       = $(DBUS_SERVICES_DIR)
+if USE_X11
+at_spi2_registryd_SOURCES += $(X11_SOURCES)
+else
+EXTRA_DIST += $(X11_SOURCES)
+endif
+
+servicedir=$(datadir)/dbus-1/accessibility-services
 service_in_files = org.a11y.atspi.Registry.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
-       sed -e "s|[@]LIBEXECDIR[@]|$(libexecdir)|" $(srcdir)/$@.in > $@
-
+       $(AM_V_GEN)$(SED) -e "s|[@]libexecdir[@]|$(libexecdir)|" $(srcdir)/$@.in > $@
 
 DISTCLEANFILES = org.a11y.atspi.Registry.service
-EXTRA_DIST = org.a11y.atspi.Registry.service.in
+EXTRA_DIST += org.a11y.atspi.Registry.service.in
+
+-include $(top_srcdir)/git.mk