aboutsummaryrefslogtreecommitdiff
path: root/data/Makefile.am
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2014-06-20 09:58:28 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-06-20 09:58:28 +0000
commit867013a6f1e04f9db1e5bdd6719d9a545fdd2d27 (patch)
tree8cf9d8fc17003b8fca83c74ee85d96767a093f65 /data/Makefile.am
parent910a4108c6cc47b2f139a490d22fd1a8dfaef3c3 (diff)
parente17991a23d176b7ab26e786d01819df24f529cff (diff)
downloadayatana-indicator-keyboard-867013a6f1e04f9db1e5bdd6719d9a545fdd2d27.tar.gz
ayatana-indicator-keyboard-867013a6f1e04f9db1e5bdd6719d9a545fdd2d27.tar.bz2
ayatana-indicator-keyboard-867013a6f1e04f9db1e5bdd6719d9a545fdd2d27.zip
Synchronize process management across indicators
Diffstat (limited to 'data/Makefile.am')
-rw-r--r--data/Makefile.am45
1 files changed, 37 insertions, 8 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 03c377c7..06ed4662 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,10 @@
+
+SUBDIRS = upstart
+
+###########################
+# Icon Generator
+###########################
+
noinst_PROGRAMS = indicator-keyboard-icon-generator
AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API
@@ -32,14 +39,29 @@ indicator_keyboard_icon_generator_LDFLAGS = $(AM_LDFLAGS) \
$(LIBXKLAVIER_LIBS) \
$(COVERAGE_LDFLAGS)
-dist_service_DATA = indicator-keyboard.service
-servicedir = $(DBUS_SERVICE_DIR)
+###########################
+# Upstart Config
+###########################
-indicator-keyboard.service:
- $(AM_V_GEN) (echo '[D-BUS Service]'; \
- echo 'Name=com.canonical.indicator.keyboard'; \
- echo 'Exec=${libexecdir}/indicator-keyboard-service --use-gtk') > $@.tmp && \
- mv $@.tmp $@
+upstart_jobsdir = $(datadir)/upstart/sessions/
+upstart_jobs_DATA = indicator-keyboard.conf
+
+%.conf: %.conf.in
+ $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+
+###########################
+# XDG Autostart File
+###########################
+
+xdg_autostartdir = /etc/xdg/autostart
+xdg_autostart_DATA = indicator-keyboard.desktop
+
+%.desktop: %.desktop.in
+ $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+
+###########################
+# Indicator Config
+###########################
dist_indicator_DATA = com.canonical.indicator.keyboard
indicatordir = $(INDICATOR_DIR)
@@ -63,6 +85,10 @@ com.canonical.indicator.keyboard:
echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop') > $@.tmp && \
mv $@.tmp $@
+###########################
+# GSettings Schemas
+###########################
+
gsettings_SCHEMAS = com.canonical.indicator.keyboard.gschema.xml
@GSETTINGS_RULES@
@@ -74,4 +100,7 @@ gschemas.compiled: $(gsettings_SCHEMAS)
EXTRA_DIST = $(dist_service_DATA) \
$(dist_indicator_DATA) \
- $(gsettings_SCHEMAS)
+ $(gsettings_SCHEMAS) \
+ indicator-keyboard.conf.in \
+ indicator-keyboard.desktop.in
+