From 9f6faaffb6491a8de5508b7678ab48fee4f59efa Mon Sep 17 00:00:00 2001
From: paul <ephraim_owns@hotmail.com>
Date: Thu, 5 Aug 2010 09:08:34 -0400
Subject: [PATCH] Add $(top_builddir)/glib to includes

This is required to find glibconfig.h during srcdir != builddir builds
---
 gio/Makefile.am            | 1 +
 gio/tests/Makefile.am      | 1 +
 glib/gnulib/Makefile.am    | 3 ++-
 glib/tests/Makefile.am     | 1 +
 gmodule/Makefile.am        | 1 +
 gobject/Makefile.am        | 1 +
 gobject/tests/Makefile.am  | 2 +-
 gthread/Makefile.am        | 1 +
 tests/Makefile.am          | 1 +
 tests/gobject/Makefile.am  | 1 +
 tests/refcount/Makefile.am | 1 +
 11 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gio/Makefile.am b/gio/Makefile.am
index dd6bb9e8b..2d82d3148 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -43,6 +43,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/glib				\
 	-I$(top_srcdir)/gmodule				\
+	-I$(top_builddir)/glib				\
 	$(GLIB_DEBUG_FLAGS)				\
 	$(THREAD_FLAGS)					\
 	-DG_DISABLE_DEPRECATED				\
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 1f3a95ef7..78fca6def 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = 			\
 	-I$(top_srcdir)/gmodule	\
 	-I$(top_srcdir)/gobject	\
 	-I$(top_srcdir)/gio 	\
+	-I$(top_builddir)/glib 	\
 	$(GLIB_DEBUG_FLAGS)	\
 	-DSRCDIR=\""$(srcdir)"\"
 
diff --git a/glib/gnulib/Makefile.am b/glib/gnulib/Makefile.am
index 5f5ef0635..17f8d2ee1 100644
--- a/glib/gnulib/Makefile.am
+++ b/glib/gnulib/Makefile.am
@@ -1,7 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -DG_LOG_DOMAIN=\"GLib\" \
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_builddir)/glib \
+	-DG_LOG_DOMAIN=\"GLib\" \
 	$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION 
 
 noinst_LTLIBRARIES = libgnulib.la
diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 0a137b0c5..5ccb57ac9 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -4,6 +4,7 @@ INCLUDES = 				\
 	-g 				\
 	-I$(top_srcdir) 		\
 	-I$(top_srcdir)/glib 		\
+	-I$(top_builddir)/glib		\
 	-DSRCDIR=\""$(srcdir)"\"	\
 	$(GLIB_DEBUG_FLAGS)
 
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 01cad55a5..0b142ddb0 100644
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS = 				\
 	-I$(top_srcdir) 		\
 	-I$(top_srcdir)/glib 		\
 	-I$(top_srcdir)/gmodule 	\
+	-I$(top_builddir)/glib 		\
 	-DG_LOG_DOMAIN=\"GModule\" 	\
 	@GLIB_DEBUG_FLAGS@ 		\
 	-DG_DISABLE_DEPRECATED
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 872991d3f..02193850a 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -17,6 +17,7 @@ AM_CPPFLAGS = 					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/glib			\
 	-I$(top_builddir)			\
+	-I$(top_builddir)/glib			\
 	$(GLIB_DEBUG_FLAGS)			\
 	$(THREAD_FLAGS)				\
 	-DG_DISABLE_DEPRECATED			\
diff --git a/gobject/tests/Makefile.am b/gobject/tests/Makefile.am
index d1735a2be..28a52b251 100644
--- a/gobject/tests/Makefile.am
+++ b/gobject/tests/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib $(GLIB_DEBUG_FLAGS)
+INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_builddir)/glib $(GLIB_DEBUG_FLAGS)
 
 noinst_PROGRAMS  = $(TEST_PROGS)
 libgobject_LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la
diff --git a/gthread/Makefile.am b/gthread/Makefile.am
index 29d94e1f3..0fa5b7cce 100644
--- a/gthread/Makefile.am
+++ b/gthread/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = 				\
 	-I$(top_srcdir) 		\
 	-I$(top_srcdir)/glib 		\
 	-I$(top_srcdir)/gthread 	\
+	-I$(top_builddir)/glib 		\
 	-DG_LOG_DOMAIN=\"GThread\" 	\
 	@GTHREAD_COMPILE_IMPL_DEFINES@ 	\
 	@GLIB_DEBUG_FLAGS@ 		\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5eed30a0a..29bb299f2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = 				\
 	-I$(top_srcdir) 		\
 	-I$(top_srcdir)/glib 		\
 	-I$(top_srcdir)/gmodule 	\
+	-I$(top_builddir)/glib 		\
 	$(GLIB_DEBUG_FLAGS)
 
 AM_CFLAGS = -g
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index a5509796e..ef1816842 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -4,6 +4,7 @@ INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/glib			\
 	-I$(top_srcdir)/gmodule			\
+	-I$(top_builddir)/glib			\
 	$(GLIB_DEBUG_FLAGS)
 
 libglib = $(top_builddir)/glib/libglib-2.0.la
diff --git a/tests/refcount/Makefile.am b/tests/refcount/Makefile.am
index e72c964de..3bbeaa391 100644
--- a/tests/refcount/Makefile.am
+++ b/tests/refcount/Makefile.am
@@ -4,6 +4,7 @@ INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/glib			\
 	-I$(top_srcdir)/gmodule			\
+	-I$(top_builddir)/glib			\
 	$(GLIB_DEBUG_FLAGS)
 
 libglib = $(top_builddir)/glib/libglib-2.0.la