[gtk+] Try to fix !srcdir build wrt to introspection
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Try to fix !srcdir build wrt to introspection
- Date: Sat, 10 Jul 2010 01:03:37 +0000 (UTC)
commit 813bee6f0a543621b37cbcccbfd9731231d6eac6
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jul 9 21:01:40 2010 -0400
Try to fix !srcdir build wrt to introspection
This requires a recent gobject-introspection, so bump the
dependency to 0.9.0. Should fix bug 623520
configure.ac | 2 +-
gdk/Makefile.am | 4 ++--
gtk/Makefile.am | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5b67a93..e9fbd01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1556,7 +1556,7 @@ fi
# GObject introspection
##################################################
-GOBJECT_INTROSPECTION_CHECK([0.6.14])
+GOBJECT_INTROSPECTION_CHECK([0.9.0])
##################################################
# Checks for gtk-doc and docbook-tools
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index f79edb3..916a6e2 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -190,7 +190,7 @@ Gdk-3.0.gir: $(gdktargetlib) Makefile
Gdk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
Gdk_3_0_gir_LIBS = $(gdktargetlib)
-Gdk_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
+Gdk_3_0_gir_FILES = $(introspection_files)
Gdk_3_0_gir_CFLAGS = $(INCLUDES)
INTROSPECTION_GIRS += Gdk-3.0.gir
@@ -203,7 +203,7 @@ GdkX11-3.0.gir: $(gdktargetlib) Gdk-3.0.gir Makefile
GdkX11_3_0_gir_SCANNERFLAGS = --strip-prefix=gdk_x11
GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
GdkX11_3_0_gir_LIBS = $(gdktargetlib)
-GdkX11_3_0_gir_FILES = $(addprefix $(srcdir)/,$(x11_introspection_files))
+GdkX11_3_0_gir_FILES = $(x11_introspection_files)
GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
INTROSPECTION_GIRS += GdkX11-3.0.gir
endif # USE_X11
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8e01267..99b37a4 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -919,7 +919,7 @@ Gtk_3_0_gir_CFLAGS = \
-UGTK_DISABLE_DEPRECATED \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
Gtk_3_0_gir_LIBS = $(gtktargetlib)
-Gtk_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+Gtk_3_0_gir_FILES = $(introspection_files)
INTROSPECTION_GIRS += Gtk-3.0.gir
girdir = $(datadir)/gir-1.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]