diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-07-09 21:01:40 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-07-09 21:01:40 -0400 |
| commit | 813bee6f0a543621b37cbcccbfd9731231d6eac6 (patch) | |
| tree | 85066074baef75919fd9bafddb20bd3bbba97ecc | |
| parent | 0a07e9733bb259598a09515a3e4cdbcda5feef57 (diff) | |
| download | gtk+-813bee6f0a543621b37cbcccbfd9731231d6eac6.tar.gz | |
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
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gdk/Makefile.am | 4 | ||||
| -rw-r--r-- | gtk/Makefile.am | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5b67a93bd8..e9fbd01abf 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 f79edb3e70..916a6e2a90 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 8e012678ff..99b37a4723 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 |