build: Remove INCLUDES directives

They have been deprecated for a while, replaced by AM_CPPFLAGS.

tests/conform/Makefile.am

@@ -151,18 +151,16 @@ clean-wrappers:
 # a phony rule that will generate symlink scripts for running individual tests
 BUILT_SOURCES = wrappers
 
-INCLUDES = \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	-I$(top_srcdir)/clutter \
-	-I$(top_builddir)/clutter
-
 test_conformance_CPPFLAGS = \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	-DCOGL_ENABLE_EXPERIMENTAL_API \
 	-DG_DISABLE_DEPRECATION_WARNINGS \
 	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
-	-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\"
+	-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/clutter \
+	-I$(top_builddir)/clutter
 
 test_conformance_CFLAGS = -g $(CLUTTER_CFLAGS)
 

tests/interactive/Makefile.am

@@ -136,12 +136,6 @@ clean-wrappers:
 
 .PHONY: wrappers clean-wrappers
 
-INCLUDES = \
-	-I$(top_srcdir)			\
-	-I$(top_builddir)		\
-	-I$(top_srcdir)/clutter 	\
-	-I$(top_builddir)/clutter
-
 common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la
 
 noinst_PROGRAMS = test-interactive
@@ -153,7 +147,11 @@ test_interactive_CPPFLAGS = \
 	-DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
-	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS
+	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
+	-I$(top_srcdir)	\
+	-I$(top_builddir) \
+	-I$(top_srcdir)/clutter \
+	-I$(top_builddir)/clutter
 test_interactive_LDFLAGS = -export-dynamic
 test_interactive_LDADD = $(CLUTTER_LIBS) $(GDK_PIXBUF_LIBS) $(common_ldadd) -lm
 

tests/micro-bench/Makefile.am

@@ -9,20 +9,18 @@ noinst_PROGRAMS = \
 	test-random-text \
 	test-cogl-perf
 
-INCLUDES = \
+AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
+
+AM_CPPFLAGS = \
+	-DG_DISABLE_SINGLE_INCLUDES \
+	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
+	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
+	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/clutter \
 	-I$(top_builddir)/clutter
 
-AM_CFLAGS = \
-	$(CLUTTER_CFLAGS) \
-	$(MAINTAINER_CFLAGS) \
-	-DG_DISABLE_SINGLE_INCLUDES \
-	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
-	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
-	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\"
-
 LDADD = $(common_ldadd) $(CLUTTER_LIBS) -lm
 
 test_text_SOURCES = test-text.c

tests/performance/Makefile.am

@@ -9,22 +9,21 @@ noinst_PROGRAMS = \
 	test-state-mini \
 	test-state-pick
 
-INCLUDES = \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	-I$(top_srcdir)/clutter \
-	-I$(top_builddir)/clutter
-
 common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la
 
 LDADD = $(common_ldadd) $(CLUTTER_LIBS) -lm
 
-AM_CFLAGS = \
-	$(CLUTTER_CFLAGS) \
+AM_CFLAGS = $(CLUTTER_CFLAGS)
+
+AM_CPPFLAGS = \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
 	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
-	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\"
+	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/clutter \
+	-I$(top_builddir)/clutter
 
 perf-report: check