[gtk+/gtk-2-24] introspection: Fix srcdir != builddir builds
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] introspection: Fix srcdir != builddir builds
- Date: Mon, 9 Jan 2012 16:08:23 +0000 (UTC)
commit 986072b36194e307a6c5902693da4ed9468c9fa4
Author: Ryan Lortie <desrt desrt ca>
Date: Sat Jan 7 21:38:39 2012 -0500
introspection: Fix srcdir != builddir builds
https://bugzilla.gnome.org/show_bug.cgi?id=667458
gdk/Makefile.am | 1 +
gtk/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 4adb2f0..c880f6e 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -36,6 +36,7 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \
-I$(top_srcdir) \
+ -I$(top_builddir) \
-I$(top_builddir)/gdk \
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index cf3edd6..4d15728 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1021,7 +1021,7 @@ Gtk_2_0_gir_CFLAGS = \
-UGTK_DISABLE_DEPRECATED \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
Gtk_2_0_gir_LIBS = $(gtktargetlib)
-Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+Gtk_2_0_gir_FILES = $(introspection_files)
INTROSPECTION_GIRS += Gtk-2.0.gir
girdir = $(datadir)/gir-1.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]