[gnome-keyring/gck-work] [gck] Mark the gck API as unstable with a define.

[Stefan Walter <stefw src gnome org>]

commit de41ad3352fd9e4631095986389395340e3c09f8
Author: Stef Walter <stef memberwebs com>
Date:   Fri Oct 1 17:55:39 2010 +0000

    [gck] Mark the gck API as unstable with a define.
    
    Use -DGCK_API_SUBJECT_TO_CHANGE in order to compile.

 daemon/Makefile.am           |    3 ++-
 daemon/control/Makefile.am   |    3 ++-
 daemon/dbus/Makefile.am      |    3 ++-
 daemon/gpg-agent/Makefile.am |    3 ++-
 daemon/login/Makefile.am     |    3 ++-
 daemon/ssh-agent/Makefile.am |    3 ++-
 gck/Makefile.am              |    1 +
 gck/gck.h                    |   11 ++++++++++-
 gck/tests/Makefile.am        |    6 ++++--
 gcr/Makefile.am              |    1 +
 gcr/tests/Makefile.am        |    6 ++++--
 tool/Makefile.am             |    5 +++--
 12 files changed, 35 insertions(+), 13 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 6634d2c..296eba5 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -21,7 +21,8 @@ INCLUDES=	\
 	$(GOBJECT_CFLAGS)				\
 	$(GTHREAD_CFLAGS)				\
 	$(GIO_CFLAGS)					\
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) 					\
+	-DGCK_API_SUBJECT_TO_CHANGE
 
 gnome_keyring_daemon_SOURCES = \
 	gkd-glue.c gkd-glue.h \
diff --git a/daemon/control/Makefile.am b/daemon/control/Makefile.am
index 79b2c0f..866f399 100644
--- a/daemon/control/Makefile.am
+++ b/daemon/control/Makefile.am
@@ -14,7 +14,8 @@ INCLUDES= \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/daemon \
 	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	-DGCK_API_SUBJECT_TO_CHANGE
 
 # ------------------------------------------------------------------
 # DAEMON CODE
diff --git a/daemon/dbus/Makefile.am b/daemon/dbus/Makefile.am
index efc3041..377d536 100644
--- a/daemon/dbus/Makefile.am
+++ b/daemon/dbus/Makefile.am
@@ -6,7 +6,8 @@ INCLUDES = \
 	-DINTROSPECTDIR=\"$(datadir)/gnome-keyring/introspect\" \
 	$(DAEMON_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	-DGCK_API_SUBJECT_TO_CHANGE
 
 noinst_LTLIBRARIES = libgkd-dbus.la
 
diff --git a/daemon/gpg-agent/Makefile.am b/daemon/gpg-agent/Makefile.am
index 7226a14..2cccaa4 100644
--- a/daemon/gpg-agent/Makefile.am
+++ b/daemon/gpg-agent/Makefile.am
@@ -4,7 +4,8 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/pkcs11 \
 	$(GOBJECT_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	-DGCK_API_SUBJECT_TO_CHANGE
 
 # ------------------------------------------------------------------------------
 # The ssh-agent component code
diff --git a/daemon/login/Makefile.am b/daemon/login/Makefile.am
index c538a7d..a4be509 100644
--- a/daemon/login/Makefile.am
+++ b/daemon/login/Makefile.am
@@ -8,7 +8,8 @@ INCLUDES= \
 	-I$(top_srcdir)/daemon \
 	-I$(top_builddir) \
 	$(GOBJECT_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	-DGCK_API_SUBJECT_TO_CHANGE
 
 # ------------------------------------------------------------------
 # DAEMON CODE
diff --git a/daemon/ssh-agent/Makefile.am b/daemon/ssh-agent/Makefile.am
index 6311fc0..f51d732 100644
--- a/daemon/ssh-agent/Makefile.am
+++ b/daemon/ssh-agent/Makefile.am
@@ -4,7 +4,8 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/pkcs11 \
 	$(GOBJECT_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	-DGCK_API_SUBJECT_TO_CHANGE
 
 # ------------------------------------------------------------------------------
 # The ssh-agent component code
diff --git a/gck/Makefile.am b/gck/Makefile.am
index 7c887bb..4a22fb2 100644
--- a/gck/Makefile.am
+++ b/gck/Makefile.am
@@ -21,6 +21,7 @@ INCLUDES = \
 	$(GOBJECT_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	-DGCK_API_SUBJECT_TO_CHANGE \
 	-DPKCS11_REGISTRY_DIR=\"$(libdir)/pkcs11\"
 
 BUILT_SOURCES = \
diff --git a/gck/gck.h b/gck/gck.h
index 00a975d..ac3b54b 100644
--- a/gck/gck.h
+++ b/gck/gck.h
@@ -32,7 +32,16 @@
 
 G_BEGIN_DECLS
 
-#define             GCK_VENDOR_CODE                         0x47503131 /* GP11 */
+/*
+ * To use this API, you need to be prepared for changes to the API,
+ * and add the C flag: -DGCK_API_SUBJECT_TO_CHANGE
+ */
+
+#ifndef GCK_API_SUBJECT_TO_CHANGE
+#error "This API has not yet reached stability."
+#endif
+
+#define             GCK_VENDOR_CODE                         0x47434B00 /* GCK */
 
 /* An error code which results from a failure to load the PKCS11 module */
 #define             CKR_GCK_MODULE_PROBLEM                  (CKR_VENDOR_DEFINED | (GCK_VENDOR_CODE + 1))
diff --git a/gck/tests/Makefile.am b/gck/tests/Makefile.am
index 8974f06..81632e7 100644
--- a/gck/tests/Makefile.am
+++ b/gck/tests/Makefile.am
@@ -13,7 +13,8 @@ TESTING_FILES = \
 
 TESTING_FLAGS = \
 	-I$(top_srcdir)/gck/ \
-	-DEXTERNAL_TEST
+	-DEXTERNAL_TEST \
+	-DGCK_API_SUBJECT_TO_CHANGE
 
 TESTING_LIBS = \
 	$(GIO_LIBS) \
@@ -35,7 +36,8 @@ libmock_test_module_la_LDFLAGS = \
 libmock_test_module_la_CFLAGS = \
 	-I$(top_srcdir)/gck \
 	-I$(top_srcdir) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	-DGCK_API_SUBJECT_TO_CHANGE
 
 libmock_test_module_la_SOURCES = \
 	mock-test-module.c
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index b1dcc9f..d056415 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -60,6 +60,7 @@ libgcr GCR_VERSION_SUFFIX@_la_SOURCES = \
 
 libgcr GCR_VERSION_SUFFIX@_la_CFLAGS = \
 	-DPKCS11_MODULE_PATH=\""$(libdir)/gnome-keyring/gnome-keyring-pkcs11.so"\" \
+	-DGCK_API_SUBJECT_TO_CHANGE \
 	-DGCR_API_SUBJECT_TO_CHANGE \
 	-DUIDIR=\""$(uidir)"\"
     
diff --git a/gcr/tests/Makefile.am b/gcr/tests/Makefile.am
index 22295ad..d5f7618 100644
--- a/gcr/tests/Makefile.am
+++ b/gcr/tests/Makefile.am
@@ -9,9 +9,10 @@ TESTING_LIBS =  \
 	$(top_builddir)/egg/libegg.la \
 	$(top_builddir)/egg/libegg-entry-buffer.la \
 	$(top_builddir)/gp11/libgp11.la
-	
+
 TESTING_FLAGS = \
-	-DGCR_API_SUBJECT_TO_CHANGE
+	-DGCR_API_SUBJECT_TO_CHANGE \
+	-DGCK_API_SUBJECT_TO_CHANGE
 
 include $(top_srcdir)/testing/testing.make
 
@@ -25,6 +26,7 @@ ui_test_details_SOURCES = \
 	ui-test-details.c
 
 ui_test_details_CFLAGS = \
+	-DGCK_API_SUBJECT_TO_CHANGE \
 	-DGCR_API_SUBJECT_TO_CHANGE \
 	$(GTK_CFLAGS)
 
diff --git a/tool/Makefile.am b/tool/Makefile.am
index de328b2..f79950a 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -6,8 +6,9 @@ INCLUDES=	\
 	-I$(top_builddir) \
 	$(GTK_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
-	$(GLIB_CFLAGS)
-	
+	$(GLIB_CFLAGS) \
+	-DGCK_API_SUBJECT_TO_CHANGE
+
 gnome_keyring GCR_VERSION_SUFFIX@_SOURCES = \
 	gkr-tool.c gkr-tool.h \
 	gkr-tool-import.c