[libchamplain/libchamplain-0-4] Fix GObject-introspection
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libchamplain/libchamplain-0-4] Fix GObject-introspection
- Date: Mon, 19 Oct 2009 05:14:35 +0000 (UTC)
commit ce9eb655a9d82c5c94164d7500b2fe12866dfd6a
Author: Pierre-Luc Beaudoin <pierre-luc pierlux com>
Date: Mon Oct 19 01:03:21 2009 -0400
Fix GObject-introspection
It probably never really worked before
NEWS | 2 +-
champlain-gtk/Makefile.am | 11 ++++++++---
champlain/Makefile.am | 11 ++++++++---
3 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/NEWS b/NEWS
index 920abfd..fdff99f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ libchamplain 0.4.1 (2009-10-18)
===============================
Stable release
-Python and Perl bindings are in a working state.
+GObject-introspection, Python and Perl bindings are in a working state.
Enhancements:
diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 9e2a5c3..0cfd454 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -43,9 +43,13 @@ GtkChamplain-0.4.gir: $(INTROSPECTION_SCANNER) libchamplain-gtk-0.4.la
$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
--namespace GtkChamplain --nsversion=0.4 \
--strip-prefix=GtkChamplain \
- $(INCLUDES) \
- --add-include-path=$(srcdir) --add-include=path=. \
+ $(GTK_DEPS_CFLAGS) \
+ $(SOUP_CFLAGS) \
+ -I$(top_srcdir) \
+ -DCHAMPLAIN_COMPILATION \
+ --add-include-path=$(builddir) \
--c-include="$(libchamplain_include_HEADERS)" \
+ --include=Champlain-0.4 \
--include=Clutter-1.0 \
--include=Gtk-2.0 \
--library=champlain-gtk-0.4 \
@@ -53,7 +57,8 @@ GtkChamplain-0.4.gir: $(INTROSPECTION_SCANNER) libchamplain-gtk-0.4.la
--output $@ \
--pkg gobject-2.0 \
--pkg gtk+-2.0 \
- $(libchamplain_gtk_0_4_la_SOURCES) $(libchamplain_include_HEADERS)
+ $(addprefix $(srcdir)/,$(libchamplain_gtk_0_4_la_SOURCES)) \
+ $(addprefix $(srcdir)/,$(libchamplain_include_HEADERS))
BUILT_GIRSOURCES += GtkChamplain-0.4.gir
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 4ac1cfe..ae0cc02 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -164,8 +164,12 @@ Champlain-0.4.gir: $(INTROSPECTION_SCANNER) libchamplain-0.4.la
$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
--namespace Champlain --nsversion=0.4 \
--strip-prefix=Champlain \
- $(INCLUDES) \
- --add-include-path=$(srcdir) --add-include=path=. \
+ $(DEPS_CFLAGS) \
+ $(SOUP_CFLAGS) \
+ -I$(top_srcdir)/tidy \
+ -I$(top_srcdir) \
+ -DCHAMPLAIN_COMPILATION \
+ --add-include-path=$(builddir) \
--c-include="$(libchamplain_include_HEADERS)" \
--include=Clutter-1.0 \
--include=Gtk-2.0 \
@@ -174,7 +178,8 @@ Champlain-0.4.gir: $(INTROSPECTION_SCANNER) libchamplain-0.4.la
--output $@ \
--pkg gobject-2.0 \
--pkg gtk+-2.0 \
- $(libchamplain_0_4_la_SOURCES) $(libchamplain_include_HEADERS)
+ $(addprefix $(srcdir)/,$(libchamplain_0_4_la_SOURCES)) \
+ $(addprefix $(srcdir)/,$(libchamplain_include_HEADERS))
BUILT_GIRSOURCES += Champlain-0.4.gir
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]