Mass rename CLUTTER_COMPILATION to COGL_COMPILATION

Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit a99512e5798e48ffa3a9a1a7eb98bc55647ee1b6)
2012-06-20 19:49:08 +02:00 · 2012-06-20 19:49:08 +02:00 · 93d0de1d9a
commit 93d0de1d9a
parent 4ad1e9b83a
65 changed files with 68 additions and 68 deletions
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@ -5,12 +5,12 @@
 	<GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>
    <CoglApiVersion>1.0</CoglApiVersion>
    <BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>
-    <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
+    <LibBuildDefines>HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
    <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
    <DebugLibBuildDefines>_DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG</DebugLibBuildDefines>
    <CoglBuildDefines>G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir"</CoglBuildDefines>
    <CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines>
-    <TestProgDef>CLUTTER_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>
+    <TestProgDef>COGL_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>
    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
    <DoDefinesSDL>
 if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@ -36,7 +36,7 @@
 	/>
 	<UserMacro
 		Name="LibBuildDefines"
-		Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)"
+		Value="HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)"
 	/>
 	<UserMacro
 		Name="ReleaseLibBuildDefines"
@ -56,7 +56,7 @@
 	/>
 	<UserMacro
 		Name="TestProgDef"
-		Value="CLUTTER_COMPILATION;TESTS_DATADIR=\&quot;../share/cogl-$(CoglApiVersion)/tests\&quot;"
+		Value="COGL_COMPILATION;TESTS_DATADIR=\&quot;../share/cogl-$(CoglApiVersion)/tests\&quot;"
 	/>
 	<UserMacro
 		Name="DoDefinesSDL"
--- a/cogl-pango/Makefile.am
+++ b/cogl-pango/Makefile.am
@ -37,7 +37,7 @@ libcogl_pango_la_LDFLAGS = \
 	-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@

 INCLUDES = \
-	-DCLUTTER_COMPILATION		\
+	-DCOGL_COMPILATION		\
 	-DG_LOG_DOMAIN=\"CoglPango\"	\
 	-I$(top_srcdir)/cogl		\
 	-I$(top_builddir)/cogl		\
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@ -25,7 +25,7 @@ INCLUDES = \

 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Cogl\" 	\
-	-DCLUTTER_COMPILATION		\
+	-DCOGL_COMPILATION		\
 	-DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \
 	-DCOGL_GLES1_LIBNAME=\"$(COGL_GLES1_LIBNAME)\" \
 	-DCOGL_GLES2_LIBNAME=\"$(COGL_GLES2_LIBNAME)\" \
--- a/cogl/cogl-attribute-buffer.h
+++ b/cogl/cogl-attribute-buffer.h
@ -24,7 +24,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-attribute.h
+++ b/cogl/cogl-attribute.h
@ -24,7 +24,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-bitmap.h
+++ b/cogl/cogl-bitmap.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-buffer.h
+++ b/cogl/cogl-buffer.h
@ -25,7 +25,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-clip-state.h
+++ b/cogl/cogl-clip-state.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-clutter-xlib.h
+++ b/cogl/cogl-clutter-xlib.h
@ -21,7 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl-xlib.h> can be included directly."
 #endif

--- a/cogl/cogl-clutter.h
+++ b/cogl/cogl-clutter.h
@ -21,7 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-color.h
+++ b/cogl/cogl-color.h
@ -31,7 +31,7 @@
 * Since: 1.0
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-context.h
+++ b/cogl/cogl-context.h
@ -24,7 +24,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-defines.h.in
+++ b/cogl/cogl-defines.h.in
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-defines.h.win32.in
+++ b/cogl/cogl-defines.h.win32.in
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-defines.h.win32_SDL.in
+++ b/cogl/cogl-defines.h.win32_SDL.in
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-depth-state.h
+++ b/cogl/cogl-depth-state.h
@ -24,7 +24,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-display.h
+++ b/cogl/cogl-display.h
@ -24,7 +24,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-euler.h
+++ b/cogl/cogl-euler.h
@ -24,7 +24,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-fixed.h
+++ b/cogl/cogl-fixed.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-gl-header.h.in
+++ b/cogl/cogl-gl-header.h.in
@ -21,7 +21,7 @@
 *
 */

-#if !defined(CLUTTER_COMPILATION)
+#if !defined(COGL_COMPILATION)
 #error "cogl-gl-header.h should only be included when compiling Cogl"
 #endif

--- a/cogl/cogl-gl-header.h.win32
+++ b/cogl/cogl-gl-header.h.win32
@ -21,7 +21,7 @@
 *
 */

-#if !defined(CLUTTER_COMPILATION)
+#if !defined(COGL_COMPILATION)
 #error "cogl-gl-header.h should only be included when compiling Cogl"
 #endif

--- a/cogl/cogl-gles2.h
+++ b/cogl/cogl-gles2.h
@ -43,7 +43,7 @@
 * conflicts we only expose the minimal set of GLES 2.0 types and enums
 * publicly.
 */
-#ifdef CLUTTER_COMPILATION
+#ifdef COGL_COMPILATION
 #include "cogl-gl-header.h"
 #else
 #include <cogl/cogl-gles2-types.h>
--- a/cogl/cogl-glib-source.h
+++ b/cogl/cogl-glib-source.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-index-buffer.h
+++ b/cogl/cogl-index-buffer.h
@ -24,7 +24,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-indices.h
+++ b/cogl/cogl-indices.h
@ -24,7 +24,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-kms-display.h
+++ b/cogl/cogl-kms-display.h
@ -22,7 +22,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-kms-renderer.h
+++ b/cogl/cogl-kms-renderer.h
@ -21,7 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-magazine-private.h
+++ b/cogl/cogl-magazine-private.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-material-compat.h
+++ b/cogl/cogl-material-compat.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-memory-stack-private.h
+++ b/cogl/cogl-memory-stack-private.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-meta-texture.h
+++ b/cogl/cogl-meta-texture.h
@ -22,7 +22,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-offscreen.h
+++ b/cogl/cogl-offscreen.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-onscreen-template.h
+++ b/cogl/cogl-onscreen-template.h
@ -24,7 +24,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-onscreen.h
+++ b/cogl/cogl-onscreen.h
@ -25,7 +25,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-path-functions.h
+++ b/cogl/cogl-path-functions.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-path.h
+++ b/cogl/cogl-path.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-pipeline-layer-state.h
+++ b/cogl/cogl-pipeline-layer-state.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-pipeline-state.h
+++ b/cogl/cogl-pipeline-state.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-pipeline.h
+++ b/cogl/cogl-pipeline.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-pixel-buffer.h
+++ b/cogl/cogl-pixel-buffer.h
@ -25,7 +25,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-poll.h
+++ b/cogl/cogl-poll.h
@ -24,7 +24,7 @@
 *  Neil Roberts <neil@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-primitive-texture.h
+++ b/cogl/cogl-primitive-texture.h
@ -22,7 +22,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-primitive.h
+++ b/cogl/cogl-primitive.h
@ -24,7 +24,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-quaternion.h
+++ b/cogl/cogl-quaternion.h
@ -24,7 +24,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-renderer.h
+++ b/cogl/cogl-renderer.h
@ -21,7 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-sdl.h
+++ b/cogl/cogl-sdl.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-shader.h
+++ b/cogl/cogl-shader.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-snippet.h
+++ b/cogl/cogl-snippet.h
@ -25,7 +25,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-sub-texture.h
+++ b/cogl/cogl-sub-texture.h
@ -24,7 +24,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-swap-chain.h
+++ b/cogl/cogl-swap-chain.h
@ -21,7 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-texture-2d.h
+++ b/cogl/cogl-texture-2d.h
@ -24,7 +24,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-texture-3d.h
+++ b/cogl/cogl-texture-3d.h
@ -24,7 +24,7 @@
 *   Neil Roberts <neil@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-texture.h
+++ b/cogl/cogl-texture.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-types.h
+++ b/cogl/cogl-types.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

@ -77,7 +77,7 @@ typedef int CoglBool;
   definitions because we want the size to be public so they can be
   allocated on the stack. This macro is used to ensure that users
   don't accidentally access private members */
-#ifdef CLUTTER_COMPILATION
+#ifdef COGL_COMPILATION
 #define COGL_PRIVATE(x) x
 #else
 #define COGL_PRIVATE(x) private_member_ ## x
--- a/cogl/cogl-vector.h
+++ b/cogl/cogl-vector.h
@ -24,7 +24,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-vertex-buffer.h
+++ b/cogl/cogl-vertex-buffer.h
@ -24,7 +24,7 @@
 *   Robert Bragg <robert@linux.intel.com>
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-wayland-renderer.h
+++ b/cogl/cogl-wayland-renderer.h
@ -21,7 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-win32-renderer.h
+++ b/cogl/cogl-win32-renderer.h
@ -21,7 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl-xlib-renderer.h
+++ b/cogl/cogl-xlib-renderer.h
@ -21,7 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl-xlib.h> can be included directly."
 #endif

--- a/cogl/cogl1-context.h
+++ b/cogl/cogl1-context.h
@ -24,7 +24,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl2-compatibility.h
+++ b/cogl/cogl2-compatibility.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/cogl/cogl2-path.h
+++ b/cogl/cogl2-path.h
@ -21,7 +21,7 @@
 *
 */

-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif

--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@ -116,7 +116,7 @@ test_conformance_CPPFLAGS = \
 	-DCOGL_ENABLE_EXPERIMENTAL_API \
 	-DCOGL_DISABLE_DEPRECATED \
 	-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \
-	-DCLUTTER_COMPILATION
+	-DCOGL_COMPILATION

 test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
 test_conformance_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la
--- a/tests/conform/test-no-gl-header.c
+++ b/tests/conform/test-no-gl-header.c
@ -1,4 +1,4 @@
-#undef CLUTTER_COMPILATION
+#undef COGL_COMPILATION
 #include <cogl/cogl.h>

 #include "test-utils.h"