[mutter] build: Fix cogl include paths

[Florian Müllner <fmuellner src gnome org>]

commit 0aa6d9782c6bbe887f615bc4b8c446d9f840ce12
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Nov 22 17:08:16 2016 +0100

    build: Fix cogl include paths
    
    cogl-egl-defines.h is now referenced from a public header, so we need
    to include its location whenever the header is used (directly or via
    cogl.h).

 clutter/clutter/Makefile.am        |    1 +
 clutter/tests/conform/Makefile.am  |    1 +
 cogl/tests/micro-perf/Makefile.am  |    1 +
 src/compositor/plugins/Makefile.am |    1 +
 4 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
index ed48644..c222d2e 100644
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@@ -25,6 +25,7 @@ AM_CPPFLAGS = \
        -I$(top_builddir)/clutter               \
        -I$(top_srcdir)/../cogl                 \
        -I$(top_builddir)/../cogl               \
+       -I$(top_builddir)/../cogl/cogl          \
        $(CLUTTER_DEPRECATED_CFLAGS)            \
        $(CLUTTER_DEBUG_CFLAGS)                 \
        $(CLUTTER_HIDDEN_VISIBILITY_CFLAGS)     \
diff --git a/clutter/tests/conform/Makefile.am b/clutter/tests/conform/Makefile.am
index 69e5dd4..a9e62bd 100644
--- a/clutter/tests/conform/Makefile.am
+++ b/clutter/tests/conform/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Clutter-Conform\"      \
        -I$(top_srcdir)/../cogl                 \
        -I$(top_builddir)/../cogl               \
+       -I$(top_builddir)/../cogl/cogl          \
        -I$(top_srcdir)                         \
        -I$(top_builddir)                       \
        -DCOGL_DISABLE_DEPRECATION_WARNINGS     \
diff --git a/cogl/tests/micro-perf/Makefile.am b/cogl/tests/micro-perf/Makefile.am
index 5462f79..c2cb1a1 100644
--- a/cogl/tests/micro-perf/Makefile.am
+++ b/cogl/tests/micro-perf/Makefile.am
@@ -2,6 +2,7 @@ NULL =
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
+       -I$(top_builddir)/cogl \
        -DCOGL_DISABLE_DEPRECATED
 
 test_conformance_CPPFLAGS = \
diff --git a/src/compositor/plugins/Makefile.am b/src/compositor/plugins/Makefile.am
index f3e2d57..99ed08d 100644
--- a/src/compositor/plugins/Makefile.am
+++ b/src/compositor/plugins/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src                                             \
        -I$(top_srcdir)/cogl                                            \
        -I$(top_builddir)/cogl                                          \
+       -I$(top_builddir)/cogl/cogl                                     \
        -I$(top_srcdir)/clutter                                         \
        -I$(top_builddir)/clutter                                       \
        -I$(top_builddir)/clutter/clutter                               \