[libgnomekbd] First iteration of introspection



commit 0b2a10f764358fea0f2c078bba6f54eb188946c0
Author: Sergey V. Udaltsov <svu gnome org>
Date:   Fri Dec 24 10:28:53 2010 +0000

    First iteration of introspection
    
    Just following the guidelines

 .gitignore              |    2 ++
 Makefile.am             |    3 +++
 configure.in            |    6 ++++--
 libgnomekbd/Makefile.am |   28 +++++++++++++++++++++++++++-
 4 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6a83ebc..6ff8e40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ missing
 mkinstalldirs
 stamp-h1
 *~
+*.gir
+*.typelib
diff --git a/Makefile.am b/Makefile.am
index 4ec3abd..3bdb92c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,12 +6,15 @@ SUBDIRS = libgnomekbd $(TEST) capplet po
 
 ACLOCAL_AMFLAGS = -I m4
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
+
 DISTCLEANFILES = \
   intltool-extract \
   intltool-merge \
   intltool-update
  
 EXTRA_DIST = \
+        m4/introspection.m4 \
         libgnomekbd.pc.in \
         libgnomekbdui.pc.in \
         intltool-extract.in \
diff --git a/configure.in b/configure.in
index 9072baa..f50990d 100644
--- a/configure.in
+++ b/configure.in
@@ -2,13 +2,13 @@ dnl ***************************************************************************
 dnl *** configure.in for libgnomekbd                                        ***
 dnl ***************************************************************************
 AC_INIT(libgnomekbd, 2.91.4, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd])
-AC_PREREQ(2.59)
+AC_PREREQ(2.62)
 
 VERSION_INFO=7:0:0
 AC_SUBST(VERSION_INFO)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([-Wno-portability])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AC_CONFIG_MACRO_DIR(m4)
 
@@ -85,6 +85,8 @@ AC_ARG_ENABLE([tests],
 
 AM_CONDITIONAL(BUILD_TESTS, test "$enable_tests" = "yes")
 
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
 AC_OUTPUT([
 Makefile
 libgnomekbd.pc
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
index 1afdf3a..81cc529 100644
--- a/libgnomekbd/Makefile.am
+++ b/libgnomekbd/Makefile.am
@@ -11,7 +11,7 @@ gsettings_SCHEMAS = org.gnome.libgnomekbd.desktop.gschema.xml \
 @INTLTOOL_XML_NOMERGE_RULE@
 
 common_CFLAGS = \
-	-I$(top_srcdir) -Wall 			\
+	-I$(top_srcdir) 				\
 	$(GDK_CFLAGS)					\
 	$(LIBXKLAVIER_CFLAGS)				\
 	$(XLIB_CFLAGS)					\
@@ -114,3 +114,29 @@ gkbd-keyboard-drawing-marshal.c: gkbd-keyboard-drawing-marshal.h
           && mv gkbd-keyboard-drawing-marshal.tmp gkbd-keyboard-drawing-marshal.c ) \
         || ( rm -f gkbd-keyboard-drawing-marshal.tmp && exit 1 )
 
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+if HAVE_INTROSPECTION
+introspection_sources = $(gnomekbdinc_HEADERS) \
+        $(libgnomekbd_la_SOURCES) \
+        $(libgnomekbdui_la_SOURCES) \
+        gkbd-indicator-plugin-manager.h
+
+Gkbd-3.0.gir: libgnomekbd.la libgnomekbdui.la
+Gkbd_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
+Gkbd_3_0_gir_CFLAGS = $(libgnomekbdui_la_CFLAGS)
+Gkbd_3_0_gir_LIBS = libgnomekbd.la libgnomekbdui.la
+Gkbd_3_0_gir_FILES = $(introspection_sources)
+INTROSPECTION_GIRS += Gkbd-3.0.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES = $(gir_DATA) $(typelib_DATA)
+endif



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]