[clutter] Remove CLUTTER_DISABLE_DEPRECATED from the build flags

[Emmanuele Bassi <ebassi src gnome org>]

commit 7ab84f981c39952926ea408a817a1d8a88c615ea
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Thu Nov 3 15:32:53 2011 +0000

    Remove CLUTTER_DISABLE_DEPRECATED from the build flags
    
    We don't use it any more.

 clutter/Makefile.am               |    8 ++++----
 configure.ac                      |    2 +-
 doc/cookbook/examples/Makefile.am |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 9c58500..2737c73 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -802,7 +802,7 @@ Clutter_ CLUTTER_API_VERSION_AM@_gir_FILES = \
 	$(source_c) \
 	$(deprecated_c) \
 	$(built_source_c)
-Clutter_ CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS) -UCLUTTER_DISABLE_DEPRECATED
+Clutter_ CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS)
 Clutter_ CLUTTER_API_VERSION_AM@_gir_INCLUDES = GL-1.0 GObject-2.0 cairo-1.0 Cogl-1.0 CoglPango-1.0 Atk-1.0 Json-1.0
 Clutter_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 	--warn-all \
@@ -817,7 +817,7 @@ Cally_ CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Cally
 Cally_ CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
 Cally_ CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter- CLUTTER_API_VERSION@.la
 Cally_ CLUTTER_API_VERSION_AM@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
-Cally_ CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS) -UCLUTTER_DISABLE_DEPRECATED
+Cally_ CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS)
 Cally_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 	--identifier-prefix=Cally \
 	--symbol-prefix=cally \
@@ -839,7 +839,7 @@ ClutterX11_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 ClutterX11_ CLUTTER_API_VERSION_AM@_gir_INCLUDES = xlib-2.0
 ClutterX11_ CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter- CLUTTER_API_VERSION@.la
 ClutterX11_ CLUTTER_API_VERSION_AM@_gir_FILES = $(x11_introspection)
-ClutterX11_ CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS) -UCLUTTER_DISABLE_DEPRECATED
+ClutterX11_ CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS)
 
 INTROSPECTION_GIRS += ClutterX11- CLUTTER_API_VERSION@.gir
 endif # SUPPORT_X11
@@ -856,7 +856,7 @@ ClutterGdk_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 ClutterGdk_ CLUTTER_API_VERSION_AM@_gir_INCLUDES = Gdk-3.0
 ClutterGdk_ CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter- CLUTTER_API_VERSION@.la
 ClutterGdk_ CLUTTER_API_VERSION_AM@_gir_FILES = $(gdk_introspection)
-ClutterGdk_ CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS) -UCLUTTER_DISABLE_DEPRECATED
+ClutterGdk_ CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS)
 
 INTROSPECTION_GIRS += ClutterGdk- CLUTTER_API_VERSION@.gir
 endif # SUPPORT_GDK
diff --git a/configure.ac b/configure.ac
index 3c4ddac..0843dc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -757,7 +757,7 @@ AS_CASE([$enable_deprecated],
 
         [no],
         [
-          CLUTTER_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES -DCOGL_DISABLE_DEPRECATED -DCLUTTER_DISABLE_DEPRECATED"
+          CLUTTER_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES -DCOGL_DISABLE_DEPRECATED"
         ],
 
         [yes],
diff --git a/doc/cookbook/examples/Makefile.am b/doc/cookbook/examples/Makefile.am
index 553459b..ada764c 100644
--- a/doc/cookbook/examples/Makefile.am
+++ b/doc/cookbook/examples/Makefile.am
@@ -64,7 +64,7 @@ AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
 AM_CPPFLAGS = \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	-DCOGL_DISABLE_DEPRECATED \
-	-DCLUTTER_DISABLE_DEPRECATED \
+	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
 	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\"
 
 AM_LDFLAGS = $(CLUTTER_LIBS) -export-dynamic