[Cogl] [PATCH 1/4] fix out of tree builds

[Robert Bragg]

From: Robert Bragg <robert at linux.intel.com>

---
 cogl-gles2/Makefile.am    |    5 +++--
 cogl/Makefile.am          |    1 +
 deps/glib/Makefile.am     |    1 +
 deps/gmodule/Makefile.am  |    2 ++
 examples/Makefile.am      |    3 ++-
 tests/conform/Makefile.am |    3 ++-
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cogl-gles2/Makefile.am b/cogl-gles2/Makefile.am
index 3ff6291..0052d0e 100644
--- a/cogl-gles2/Makefile.am
+++ b/cogl-gles2/Makefile.am
@@ -7,8 +7,9 @@ NULL =
 lib_LTLIBRARIES = libcogl-gles2.la
 
 INCLUDES = \
-	-I$(top_srcdir)				\
-	-I$(top_builddir)
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_builddir)/deps/glib
 
 AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
 
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index d871c7f..fd6965c 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -18,6 +18,7 @@ lib_LTLIBRARIES =
 INCLUDES = \
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
+	-I$(top_builddir)/deps/glib		\
 	-I$(srcdir)/tesselator			\
 	-I$(srcdir)/winsys 			\
 	-I$(srcdir)/driver/$(COGL_DRIVER) 	\
diff --git a/deps/glib/Makefile.am b/deps/glib/Makefile.am
index ac43704..0bef7d9 100644
--- a/deps/glib/Makefile.am
+++ b/deps/glib/Makefile.am
@@ -2,6 +2,7 @@
 noinst_LTLIBRARIES = libglib.la
 
 libglib_la_CPPFLAGS =		\
+	-I$(top_srcdir)		\
 	-I$(top_srcdir)/deps	\
 	-Wall			\
 	$(NULL)
diff --git a/deps/gmodule/Makefile.am b/deps/gmodule/Makefile.am
index bc16958..73991a0 100644
--- a/deps/gmodule/Makefile.am
+++ b/deps/gmodule/Makefile.am
@@ -2,8 +2,10 @@
 noinst_LTLIBRARIES = libgmodule.la
 
 libgmodule_la_CPPFLAGS =		\
+	-I$(top_srcdir)			\
 	-I$(top_srcdir)/deps		\
 	-I$(top_srcdir)/deps/glib	\
+	-I$(top_builddir)/deps/glib	\
 	-Wall				\
 	$(NULL)
 
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 2589263..8f6928c 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,7 +1,8 @@
 include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 INCLUDES = \
-	-I$(top_srcdir)
+	-I$(top_srcdir) \
+	-I$(top_builddir)/deps/glib
 
 AM_CFLAGS = \
 	$(COGL_DEP_CFLAGS) \
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index ba18ae9..f66d3ee 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -109,7 +109,8 @@ BUILT_SOURCES = wrappers
 # testing (such as test-bitmask) will still compile
 INCLUDES = \
 	-I$(top_srcdir) \
-	-I$(top_builddir)/cogl
+	-I$(top_builddir)/cogl \
+	-I$(top_builddir)/deps/glib
 
 test_conformance_CPPFLAGS = \
 	-DCOGL_DISABLE_DEPRECATED \
-- 
1.7.7.6