[gnome-keyring/introspection: 4/7] gcr: Display gir warnings, and make them fatal if in full debug mode

[Stefan Walter <stefw src gnome org>]

commit 0dd36f369b9532f2600f6fd8b41b7521894d3151
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Aug 11 22:32:26 2011 +0200

    gcr: Display gir warnings, and make them fatal if in full debug mode
    
     * Also rename the gir file to just be Gcr-3.gir
     * Cleanup and define what goes in the gobject introspection.

 configure.ac    |    4 ++++
 gcr/Makefile.am |   36 ++++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b8b0fa2..c712b9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -463,6 +463,7 @@ AC_ARG_ENABLE(debug,
 if test "$enable_debug" != "no"; then
 	AC_DEFINE_UNQUOTED(WITH_DEBUG, 1, [Print debug output])
 	AC_DEFINE_UNQUOTED(_DEBUG, 1, [In debug mode])
+	INTROSPECTION_FLAGS="$INTROSPECTION_FLAGS --warn-all"
 fi
 
 if test "$enable_debug" = "full"; then
@@ -470,6 +471,7 @@ if test "$enable_debug" = "full"; then
 	CFLAGS="$CFLAGS -g -O0 -Werror"
 	CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
 	CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+	INTROSPECTION_FLAGS="$INTROSPECTION_FLAGS --warn-error"
 elif test "$enable_debug" = "no"; then
 	debug_status="no"
 	AC_DEFINE_UNQUOTED(G_DISABLE_ASSERT, 1, [Disable glib assertions])
@@ -709,6 +711,8 @@ AC_SUBST(pkcs11dir)
 pkcs11standalonedir="${libdir}/gnome-keyring/devel"
 AC_SUBST(pkcs11standalonedir)
 
+AC_SUBST(INTROSPECTION_FLAGS)
+
 AC_OUTPUT([
 Makefile
 daemon/Makefile
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 3eed0ca..3de3c5e 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -74,15 +74,14 @@ BUILT_SOURCES = \
 
 lib_LTLIBRARIES = libgcr- GCR_MAJOR@.la
 
-libgcr_ GCR_MAJOR@_la_SOURCES = \
+PUBLIC_SOURCES = \
 	gcr-certificate.c gcr-certificate.h \
-	gcr-certificate-basics-widget.h gcr-certificate-basics-widget.c \
 	gcr-certificate-chain.c gcr-certificate-chain.h \
-	gcr-certificate-details-widget.h gcr-certificate-details-widget.c \
 	gcr-certificate-renderer.c gcr-certificate-renderer.h \
 	gcr-certificate-exporter.c gcr-certificate-exporter.h \
 	gcr-certificate-extensions.c gcr-certificate-extensions.h \
 	gcr-certificate-widget.c gcr-certificate-widget.h \
+	gcr-column.h \
 	gcr-collection.c gcr-collection.h \
 	gcr-collection-model.c gcr-collection-model.h \
 	gcr-combo-selector.c gcr-combo-selector.h \
@@ -117,7 +116,16 @@ libgcr_ GCR_MAJOR@_la_SOURCES = \
 	gcr-unlock-options.h \
 	gcr-unlock-options-widget.c gcr-unlock-options-widget.h \
 	gcr-util.c gcr-util.h \
-	gcr-viewer.c gcr-viewer.h \
+	gcr-viewer.c gcr-viewer.h
+
+DEPRECATED_SOURCES = \
+	gcr-certificate-basics-widget.h gcr-certificate-basics-widget.c \
+	gcr-certificate-details-widget.h gcr-certificate-details-widget.c \
+	gcr-deprecated.h
+
+libgcr_ GCR_MAJOR@_la_SOURCES = \
+	$(PUBLIC_SOURCES) \
+	$(DEPRECATED_SOURCES) \
 	$(BUILT_SOURCES)
 
 libgcr_ GCR_MAJOR@_la_CFLAGS = \
@@ -176,19 +184,19 @@ if HAVE_INTROSPECTION
 
 include $(INTROSPECTION_MAKEFILE)
 
-INTROSPECTION_GIRS = Gcr- GCR_MAJOR@  GCR_MINOR@.gir
-INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) --add-include-path=.
+INTROSPECTION_GIRS = Gcr- GCR_MAJOR@.gir
+INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --add-include-path=$(srcdir) --add-include-path=.
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
 
-Gcr- GCR_MAJOR@  GCR_MINOR@.gir: libgcr- GCR_MAJOR@.la
+Gcr- GCR_MAJOR@.gir: libgcr- GCR_MAJOR@.la
 
-Gcr_ GCR_MAJOR@_ GCR_MINOR@_gir_PACKAGES = gobject-2.0 gtk+-3.0 p11-kit-1
-Gcr_ GCR_MAJOR@_ GCR_MINOR@_gir_EXPORT_PACKAGES = gcr-3
-Gcr_ GCR_MAJOR@_ GCR_MINOR@_gir_INCLUDES = GObject-2.0 Gtk-3.0
-Gcr_ GCR_MAJOR@_ GCR_MINOR@_gir_LIBS = libgcr- GCR_MAJOR@.la
-Gcr_ GCR_MAJOR@_ GCR_MINOR@_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DGCR_COMPILATION -DGCR_API_SUBJECT_TO_CHANGE
-Gcr_ GCR_MAJOR@_ GCR_MINOR@_gir_FILES = $(libgcr_ GCR_MAJOR@_la_SOURCES)
-Gcr_ GCR_MAJOR@_ GCR_MINOR@_gir_SCANNERFLAGS = --c-include "gcr.h"
+Gcr_ GCR_MAJOR@_gir_PACKAGES = gobject-2.0 gtk+-3.0 p11-kit-1
+Gcr_ GCR_MAJOR@_gir_EXPORT_PACKAGES = gcr-$(GCR_MAJOR)
+Gcr_ GCR_MAJOR@_gir_INCLUDES = GObject-2.0 Gtk-3.0
+Gcr_ GCR_MAJOR@_gir_LIBS = libgcr- GCR_MAJOR@.la
+Gcr_ GCR_MAJOR@_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DGCR_COMPILATION -DGCR_API_SUBJECT_TO_CHANGE
+Gcr_ GCR_MAJOR@_gir_FILES = $(PUBLIC_SOURCES)
+Gcr_ GCR_MAJOR@_gir_SCANNERFLAGS = --c-include "gcr.h"
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)