GNOME.org
 

[clutter] build: Fix out of tree builds

commit 41ed9023eb29600f2a3871e4321d49eb975b9d6f
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Jul 30 12:33:24 2012 +0100

    build: Fix out of tree builds

 examples/Makefile.am            |    1 +
 tests/accessibility/Makefile.am |    1 +
 tests/conform/Makefile.am       |    3 ++-
 tests/interactive/Makefile.am   |    1 +
 tests/micro-bench/Makefile.am   |    7 +++----
 tests/performance/Makefile.am   |    3 ++-
 6 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index a44482b..3d9bdb5 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -23,6 +23,7 @@ endif
 
 INCLUDES = \
 	-I$(top_srcdir)			\
+	-I$(top_builddir)		\
 	-I$(top_srcdir)/clutter 	\
 	-I$(top_builddir)/clutter
 
diff --git a/tests/accessibility/Makefile.am b/tests/accessibility/Makefile.am
index 71204c4..4c7a376 100644
--- a/tests/accessibility/Makefile.am
+++ b/tests/accessibility/Makefile.am
@@ -9,6 +9,7 @@ common_sources = \
 
 INCLUDES = \
 	-I$(top_srcdir)	\
+	-I$(top_builddir) \
 	-I$(top_srcdir)/clutter \
 	-I$(top_builddir)/clutter \
 	-I$(top_srcdir)/tests/accessibility
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index e06620e..210cbe0 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -151,7 +151,8 @@ clean-wrappers:
 BUILT_SOURCES = wrappers
 
 INCLUDES = \
-	-I$(top_srcdir)/ \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
 	-I$(top_srcdir)/clutter \
 	-I$(top_builddir)/clutter
 
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 8684393..04c762d 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -138,6 +138,7 @@ clean-wrappers:
 
 INCLUDES = \
 	-I$(top_srcdir)			\
+	-I$(top_builddir)		\
 	-I$(top_srcdir)/clutter 	\
 	-I$(top_builddir)/clutter
 
diff --git a/tests/micro-bench/Makefile.am b/tests/micro-bench/Makefile.am
index 68f5699..0bb3d58 100644
--- a/tests/micro-bench/Makefile.am
+++ b/tests/micro-bench/Makefile.am
@@ -10,11 +10,10 @@ noinst_PROGRAMS = \
 	test-cogl-perf
 
 INCLUDES = \
-	-I$(top_srcdir)/ \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
 	-I$(top_srcdir)/clutter \
-	-I$(top_srcdir)/clutter/cogl \
-	-I$(top_builddir)/clutter \
-	-I$(top_builddir)/clutter/cogl
+	-I$(top_builddir)/clutter
 
 AM_CFLAGS = \
 	$(CLUTTER_CFLAGS) \
diff --git a/tests/performance/Makefile.am b/tests/performance/Makefile.am
index 2c3f455..01262bf 100644
--- a/tests/performance/Makefile.am
+++ b/tests/performance/Makefile.am
@@ -10,7 +10,8 @@ noinst_PROGRAMS = \
 	test-state-pick
 
 INCLUDES = \
-	-I$(top_srcdir)/ \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
 	-I$(top_srcdir)/clutter \
 	-I$(top_builddir)/clutter
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]