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.

diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am
index a94c937..6c4ae1d 100644 (file)
--- 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 3e913e2..6459eb1 100644 (file)
--- 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 8ea83fd..d118612 100644 (file)
--- 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 a89cf2a..2a38c55 100644 (file)
--- 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 0484611..39b9ad6 100644 (file)
--- 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 50297f0..ea671e9 100644 (file)
--- 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 d1e52f2..336d2e2 100644 (file)
--- 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 c589625..853e55a 100644 (file)
--- 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 6f7d821..e938f63 100644 (file)
--- a/clutter/cogl/cogl/cogl-matrix.c
+++ b/clutter/cogl/cogl/cogl-matrix.c
@@ -27,6 +27,7 @@
 #define USE_MESA_MATRIX_API
 
 #include <cogl.h>
+#include "cogl-debug.h"
 #include <cogl-matrix.h>
 #include <cogl-matrix-private.h>
 #ifdef USE_MESA_MATRIX_API

diff --git a/clutter/cogl/cogl/cogl-primitives.c b/clutter/cogl/cogl/cogl-primitives.c
index e87231e..f380795 100644 (file)
--- 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 537a5f0..36292f8 100644 (file)
--- 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 7d6117e..205e9ad 100644 (file)
--- a/clutter/cogl/cogl/cogl.h
+++ b/clutter/cogl/cogl/cogl.h
@@ -34,7 +34,6 @@
 #include <cogl/cogl-object.h>
 #include <cogl/cogl-bitmap.h>
 #include <cogl/cogl-color.h>
-#include <cogl/cogl-debug.h>
 #include <cogl/cogl-fixed.h>
 #include <cogl/cogl-material.h>
 #include <cogl/cogl-matrix.h>

diff --git a/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
index 7e0545d..56097ea 100644 (file)
--- 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 d39145e..fc48c40 100644 (file)
--- a/clutter/cogl/pango/cogl-pango-render.c
+++ b/clutter/cogl/pango/cogl-pango-render.c
@@ -34,6 +34,7 @@
 #include <pango/pango-renderer.h>
 #include <cairo.h>
 
+#include "cogl/cogl-debug.h"
 #include "cogl-pango-private.h"
 #include "cogl-pango-glyph-cache.h"
 #include "cogl-pango-display-list.h"