Disable single header inclusion for GLib

In order to be ready for the next major version of GLib we need to
disable single header inclusion by using the G_DISABLE_SINGLE_INCLUDES
define in the build process.

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index cb79c7f..0acd9b2 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -32,6 +32,7 @@ INCLUDES = \
        -DCLUTTER_DATADIR=\""$(datadir)"\"              \
        -DCLUTTER_COMPILATION=1                         \
        -DG_DISABLE_DEPRECATED                          \
+       -DG_DISABLE_SINGLE_INCLUDES                     \
        -DG_LOG_DOMAIN=\"Clutter\"                      \
        $(CLUTTER_CFLAGS)                               \
        $(NULL)

diff --git a/clutter/cogl/common/Makefile.am b/clutter/cogl/common/Makefile.am
index 7a7dd82..15fb295 100644 (file)
--- a/clutter/cogl/common/Makefile.am
+++ b/clutter/cogl/common/Makefile.am
@@ -13,6 +13,7 @@ INCLUDES = \
        -I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \
        -I$(top_builddir)/clutter \
        -I$(top_builddir)/clutter/cogl \
+       -DG_DISABLE_SINGLE_INCLUDES \
         -DG_LOG_DOMAIN=\"Cogl-Common\" \
         -DCLUTTER_COMPILATION
 

diff --git a/clutter/cogl/gl/Makefile.am b/clutter/cogl/gl/Makefile.am
index 1aab5b6..7864a4a 100644 (file)
--- a/clutter/cogl/gl/Makefile.am
+++ b/clutter/cogl/gl/Makefile.am
@@ -42,6 +42,7 @@ INCLUDES = \
        -I$(top_srcdir)/clutter \
        -I$(top_builddir)/clutter \
        -I$(top_builddir)/clutter/cogl \
+       -DG_DISABLE_SINGLE_INCLUDES \
        -DG_LOG_DOMAIN=\"Cogl-GL\" \
        -DCLUTTER_COMPILATION
 

diff --git a/clutter/cogl/gles/Makefile.am b/clutter/cogl/gles/Makefile.am
index 3ce5365..6d17a6c 100644 (file)
--- a/clutter/cogl/gles/Makefile.am
+++ b/clutter/cogl/gles/Makefile.am
@@ -24,6 +24,7 @@ INCLUDES = \
        -I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \
        -I$(top_builddir)/clutter \
        -I$(top_builddir)/clutter/cogl \
+       -DG_DISABLE_SINGLE_INCLUDES \
         -DG_LOG_DOMAIN=\"Cogl-GLES\" \
         -DCLUTTER_COMPILATION
 

diff --git a/clutter/json/Makefile.am b/clutter/json/Makefile.am
index 66008ee..af15d0d 100644 (file)
--- a/clutter/json/Makefile.am
+++ b/clutter/json/Makefile.am
@@ -23,6 +23,7 @@ libclutter_json_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS)
 
 INCLUDES = \
        -I$(top_srcdir) \
+       -DG_DISABLE_SINGLE_INCLUDES \
        -DG_LOG_DOMAIN=\"Clutter-Json\" \
        -DG_DISABLE_DEPRECATED
 

diff --git a/clutter/pango/Makefile.am b/clutter/pango/Makefile.am
index 97e180d..5619773 100644 (file)
--- a/clutter/pango/Makefile.am
+++ b/clutter/pango/Makefile.am
@@ -18,6 +18,7 @@ libcoglpango_la_CPPFLAGS = $(CLUTTER_CFLAGS)
 libcoglpango_la_LIBADD = $(CLUTTER_LIBS)
 
 INCLUDES = \
+       -DG_DISABLE_SINGLE_INCLUDES     \
        -DCLUTTER_COMPILATION           \
        -DG_LOG_DOMAIN=\"CoglPango\"    \
        -I$(top_srcdir)                 \

diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index e446802..d80d52a 100644 (file)
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -66,6 +66,7 @@ test_conformance_CFLAGS = \
        -I$(top_srcdir)/ \
        -I$(top_srcdir)/clutter \
        -I$(top_builddir)/clutter \
+       -DG_DISABLE_SINGLE_INCLUDES \
        $(CLUTTER_CFLAGS) \
        $(MAINTAINER_CFLAGS)
 

diff --git a/tests/conform/test-clutter-rectangle.c b/tests/conform/test-clutter-rectangle.c
index 8f70887..6b59e3a 100644 (file)
--- a/tests/conform/test-clutter-rectangle.c
+++ b/tests/conform/test-clutter-rectangle.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gtestutils.h>
+#include <glib.h>
 
 #include <clutter/clutter.h>
 

diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 97ed304..32d6318 100644 (file)
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -74,9 +74,14 @@ wrappers: test-interactive$(EXEEXT)
 # a phony rule that will generate symlink scripts for running individual tests
 BUILT_SOURCES = wrappers redhand.png redhand_alpha.png light0.png light1.png test-script.json
 
-INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter
+INCLUDES = \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/clutter \
+       -I$(top_builddir)/clutter \
+       -DG_DISABLE_SINGLE_INCLUDES
+
 LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la
-AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
+AM_CPPFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
 AM_LDFLAGS = $(CLUTTER_LIBS)
 
 noinst_PROGRAMS = test-interactive

diff --git a/tests/micro-bench/Makefile.am b/tests/micro-bench/Makefile.am
index 4238d0d..37a9973 100644 (file)
--- a/tests/micro-bench/Makefile.am
+++ b/tests/micro-bench/Makefile.am
@@ -8,6 +8,7 @@ LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR
 AM_CFLAGS = \
        $(CLUTTER_CFLAGS) \
        $(MAINTAINER_CFLAGS) \
+       -DG_DISABLE_SINGLE_INCLUDES \
        -DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\"
 AM_LDFLAGS = $(CLUTTER_LIBS)