Remove accessibility.conf from EXTRA_DIST

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

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 20204c5..530d231 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -1,23 +1,37 @@
+CLEANFILES=
+
 busconfigdir = $(sysconfdir)/at-spi2
-busconfig_DATA = accessibility.conf                    
+busconfig_DATA = accessibility.conf
 
-atspidbusdir = $(bindir)
-atspidbus_SCRIPTS = at-spi-dbus-bus
+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)
 
 default_sessiondir = $(sysconfdir)/xdg/autostart
 default_session_DATA = at-spi-dbus-bus.desktop
 
-do_subst = sed -e 's,[@]prefix[@],${prefix},g' \
-               -e 's,[@]sysconfdir[@],${sysconfdir},g' \
-               -e 's,[@]DBUS_DAEMON[@],@DBUS_DAEMON@,g'
+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
+CLEANFILES += at-spi-dbus-bus.desktop
+
+dbusservicedir=$(DBUS_SERVICES_DIR)
+dbusservice_DATA = org.a11y.Bus.service
+
+org.a11y.Bus.service: org.a11y.Bus.service.in
+       sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
+
+accessibility.conf: accessibility.conf.in
+       sed -e "s|[@]DATADIR[@]|$(datadir)|" $(srcdir)/$@.in > $@
 
-at-spi-dbus-bus:       at-spi-dbus-bus.in Makefile
-       $(do_subst) $(srcdir)/$@.in > $@
+EXTRA_DIST += org.a11y.Bus.service.in \
+       accessibility.conf.in
 
-EXTRA_DIST= \
-       accessibility.conf \
-       at-spi-dbus-bus.in \
-       at-spi-dbus-bus.desktop
+DISTCLEANFILES = org.a11y.Bus.service \
+       accessibility.conf
 
-CLEANFILES= \
-       at-spi-dbus-bus
+-include $(top_srcdir)/git.mk