[mutter] clutter: Require full relative path when including

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 0095c2e34002226e3269091dbae3a5a8c2ffa00e
Author: Jonas Ådahl <jadahl gmail com>
Date:   Wed May 23 11:04:56 2018 +0200

    clutter: Require full relative path when including

 clutter/clutter/Makefile.am    | 15 ---------------
 clutter/clutter/clutter-main.c |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)
---
diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
index 09ac1016e..0c2353299 100644
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@@ -16,7 +16,6 @@ AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Clutter\"              \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/clutter                 \
-       -I$(top_srcdir)/clutter/cally           \
        -I$(top_builddir)                       \
        -I$(top_builddir)/clutter               \
        -I$(top_srcdir)/../cogl                 \
@@ -439,9 +438,6 @@ backend_source_c_priv += $(x11_source_c_priv)
 # the list of files we want to introspect on X11
 x11_introspection = $(x11_source_c) $(x11_source_h)
 
-clutterx11_includedir = $(clutter_includedir)/x11
-clutterx11_include_HEADERS = $(x11_source_h)
-
 mutter-clutter-x11-@LIBMUTTER_API_VERSION@.pc: mutter-clutter-$(LIBMUTTER_API_VERSION).pc
        $(QUIET_GEN)cp -f $< $(@F)
 
@@ -490,9 +486,6 @@ backend_source_c_priv += $(evdev_c_priv)
 backend_source_h_priv += $(evdev_h_priv)
 backend_source_h += $(evdev_h)
 
-clutterevdev_includedir = $(clutter_includedir)/evdev
-clutterevdev_include_HEADERS = $(evdev_h)
-
 backend_source_c += evdev/clutter-xkb-utils.c
 backend_source_h_priv += evdev/clutter-xkb-utils.h
 
@@ -512,15 +505,10 @@ backend_source_h += $(wayland_compositor_source_h)
 backend_source_c += \
        wayland/clutter-wayland-surface.c
 
-wayland_compositor_includedir = $(clutter_includedir)/wayland
-wayland_compositor_include_HEADERS = $(wayland_compositor_source_h)
-
 backend_source_h += $(egl_source_h)
 backend_source_c += $(egl_source_c)
 backend_source_h_priv += $(egl_source_h_priv)
 
-clutteregl_includedir = $(clutter_includedir)/egl
-clutteregl_include_HEADERS = $(egl_source_h)
 endif # SUPPORT_WAYLAND
 
 # cally
@@ -556,9 +544,6 @@ cally_sources_private = \
        cally/cally-actor-private.h     \
        $(NULL)
 
-cally_includedir = $(clutter_base_includedir)/cally
-cally_include_HEADERS = $(cally_sources_h)
-
 # general build rules:
 # you should not need to modify anything below this point
 
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 25a9031f4..1753048f8 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -76,7 +76,7 @@
 #include <cogl/cogl.h>
 #include <cogl-pango/cogl-pango.h>
 
-#include "cally.h" /* For accessibility support */
+#include "cally/cally.h" /* For accessibility support */
 
 /* main context */
 static ClutterMainContext *ClutterCntx       = NULL;