X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=registryd%2FMakefile.am;h=1e2e953d8b9fd4bfef827adfe9be208840b4d74e;hb=d202f76f8965ceadd21e4095c87a6d4805c2febc;hp=2fe3a77979a1813596641e1d441af2a676c81bac;hpb=03f79d95800447521c74a6963b2a4f07edb1adf6;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 2fe3a77..1e2e953 100644
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -1,30 +1,71 @@
-server = Accessibility_Registry.server
+libexec_PROGRAMS = at-spi2-registryd
 
-$(server): $(server).in.in
-	sed -e "s|\@REGISTRYD_PATH\@|$(libexecdir)|" $< > $@ 
+at_spi2_registryd_LDFLAGS = -pie
+at_spi2_registryd_CFLAGS =	\
+	-fPIE \
+	$(GLIB_CFLAGS)		\
+	$(GIO_CFLAGS)		\
+	$(DBUS_CFLAGS)	\
+	$(GOBJ_CFLAGS)		\
+	$(ATK_CFLAGS)		\
+	-I$(top_srcdir)		\
+	-I$(top_builddir)	\
+	-I$(top_builddir)/atspi	\
+	-DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
 
-libexec_PROGRAMS = at-spi-registryd
+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)
 
-INCLUDES = -I$(top_srcdir)          \
-           -I$(top_builddir)        \
-           -I$(top_builddir)/libspi \
-           -I$(top_srcdir)/libspi   \
-           $(REGISTRYD_CFLAGS)
-
-at_spi_registryd_SOURCES =		\
-	desktop.c		\
-	desktop.h		\
-	deviceeventcontroller.c	\
-	deviceeventcontroller.h	\
+at_spi2_registryd_SOURCES =	\
+	de-marshaller.h         \
+	de-marshaller.c         \
+	de-types.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	\
 	ucs2keysym.c
 
-LDADD = $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) 
+X11_SOURCES = \
+	deviceeventcontroller-x11.c \
+	display.h		\
+	display.c		\
+	event-source.c \
+	event-source.h
+
+if USE_X11
+at_spi2_registryd_SOURCES += $(X11_SOURCES)
+EXTRA_DIST = 
+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 > $@
+
 
-serverinfodir = $(libdir)/bonobo/servers
-serverinfo_DATA = Accessibility_Registry.server
+DISTCLEANFILES = org.a11y.atspi.Registry.service
+EXTRA_DIST += org.a11y.atspi.Registry.service.in
 
-EXTRA_DIST = Accessibility_Registry.server.in.in $(serverinfo_DATA)
-CLEANFILES = $(serverinfo_DATA) $(server_dot_in)
+-include $(top_srcdir)/git.mk