X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bus%2FMakefile.am;h=8190888f98bc1212396c4b53575e2b8d5f2635e0;hb=f1e9590bafb75e3810b01655f45fb57aba548874;hp=8e0eec6e2e62b856e838bef1b934103a7cf21344;hpb=632107d94461024f2cdcb6bbe530cc14e96f3fe0;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 8e0eec6..8190888 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -1,38 +1,49 @@
-CLEANFILES=
-
-busconfigdir = $(sysconfdir)/at-spi2
-busconfig_DATA = accessibility.conf
+CLEANFILES =
+DISTCLEANFILES =
+EXTRA_DIST = \
+	meson.build
 
 libexec_PROGRAMS = at-spi-bus-launcher
 at_spi_bus_launcher_SOURCES = at-spi-bus-launcher.c
 at_spi_bus_launcher_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" \
+                               -DDATADIR=\"$(datadir)\" \
                                -DDBUS_DAEMON=\"$(DBUS_DAEMON)\"
 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_LDADD = $(GIO_LIBS) $(X11_LIBS) $(APPSVC_LIBS) $(VCONF_LIBS) $(AUL_LIBS)
 at_spi_bus_launcher_LDFLAGS = -pie
 
+substitutions = "s,@libexecdir[@],$(libexecdir),"
+
 default_sessiondir = $(sysconfdir)/xdg/autostart
 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
+	$(AM_V_GEN) $(SED) -e$ $(substitutions)  $< > $@.tmp && mv $@.tmp $@
+
+EXTRA_DIST += at-spi-dbus-bus.desktop.in
 CLEANFILES += at-spi-dbus-bus.desktop
 
-dbusservicedir=$(DBUS_SERVICES_DIR)
+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 $@
+	$(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
 
-accessibility.conf: accessibility.conf.in
-	sed -e "s|[@]DATADIR[@]|$(datadir)|" $(srcdir)/$@.in > $@
+EXTRA_DIST += org.a11y.Bus.service.in
+CLEANFILES += org.a11y.Bus.service
+
+systemd_userdir = $(prefix)/lib/systemd/user
+systemd_user_DATA = at-spi-dbus-bus.service
+at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile
+	$(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
 
-EXTRA_DIST += org.a11y.Bus.service.in \
-	accessibility.conf.in
+EXTRA_DIST += at-spi-dbus-bus.service.in
+CLEANFILES += at-spi-dbus-bus.service
+
+busconfigdir = $(datadir)/defaults/at-spi2
+busconfig_DATA = accessibility.conf
+accessibility.conf: accessibility.conf.in
+	$(AM_V_GEN) $(SED) -e "s|[@]DATADIR[@]|$(datadir)|" $(srcdir)/$@.in > $@
 
-DISTCLEANFILES = org.a11y.Bus.service \
-	accessibility.conf
+EXTRA_DIST += accessibility.conf.in
+CLEANFILES += accessibility.conf
 
 -include $(top_srcdir)/git.mk