Split Gcr and Gck libraries out of gnome-keyringsplit

24 files changed, 28 insertions, 25 deletions

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 825ab4aa..c0773f5f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -45,7 +45,6 @@ gnome_keyring_daemon_LDADD = \
 	$(top_builddir)/pkcs11/gnome2-store/libgkm-gnome2-store.la \
 	$(top_builddir)/pkcs11/xdg-store/libgkm-xdg-store.la \
 	$(top_builddir)/pkcs11/gkm/libgkm.la \
-	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(top_builddir)/egg/libegg-dbus.la \
 	$(DAEMON_LIBS) \
 	$(GOBJECT_LIBS) \
diff --git a/daemon/control/Makefile.am b/daemon/control/Makefile.am
index 6f4f70cc..2b53d7ba 100644
--- a/daemon/control/Makefile.am
+++ b/daemon/control/Makefile.am
@@ -9,8 +9,7 @@ INCLUDES= \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/daemon \
 	-I$(top_builddir) \
-	$(GLIB_CFLAGS) \
-	-DGCK_API_SUBJECT_TO_CHANGE
+	$(GLIB_CFLAGS)
 
 # ------------------------------------------------------------------
 # DAEMON CODE
diff --git a/daemon/dbus/gkd-dbus-secrets.c b/daemon/dbus/gkd-dbus-secrets.c
index c9323aa3..c71893c2 100644
--- a/daemon/dbus/gkd-dbus-secrets.c
+++ b/daemon/dbus/gkd-dbus-secrets.c
@@ -32,7 +32,7 @@
 #include "egg/egg-cleanup.h"
 #include "egg/egg-error.h"
 
-#include "gck/gck.h"
+#include <gck/gck.h>
 
 static DBusConnection *dbus_conn = NULL;
 static GkdSecretService *secrets_service = NULL;
diff --git a/daemon/dbus/gkd-secret-change.h b/daemon/dbus/gkd-secret-change.h
index 91228135..2f2daf43 100644
--- a/daemon/dbus/gkd-secret-change.h
+++ b/daemon/dbus/gkd-secret-change.h
@@ -27,7 +27,7 @@
 #include "gkd-secret-prompt.h"
 #include "gkd-secret-types.h"
 
-#include "gck/gck.h"
+#include <gck/gck.h>
 
 #define GKD_SECRET_TYPE_CHANGE               (gkd_secret_change_get_type ())
 #define GKD_SECRET_CHANGE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKD_SECRET_TYPE_CHANGE, GkdSecretChange))
diff --git a/daemon/dbus/gkd-secret-create.h b/daemon/dbus/gkd-secret-create.h
index d24afe99..75c3c6eb 100644
--- a/daemon/dbus/gkd-secret-create.h
+++ b/daemon/dbus/gkd-secret-create.h
@@ -27,7 +27,7 @@
 #include "gkd-secret-prompt.h"
 #include "gkd-secret-types.h"
 
-#include "gck/gck.h"
+#include <gck/gck.h>
 
 #define GKD_SECRET_TYPE_CREATE               (gkd_secret_create_get_type ())
 #define GKD_SECRET_CREATE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKD_SECRET_TYPE_CREATE, GkdSecretCreate))
diff --git a/daemon/dbus/gkd-secret-exchange.c b/daemon/dbus/gkd-secret-exchange.c
index 7469dd68..0cf36d7e 100644
--- a/daemon/dbus/gkd-secret-exchange.c
+++ b/daemon/dbus/gkd-secret-exchange.c
@@ -28,7 +28,7 @@
 #include "gkd-secret-service.h"
 #include "gkd-secret-session.h"
 
-#include "gcr/gcr-secret-exchange.h"
+#include <gcr/gcr-base.h>
 
 #include <glib/gi18n.h>
 
diff --git a/daemon/dbus/gkd-secret-exchange.h b/daemon/dbus/gkd-secret-exchange.h
index f8ed12c4..c5e04795 100644
--- a/daemon/dbus/gkd-secret-exchange.h
+++ b/daemon/dbus/gkd-secret-exchange.h
@@ -29,8 +29,6 @@
 #include "gkd-secret-prompt.h"
 #include "gkd-secret-types.h"
 
-#include "gck/gck.h"
-
 #define GKD_TYPE_SECRET_EXCHANGE               (gkd_secret_exchange_get_type ())
 #define GKD_SECRET_EXCHANGE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKD_TYPE_SECRET_EXCHANGE, GkdSecretExchange))
 #define GKD_SECRET_EXCHANGE_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GKD_TYPE_SECRET_EXCHANGE, GkdSecretExchangeClass))
diff --git a/daemon/dbus/gkd-secret-objects.h b/daemon/dbus/gkd-secret-objects.h
index 91388565..234efd3b 100644
--- a/daemon/dbus/gkd-secret-objects.h
+++ b/daemon/dbus/gkd-secret-objects.h
@@ -24,7 +24,7 @@
 
 #include "gkd-secret-types.h"
 
-#include "gck/gck.h"
+#include <gck/gck.h>
 
 #include <glib-object.h>
 
diff --git a/daemon/dbus/gkd-secret-prompt.h b/daemon/dbus/gkd-secret-prompt.h
index a177ad9a..84fc187b 100644
--- a/daemon/dbus/gkd-secret-prompt.h
+++ b/daemon/dbus/gkd-secret-prompt.h
@@ -28,7 +28,7 @@
 
 #include "ui/gku-prompt.h"
 
-#include "gck/gck.h"
+#include <gck/gck.h>
 
 #include <dbus/dbus.h>
 
diff --git a/daemon/dbus/gkd-secret-property.h b/daemon/dbus/gkd-secret-property.h
index d04c414d..bdcaba5a 100644
--- a/daemon/dbus/gkd-secret-property.h
+++ b/daemon/dbus/gkd-secret-property.h
@@ -24,7 +24,7 @@
 
 #include "gkd-secret-types.h"
 
-#include "gck/gck.h"
+#include <gck/gck.h>
 
 #include <dbus/dbus.h>
 
diff --git a/daemon/dbus/gkd-secret-service.c b/daemon/dbus/gkd-secret-service.c
index 0cd208ad..3dab7e38 100644
--- a/daemon/dbus/gkd-secret-service.c
+++ b/daemon/dbus/gkd-secret-service.c
@@ -41,7 +41,7 @@
 #include "egg/egg-error.h"
 #include "egg/egg-unix-credentials.h"
 
-#include "gck/gck.h"
+#include <gck/gck.h>
 
 #include "pkcs11/pkcs11i.h"
 
diff --git a/daemon/dbus/gkd-secret-service.h b/daemon/dbus/gkd-secret-service.h
index 9425ea73..9fc303d4 100644
--- a/daemon/dbus/gkd-secret-service.h
+++ b/daemon/dbus/gkd-secret-service.h
@@ -24,7 +24,7 @@
 
 #include "gkd-secret-types.h"
 
-#include "gck/gck.h"
+#include <gck/gck.h>
 
 #include <dbus/dbus.h>
 
diff --git a/daemon/dbus/gkd-secret-unlock.h b/daemon/dbus/gkd-secret-unlock.h
index c5e3e50a..fdd7c8a6 100644
--- a/daemon/dbus/gkd-secret-unlock.h
+++ b/daemon/dbus/gkd-secret-unlock.h
@@ -26,6 +26,8 @@
 
 #include "gkd-secret-types.h"
 
+#include <gck/gck.h>
+
 #define GKD_SECRET_TYPE_UNLOCK               (gkd_secret_unlock_get_type ())
 #define GKD_SECRET_UNLOCK(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKD_SECRET_TYPE_UNLOCK, GkdSecretUnlock))
 #define GKD_SECRET_UNLOCK_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GKD_SECRET_TYPE_UNLOCK, GkdSecretUnlockClass))
diff --git a/daemon/gkd-glue.c b/daemon/gkd-glue.c
index 0811f6b8..5b95c7c3 100644
--- a/daemon/gkd-glue.c
+++ b/daemon/gkd-glue.c
@@ -61,7 +61,7 @@ gkd_daemon_startup_ssh (void)
 	g_io_add_watch (channel, G_IO_IN | G_IO_HUP, accept_ssh_client, NULL);
 	g_io_channel_unref (channel);
 
-	/* gck-ssh-agent sets the environment variable */
+	/* ssh-agent sets the environment variable */
 	gkd_util_push_environment ("SSH_AUTH_SOCK", g_getenv ("SSH_AUTH_SOCK"));
 
 	egg_cleanup_register (pkcs11_ssh_cleanup, NULL);
@@ -101,7 +101,7 @@ gkd_daemon_startup_gpg (void)
 	g_io_add_watch (channel, G_IO_IN | G_IO_HUP, accept_gpg_client, NULL);
 	g_io_channel_unref (channel);
 
-	/* gck-gpg-agent sets the environment variable */
+	/* gpg-agent sets the environment variable */
 	gkd_util_push_environment ("GPG_AGENT_INFO", g_getenv ("GPG_AGENT_INFO"));
 
 	egg_cleanup_register (pkcs11_gpg_cleanup, NULL);
diff --git a/daemon/gkd-main.c b/daemon/gkd-main.c
index 0b9294c8..12d3de92 100644
--- a/daemon/gkd-main.c
+++ b/daemon/gkd-main.c
@@ -60,6 +60,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib-object.h>
 
 #include <gcrypt.h>
 
diff --git a/daemon/gpg-agent/Makefile.am b/daemon/gpg-agent/Makefile.am
index 7f95ace0..5532d6b2 100644
--- a/daemon/gpg-agent/Makefile.am
+++ b/daemon/gpg-agent/Makefile.am
@@ -5,7 +5,9 @@ INCLUDES = \
 	-I$(top_srcdir)/pkcs11 \
 	-DGCK_API_SUBJECT_TO_CHANGE \
 	$(GOBJECT_CFLAGS) \
+	$(GCR_BASE_CFLAGS) \
 	$(GIO_CFLAGS) \
+	$(GCK_CFLAGS) \
 	$(GLIB_CFLAGS)
 
 # ------------------------------------------------------------------------------
@@ -31,8 +33,8 @@ gkd_gpg_agent_standalone_SOURCES = \
 gkd_gpg_agent_standalone_LDADD = \
 	libgkd-gpg-agent.la \
 	$(top_builddir)/ui/libgku-prompt.la \
-	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(top_builddir)/egg/libegg.la \
+	$(GCK_LIBS) \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GIO_LIBS) \
diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c
index a8ffefc5..42ddffba 100644
--- a/daemon/gpg-agent/gkd-gpg-agent-ops.c
+++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c
@@ -27,7 +27,7 @@
 #include "egg/egg-error.h"
 #include "egg/egg-secure-memory.h"
 
-#include "gcr/gcr-unlock-options.h"
+#include <gcr/gcr-unlock-options.h>
 
 #include "pkcs11/pkcs11i.h"
 
diff --git a/daemon/gpg-agent/gkd-gpg-agent-standalone.c b/daemon/gpg-agent/gkd-gpg-agent-standalone.c
index 4b56dc20..c573e478 100644
--- a/daemon/gpg-agent/gkd-gpg-agent-standalone.c
+++ b/daemon/gpg-agent/gkd-gpg-agent-standalone.c
@@ -27,7 +27,7 @@
 #include "egg/egg-error.h"
 #include "egg/egg-secure-memory.h"
 
-#include "gck/gck.h"
+#include <gck/gck.h>
 
 #include <glib.h>
 #include <glib-object.h>
diff --git a/daemon/login/Makefile.am b/daemon/login/Makefile.am
index 119264af..7d5fd670 100644
--- a/daemon/login/Makefile.am
+++ b/daemon/login/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES= \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/daemon \
 	-I$(top_builddir) \
+	$(GCK_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DGCK_API_SUBJECT_TO_CHANGE
@@ -20,6 +21,6 @@ libgkd_login_la_SOURCES = \
 	gkd-login.c gkd-login.h
 
 libgkd_login_la_LIBADD = \
-	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
+	$(GCK_LIBS) \
 	$(GOBJECT_LIBS) \
 	$(GLIB_LIBS)
diff --git a/daemon/login/gkd-login.c b/daemon/login/gkd-login.c
index 8da57d99..d94115e5 100644
--- a/daemon/login/gkd-login.c
+++ b/daemon/login/gkd-login.c
@@ -31,6 +31,8 @@
 #include "pkcs11/pkcs11i.h"
 #include "pkcs11/wrap-layer/gkm-wrap-layer.h"
 
+#include <gck/gck.h>
+
 #include <glib/gi18n.h>
 
 #include <string.h>
diff --git a/daemon/login/gkd-login.h b/daemon/login/gkd-login.h
index 01b4ddba..ca88aaaa 100644
--- a/daemon/login/gkd-login.h
+++ b/daemon/login/gkd-login.h
@@ -24,8 +24,6 @@
 
 #include <glib.h>
 
-#include "gck/gck.h"
-
 gboolean          gkd_login_unlock                   (const gchar *master);
 
 gboolean          gkd_login_change_lock              (const gchar *original,
diff --git a/daemon/ssh-agent/Makefile.am b/daemon/ssh-agent/Makefile.am
index 8d643b80..aa8cbbe9 100644
--- a/daemon/ssh-agent/Makefile.am
+++ b/daemon/ssh-agent/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES = \
 	-I$(top_srcdir)/pkcs11 \
 	$(GOBJECT_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(GCK_CFLAGS) \
 	-DGCK_API_SUBJECT_TO_CHANGE
 
 # ------------------------------------------------------------------------------
@@ -30,9 +31,9 @@ gkd_ssh_agent_standalone_SOURCES = \
 
 gkd_ssh_agent_standalone_LDADD = \
 	libgkd-ssh-agent.la \
-	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(top_builddir)/egg/libegg-buffer.la \
 	$(top_builddir)/egg/libegg-secure.la \
+	$(GCK_LIBS) \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(LIBGCRYPT_LIBS) \
diff --git a/daemon/ssh-agent/gkd-ssh-agent-ops.c b/daemon/ssh-agent/gkd-ssh-agent-ops.c
index a87e28e0..2e35e90f 100644
--- a/daemon/ssh-agent/gkd-ssh-agent-ops.c
+++ b/daemon/ssh-agent/gkd-ssh-agent-ops.c
@@ -24,7 +24,7 @@
 
 #include "gkd-ssh-agent-private.h"
 
-#include "gck/gck.h"
+#include <gck/gck.h>
 
 #include "pkcs11/pkcs11.h"
 #include "pkcs11/pkcs11i.h"
diff --git a/daemon/ssh-agent/gkd-ssh-agent-standalone.c b/daemon/ssh-agent/gkd-ssh-agent-standalone.c
index e6920d1f..5879d178 100644
--- a/daemon/ssh-agent/gkd-ssh-agent-standalone.c
+++ b/daemon/ssh-agent/gkd-ssh-agent-standalone.c
@@ -28,7 +28,7 @@
 #include "egg/egg-error.h"
 #include "egg/egg-secure-memory.h"
 
-#include "gck/gck.h"
+#include <gck/gck.h>
 
 #include <glib.h>
 #include <glib-object.h>