Apply address space layout randomization (ASLR)

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

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 9206a3c..1e2e953 100644 (file)
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -1,23 +1,32 @@
-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 =     \
+libexec_PROGRAMS = at-spi2-registryd
+
+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)\"
+
+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_spi2_registryd_SOURCES =    \
        de-marshaller.h         \
        de-marshaller.c         \
        de-types.h              \
@@ -26,36 +35,37 @@ at_spi_registryd_SOURCES =  \
        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)
-
-%.desktop: %.desktop.in Makefile.am
-       sed -e "s,\@registryddir\@,$(libexecdir)," \
-       < $< > $@
-%.desktop.in: %.desktop.in.in Makefile.am
-       sed -e "s,\@registryddir\@,$(libexecdir)," \
-       < $< > $@
-
-CLEANFILES =                   \
-       $(default_session_DATA) \
-       $(default_session_in_files)
-EXTRA_DIST = at-spi-registryd.desktop.in.in
-
-servicedir       = $(DBUS_SERVICES_DIR)
-service_in_files = org.freedesktop.atspi.Registry.service.in
+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)|" $< > $@
+       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