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.
This commit is contained in:
Emmanuele Bassi 2009-06-15 10:48:56 +01:00
parent e6a987d670
commit 0415d62d40
10 changed files with 16 additions and 3 deletions

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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) \

View File

@ -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)

View File

@ -2,7 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <glib/gtestutils.h>
#include <glib.h>
#include <clutter/clutter.h>

View File

@ -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

View File

@ -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)