X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=registryd%2FMakefile.am;h=6a4b1d8bbb297485bd7fad9646993e2e4f761b8a;hb=b6f20b2db69e9b0d89f061546590a705b5f72ab2;hp=55852f53ede962a608821c794ce7372f261bd06b;hpb=1591741a68e87b54d8fd56615f85d80778f8a5dd;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 55852f5..6a4b1d8 100644
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -1,43 +1,68 @@
-libexec_PROGRAMS = at-spi-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_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
-
-at_spi_registryd_SOURCES =	\
+EXTRA_DIST = \
+	meson.build
+
+libexec_PROGRAMS = at-spi2-registryd
+
+at_spi2_registryd_CFLAGS =	\
+	$(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)		\
+	$(GIO_LIBS)		\
+	$(DBUS_LIBS)	\
+	$(GOBJ_CFLAGS)		\
+	$(ATK_LIBS)		\
+	$(X11_LIBS)		\
+	$(DL_LIBS)
+
+at_spi2_registryd_SOURCES =	\
 	de-marshaller.h         \
 	de-marshaller.c         \
 	de-types.h              \
-	keymasks.h              \
+	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	\
+	reentrant-list.h
+
+X11_SOURCES = \
+	deviceeventcontroller-x11.c \
+	display.h \
+	display.c \
+	event-source.c \
+	event-source.h \
 	ucs2keysym.c
 
-servicedir       = $(DBUS_SERVICES_DIR)
-service_in_files = org.freedesktop.atspi.Registry.service.in
+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)|" $< > $@
+	$(AM_V_GEN)$(SED) -e "s|[@]libexecdir[@]|$(libexecdir)|" $(srcdir)/$@.in > $@
+
+DISTCLEANFILES = org.a11y.atspi.Registry.service
+EXTRA_DIST += org.a11y.atspi.Registry.service.in
 
-DISTCLEANFILES = org.freedesktop.atspi.Registry.service
-EXTRA_DIST = org.freedesktop.atspi.Registry.service.in
+-include $(top_srcdir)/git.mk