summaryrefslogtreecommitdiff
path: root/daemon/Makefile.am
diff options
context:
space:
mode:
authorStef Walter <stef@memberwebs.com>2009-12-19 22:37:52 +0000
committerStef Walter <stef@memberwebs.com>2009-12-19 22:37:52 +0000
commit087c7b561acd00f93e903fa3b7a9f2f26eddfba7 (patch)
tree3894defa2cb177e7540efb303022cceb78d1f42c /daemon/Makefile.am
parentd4dc93486a05de3fbcec2fcb0e46add44c311046 (diff)
downloadgnome-keyring-087c7b561acd00f93e903fa3b7a9f2f26eddfba7.tar.gz
[daemon] Refactor the startup.
* Add support for initializing seperate parts of daemon separately. * Add autostart files for various components. * Use simpler control protocol.
Diffstat (limited to 'daemon/Makefile.am')
-rw-r--r--daemon/Makefile.am7
1 files changed, 5 insertions, 2 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 7ddb1f25..1958193e 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -58,7 +58,7 @@ EXTRA_DIST = \
CLEANFILES = \
org.gnome.keyring.service \
$(desktop_DATA)
-
+
servicedir = $(DBUS_SERVICES_DIR)
service_in_files = org.gnome.keyring.service.in
service_DATA = $(service_in_files:.service.in=.service)
@@ -68,7 +68,10 @@ service_PATH = $(VALGRIND_RUN)$(bindir)
$(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@PATH\@|$(service_PATH)|" $< > $@
-desktop_in_files = gnome-keyring-daemon.desktop.in
+desktop_in_files = \
+ gnome-keyring-pkcs11.desktop.in \
+ gnome-keyring-secrets.desktop.in \
+ gnome-keyring-ssh.desktop.in
desktopdir = $(sysconfdir)/xdg/autostart
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)