[folks] Add GObject Introspection Support
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Add GObject Introspection Support
- Date: Tue, 26 Apr 2011 17:02:01 +0000 (UTC)
commit ce07382fe7eb1bd44858c1d925caed5d2bbd16e8
Author: Maxim Ermilov <zaspire rambler ru>
Date: Fri Apr 22 03:06:51 2011 +0400
Add GObject Introspection Support
Closes: bgo#648161
NEWS | 1 +
configure.ac | 8 ++++++--
folks/Makefile.am | 21 +++++++++++++++++++++
3 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index cb36ea1..5763e78 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Bugs fixed:
empathy-individual-store.c line 1387
* Bug 645684 â?? Implement Iterator on LinkedHashSet
* Bug 640092 â?? Folks should minimize use of GLib.List (including its public API)
+* Bug 648161 â?? Add GObject Introspection Support
API changes:
* LinkedHashSet.list_iterator() is now disallowed (causes an assertion failure)
diff --git a/configure.ac b/configure.ac
index 5004fca..4850b5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,9 @@ AC_SUBST([LT_AGE])
FOLKS_MAJOR_MINOR_VERSION=folks_major_minor_version
AC_SUBST([FOLKS_MAJOR_MINOR_VERSION])
+API_VERSION=0.6
+AC_SUBST([API_VERSION])
+
AC_ARG_ENABLE(tracker-backend,
AC_HELP_STRING([--enable-tracker-backend],
[ build the Tracker backend]),
@@ -216,10 +219,11 @@ if test "x$enable_vala" = "xyes" ; then
VALA_CHECK_PACKAGES([tracker-sparql-0.10])
fi
- # this will set HAVE_INTROSPECTION
- GOBJECT_INTROSPECTION_REQUIRE([0.9.12])
fi
+# this will set HAVE_INTROSPECTION
+GOBJECT_INTROSPECTION_REQUIRE([0.9.12])
+
AM_CONDITIONAL([HAVE_VALA], [test "x$enable_vala" = "xyes"])
# Various functions that we need (used in C code generated from Vala)
diff --git a/folks/Makefile.am b/folks/Makefile.am
index 4808264..cc6db7b 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -43,6 +43,8 @@ libfolks_la_SOURCES = \
$(NULL)
libfolks_la_VALAFLAGS = \
+ --gir=Folks-$(API_VERSION).gir \
+ --library=folks \
--vapidir=. \
--pkg build-conf \
--pkg gobject-2.0 \
@@ -109,4 +111,23 @@ GITIGNOREFILES = \
libfolks_la_vala.stamp \
$(NULL)
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS =
+INTROSPECTION_COMPILER_ARGS = -l libfolks.so
+
+if HAVE_INTROSPECTION
+Folks-$(API_VERSION).gir: libfolks.la
+GIRS = Folks-$(API_VERSION).gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(GIRS:.gir=.typelib)
+
+CLEANFILES += $(typelib_DATA)
+BUILT_SOURCES += $(gir_DATA)
+endif
+
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]