[mutter] Enable CLUTTER / COGL_ENABLE_EXPERIMENTAL_API globally

[Owen Taylor <otaylor src gnome org>]

commit b07aea467e4e91e4dc75b7911e4c1338a6221b77
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Mon Nov 12 13:32:30 2012 -0500

    Enable CLUTTER / COGL_ENABLE_EXPERIMENTAL_API globally
    
    Instead of defining CLUTTER_ENABLE_EXPERIMENTAL_API and
    COGL_ENABLE_EXPERIMENTAL_API in individual source files, enable
    them on the command line. We weren't tracking exactly what pieces of
    experimental API we were using and we were using the experimental
    API in most source files that used Clutter and Cogl, so the
    local #defines were annoying rather than useful.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=685463

 src/Makefile.am                         |    2 ++
 src/compositor/meta-background-actor.c  |    2 --
 src/compositor/meta-shaped-texture.c    |    3 ---
 src/compositor/meta-texture-rectangle.c |    3 ---
 src/compositor/meta-window-actor.c      |    1 -
 5 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index a7e7406..51fc945 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,8 @@ lib_LTLIBRARIES = libmutter.la
 SUBDIRS=wm-tester tools compositor/plugins
 
 INCLUDES=								\
+	-DCLUTTER_ENABLE_EXPERIMENTAL_API				\
+	-DCOGL_ENABLE_EXPERIMENTAL_API					\
 	$(MUTTER_CFLAGS)						\
 	-I$(srcdir)							\
 	-I$(srcdir)/core						\
diff --git a/src/compositor/meta-background-actor.c b/src/compositor/meta-background-actor.c
index b039b58..41306b1 100644
--- a/src/compositor/meta-background-actor.c
+++ b/src/compositor/meta-background-actor.c
@@ -25,10 +25,8 @@
 
 #include <config.h>
 
-#define COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-texture-pixmap-x11.h>
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include <clutter/clutter.h>
 
 #include <X11/Xatom.h>
diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
index a5fce04..0d10f48 100644
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -27,9 +27,6 @@
 
 #include <config.h>
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#define COGL_ENABLE_EXPERIMENTAL_API
-
 #include <meta/meta-shaped-texture.h>
 #include "meta-texture-tower.h"
 
diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c
index af6817f..168e09b 100644
--- a/src/compositor/meta-texture-rectangle.c
+++ b/src/compositor/meta-texture-rectangle.c
@@ -25,9 +25,6 @@
 
 #include <config.h>
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#define COGL_ENABLE_EXPERIMENTAL_API
-
 #include <clutter/clutter.h>
 #include "meta-texture-rectangle.h"
 
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 214df03..a6c7c45 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -10,7 +10,6 @@
 #include <X11/extensions/Xrender.h>
 
 #include <clutter/x11/clutter-x11.h>
-#define COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-texture-pixmap-x11.h>
 #include <gdk/gdk.h> /* for gdk_rectangle_union() */
 #include <string.h>