diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-12-18 16:11:32 +0000 |
|---|---|---|
| committer | Tarmac <> | 2013-12-18 16:11:32 +0000 |
| commit | 7f23146bc08362f33d1a2d6aa313f29035066766 (patch) | |
| tree | e72ea137eb67adb0f47c91864303a8cbba430538 /data/Makefile.am | |
| parent | a99685027a4eb04112ca1c27e0c9423d0f9a4518 (diff) | |
| parent | c2536fe01234b4c7d1755f0806053b4c21a26c71 (diff) | |
| download | ayatana-indicator-bluetooth-7f23146bc08362f33d1a2d6aa313f29035066766.tar.gz ayatana-indicator-bluetooth-7f23146bc08362f33d1a2d6aa313f29035066766.tar.bz2 ayatana-indicator-bluetooth-7f23146bc08362f33d1a2d6aa313f29035066766.zip | |
Switching DBus service to an Upstart Job.
Approved by Iain Lane, PS Jenkins bot, Ted Gould.
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 48 |
1 files changed, 39 insertions, 9 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index fc9beee..9784451 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,23 +1,53 @@ +BUILT_SOURCES = +EXTRA_DIST = +CLEANFILES = # the indicator bus file indicatorsdir = $(datadir)/unity/indicators dist_indicators_DATA = com.canonical.indicator.bluetooth -# the dbus service file -dbus_servicesdir = $(datadir)/dbus-1/services -dbus_services_DATA = indicator-bluetooth.service +# the upstart job file +upstart_jobsdir = $(datadir)/upstart/sessions +upstart_jobs_DATA = indicator-bluetooth.conf +upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in) +$(upstart_jobs_DATA): $(upstart_jobs_in) + $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ +BUILT_SOURCES += $(upstart_jobs_DATA) +EXTRA_DIST += $(upstart_jobs_in) +CLEANFILES += $(upstart_jobs_DATA) -%.service: %.service.in - sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ +# the upstart version of the xdg autostart job file +# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100 +upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart +upstart_xdg_autostart_DATA = indicator-bluetooth.desktop +upstart_xdg_autostart_in = indicator-bluetooth.upstart.desktop.in +$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in) + $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ +BUILT_SOURCES += $(upstart_xdg_autostart_DATA) +EXTRA_DIST += $(upstart_xdg_autostart_in) +CLEANFILES += $(upstart_xdg_autostart_DATA) +# the xdg autostart job file +xdg_autostartdir = /etc/xdg/autostart +xdg_autostart_DATA = indicator-bluetooth.desktop +xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in) +$(xdg_autostart_DATA): $(xdg_autostart_in) + $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ +BUILT_SOURCES += $(xdg_autostart_DATA) +EXTRA_DIST += $(xdg_autostart_in) +CLEANFILES += $(xdg_autostart_DATA) + +# the gsettings schema gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ -EXTRA_DIST = \ - indicator-bluetooth.service.in \ - com.canonical.indicator.bluetooth.gschema.xml.in +EXTRA_DIST += \ + com.canonical.indicator.bluetooth.gschema.xml.in \ + indicator-bluetooth.conf.in \ + indicator-bluetooth.desktop.in \ + indicator-bluetooth.upstart.desktop.in -CLEANFILES = \ +CLEANFILES += \ $(dbus_services_DATA) \ $(gsettings_SCHEMAS) |