From 467c33a3e37904cb29ea596caff6c70ae5eb503a Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Sun, 25 Jul 2010 21:36:41 +0100 Subject: [PATCH] cogl: don't include cogl-debug.h in cogl.h or install cogl-debug.h is an internal header so it shouldn't have been included by cogl.h and the header shouldn't be installed either. --- clutter/cogl/cogl/Makefile.am | 2 +- clutter/cogl/cogl/cogl-atlas-texture.c | 1 + clutter/cogl/cogl/cogl-bitmap.c | 1 + clutter/cogl/cogl/cogl-framebuffer.c | 1 + clutter/cogl/cogl/cogl-journal.c | 1 + clutter/cogl/cogl/cogl-material-arbfp.c | 1 + clutter/cogl/cogl/cogl-material-opengl.c | 1 + clutter/cogl/cogl/cogl-material.c | 1 + clutter/cogl/cogl/cogl-matrix.c | 1 + clutter/cogl/cogl/cogl-primitives.c | 1 + clutter/cogl/cogl/cogl-texture-2d-sliced.c | 1 + clutter/cogl/cogl/cogl.h | 1 - clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 1 + clutter/cogl/pango/cogl-pango-render.c | 1 + 14 files changed, 13 insertions(+), 2 deletions(-) diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am index a94c937b6..6c4ae1d7a 100644 --- a/clutter/cogl/cogl/Makefile.am +++ b/clutter/cogl/cogl/Makefile.am @@ -57,7 +57,6 @@ cogl_public_h = \ $(srcdir)/cogl-bitmap.h \ $(srcdir)/cogl-buffer.h \ $(srcdir)/cogl-color.h \ - $(srcdir)/cogl-debug.h \ $(srcdir)/cogl-fixed.h \ $(srcdir)/cogl-material.h \ $(srcdir)/cogl-vector.h \ @@ -75,6 +74,7 @@ cogl_public_h = \ $(NULL) cogl_sources_c = \ + $(srcdir)/cogl-debug.h \ $(srcdir)/winsys/cogl-winsys.h \ $(srcdir)/winsys/cogl-context-winsys.h \ $(srcdir)/winsys/cogl-context-winsys.c \ diff --git a/clutter/cogl/cogl/cogl-atlas-texture.c b/clutter/cogl/cogl/cogl-atlas-texture.c index 3e913e24b..6459eb135 100644 --- a/clutter/cogl/cogl/cogl-atlas-texture.c +++ b/clutter/cogl/cogl/cogl-atlas-texture.c @@ -29,6 +29,7 @@ #endif #include "cogl.h" +#include "cogl-debug.h" #include "cogl-internal.h" #include "cogl-util.h" #include "cogl-texture-private.h" diff --git a/clutter/cogl/cogl/cogl-bitmap.c b/clutter/cogl/cogl/cogl-bitmap.c index 8ea83fd27..d1186129e 100644 --- a/clutter/cogl/cogl/cogl-bitmap.c +++ b/clutter/cogl/cogl/cogl-bitmap.c @@ -26,6 +26,7 @@ #endif #include "cogl.h" +#include "cogl-debug.h" #include "cogl-internal.h" #include "cogl-bitmap-private.h" #include "cogl-buffer-private.h" diff --git a/clutter/cogl/cogl/cogl-framebuffer.c b/clutter/cogl/cogl/cogl-framebuffer.c index a89cf2a68..2a38c552a 100644 --- a/clutter/cogl/cogl/cogl-framebuffer.c +++ b/clutter/cogl/cogl/cogl-framebuffer.c @@ -26,6 +26,7 @@ #endif #include "cogl.h" +#include "cogl-debug.h" #include "cogl-internal.h" #include "cogl-context.h" #include "cogl-handle.h" diff --git a/clutter/cogl/cogl/cogl-journal.c b/clutter/cogl/cogl/cogl-journal.c index 048461144..39b9ad6e9 100644 --- a/clutter/cogl/cogl/cogl-journal.c +++ b/clutter/cogl/cogl/cogl-journal.c @@ -26,6 +26,7 @@ #endif #include "cogl.h" +#include "cogl-debug.h" #include "cogl-internal.h" #include "cogl-context.h" #include "cogl-journal-private.h" diff --git a/clutter/cogl/cogl/cogl-material-arbfp.c b/clutter/cogl/cogl/cogl-material-arbfp.c index 50297f050..ea671e9a8 100644 --- a/clutter/cogl/cogl/cogl-material-arbfp.c +++ b/clutter/cogl/cogl/cogl-material-arbfp.c @@ -29,6 +29,7 @@ #include "config.h" #endif +#include "cogl-debug.h" #include "cogl-material-private.h" #ifdef COGL_MATERIAL_BACKEND_ARBFP diff --git a/clutter/cogl/cogl/cogl-material-opengl.c b/clutter/cogl/cogl/cogl-material-opengl.c index d1e52f204..336d2e2fa 100644 --- a/clutter/cogl/cogl/cogl-material-opengl.c +++ b/clutter/cogl/cogl/cogl-material-opengl.c @@ -31,6 +31,7 @@ #include "cogl.h" +#include "cogl-debug.h" #include "cogl-material-opengl-private.h" #include "cogl-material-private.h" #include "cogl-context.h" diff --git a/clutter/cogl/cogl/cogl-material.c b/clutter/cogl/cogl/cogl-material.c index c5896252d..853e55ab8 100644 --- a/clutter/cogl/cogl/cogl-material.c +++ b/clutter/cogl/cogl/cogl-material.c @@ -30,6 +30,7 @@ #endif #include "cogl.h" +#include "cogl-debug.h" #include "cogl-internal.h" #include "cogl-context.h" #include "cogl-object.h" diff --git a/clutter/cogl/cogl/cogl-matrix.c b/clutter/cogl/cogl/cogl-matrix.c index 6f7d82175..e938f6325 100644 --- a/clutter/cogl/cogl/cogl-matrix.c +++ b/clutter/cogl/cogl/cogl-matrix.c @@ -27,6 +27,7 @@ #define USE_MESA_MATRIX_API #include +#include "cogl-debug.h" #include #include #ifdef USE_MESA_MATRIX_API diff --git a/clutter/cogl/cogl/cogl-primitives.c b/clutter/cogl/cogl/cogl-primitives.c index e87231eb2..f380795bf 100644 --- a/clutter/cogl/cogl/cogl-primitives.c +++ b/clutter/cogl/cogl/cogl-primitives.c @@ -26,6 +26,7 @@ #endif #include "cogl.h" +#include "cogl-debug.h" #include "cogl-internal.h" #include "cogl-context.h" #include "cogl-journal-private.h" diff --git a/clutter/cogl/cogl/cogl-texture-2d-sliced.c b/clutter/cogl/cogl/cogl-texture-2d-sliced.c index 537a5f000..36292f8c9 100644 --- a/clutter/cogl/cogl/cogl-texture-2d-sliced.c +++ b/clutter/cogl/cogl/cogl-texture-2d-sliced.c @@ -31,6 +31,7 @@ #endif #include "cogl.h" +#include "cogl-debug.h" #include "cogl-internal.h" #include "cogl-util.h" #include "cogl-bitmap.h" diff --git a/clutter/cogl/cogl/cogl.h b/clutter/cogl/cogl/cogl.h index 7d6117e4d..205e9adfe 100644 --- a/clutter/cogl/cogl/cogl.h +++ b/clutter/cogl/cogl/cogl.h @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c index 7e0545d8d..56097ea15 100644 --- a/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c +++ b/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c @@ -30,6 +30,7 @@ #endif #include "cogl.h" +#include "cogl-debug.h" #include "cogl-internal.h" #include "cogl-util.h" #include "cogl-texture-pixmap-x11.h" diff --git a/clutter/cogl/pango/cogl-pango-render.c b/clutter/cogl/pango/cogl-pango-render.c index d39145e74..fc48c40ad 100644 --- a/clutter/cogl/pango/cogl-pango-render.c +++ b/clutter/cogl/pango/cogl-pango-render.c @@ -34,6 +34,7 @@ #include #include +#include "cogl/cogl-debug.h" #include "cogl-pango-private.h" #include "cogl-pango-glyph-cache.h" #include "cogl-pango-display-list.h"