bugfix: at-spi-bus-launcher terminates when unviersal-switch vconf key not defined

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

diff --git a/bus/Makefile.am b/bus/Makefile.am
index b9bcd00..8e0eec6 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -1,4 +1,3 @@
-EXTRA_DIST=accessibility.conf
 CLEANFILES=
 
 busconfigdir = $(sysconfdir)/at-spi2
@@ -8,8 +7,9 @@ libexec_PROGRAMS = at-spi-bus-launcher
 at_spi_bus_launcher_SOURCES = at-spi-bus-launcher.c
 at_spi_bus_launcher_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" \
                                -DDBUS_DAEMON=\"$(DBUS_DAEMON)\"
-at_spi_bus_launcher_CFLAGS = $(GIO_CFLAGS)
-at_spi_bus_launcher_LDADD = $(GIO_LIBS) $(X_LIBS)
+at_spi_bus_launcher_CFLAGS = $(GIO_CFLAGS) $(APPSVC_CFLAGS) $(VCONF_CFLAGS) $(AUL_CFLAGS) -fPIE
+at_spi_bus_launcher_LDADD = $(GIO_LIBS) $(X_LIBS) $(APPSVC_LIBS) $(VCONF_LIBS) $(AUL_LIBS)
+at_spi_bus_launcher_LDFLAGS = -pie
 
 default_sessiondir = $(sysconfdir)/xdg/autostart
 default_session_DATA = at-spi-dbus-bus.desktop
@@ -17,7 +17,7 @@ default_session_DATA = at-spi-dbus-bus.desktop
 substitutions = "s,@libexecdir[@],$(libexecdir),"
 at-spi-dbus-bus.desktop: at-spi-dbus-bus.desktop.in
        sed -e$ $(substitutions)  $< > $@.tmp && mv $@.tmp $@
-EXTRA_DIST += at-spi-dbus-bus.desktop.in
+EXTRA_DIST = at-spi-dbus-bus.desktop.in
 CLEANFILES += at-spi-dbus-bus.desktop
 
 dbusservicedir=$(DBUS_SERVICES_DIR)