From 9a613154b2dd7b4095bfc3b04a4e8904402e4172 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 19 Feb 2014 22:56:41 -0600 Subject: Dropping the DBus service file --- data/Makefile.am | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index ab12dd6..6cb7a6d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,11 +1,5 @@ SUBDIRS = icons -dbus_servicesdir = $(datadir)/dbus-1/services -dbus_services_DATA = indicator-messages.service - -%.service: %.service.in - sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ - gsettings_SCHEMAS = com.canonical.indicator.messages.gschema.xml @GSETTINGS_RULES@ @@ -13,7 +7,6 @@ indicatordir = $(INDICATOR_DIR) dist_indicator_DATA = com.canonical.indicator.messages EXTRA_DIST = \ - $(gsettings_SCHEMAS) \ - indicator-messages.service.in + $(gsettings_SCHEMAS) -CLEANFILES = indicator-messages.service +CLEANFILES = -- cgit v1.2.3 From f77b257981d4b9951f7214bbc80b9ca2e212f26e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 19 Feb 2014 23:00:59 -0600 Subject: Upstart job configuration --- data/Makefile.am | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 6cb7a6d..b89fa51 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,11 @@ SUBDIRS = icons +upstart_jobsdir = $(datadir)/upstart/sessions/ +upstart_jobs_DATA = indicator-messages.conf + +%.conf: %.conf.in + $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ + gsettings_SCHEMAS = com.canonical.indicator.messages.gschema.xml @GSETTINGS_RULES@ @@ -7,6 +13,8 @@ indicatordir = $(INDICATOR_DIR) dist_indicator_DATA = com.canonical.indicator.messages EXTRA_DIST = \ + indicator-messages.conf.in \ $(gsettings_SCHEMAS) -CLEANFILES = +CLEANFILES = \ + $(upstart_jobs_DATA) -- cgit v1.2.3 From 98b1efd83f290d796c7f86a60f98495b9ee69290 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 19 Feb 2014 23:09:50 -0600 Subject: Add an XDG autostart config file --- data/Makefile.am | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index b89fa51..8752076 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,11 @@ SUBDIRS = icons +xdg_autostartdir = /etc/xdg/autostart +xdg_autostart_DATA = indicator-messages.desktop + +%.desktop: %.desktop.in + $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ + upstart_jobsdir = $(datadir)/upstart/sessions/ upstart_jobs_DATA = indicator-messages.conf @@ -13,8 +19,10 @@ indicatordir = $(INDICATOR_DIR) dist_indicator_DATA = com.canonical.indicator.messages EXTRA_DIST = \ + indicator-messages.desktop.in \ indicator-messages.conf.in \ $(gsettings_SCHEMAS) CLEANFILES = \ + $(xdg_autostart_DATA) \ $(upstart_jobs_DATA) -- cgit v1.2.3 From 50d4a5cc6d3021397707644c63ebb96cfe23c8cb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 19 Feb 2014 23:12:07 -0600 Subject: Adding the Upstart XDG override --- data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 8752076..b991686 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = icons +SUBDIRS = icons upstart xdg_autostartdir = /etc/xdg/autostart xdg_autostart_DATA = indicator-messages.desktop -- cgit v1.2.3