From 4b33a9c5f4cdf26492d24b7e989ba8bba022edef Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue, 4 Oct 2011 11:07:03 +0100
Subject: [PATCH] Move ClutterScore to the deprecated section

---
 clutter/Makefile.am                      | 4 ++--
 clutter/clutter-deprecated.h             | 1 +
 clutter/clutter.h                        | 7 ++++---
 clutter/{ => deprecated}/clutter-score.c | 0
 clutter/{ => deprecated}/clutter-score.h | 0
 5 files changed, 7 insertions(+), 5 deletions(-)
 rename clutter/{ => deprecated}/clutter-score.c (100%)
 rename clutter/{ => deprecated}/clutter-score.h (100%)

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 6fb1ec16f..78eb3fb6b 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -111,7 +111,6 @@ source_h =					\
 	$(srcdir)/clutter-path-constraint.h	\
 	$(srcdir)/clutter-path.h		\
 	$(srcdir)/clutter-rectangle.h		\
-	$(srcdir)/clutter-score.h 		\
 	$(srcdir)/clutter-script.h		\
 	$(srcdir)/clutter-scriptable.h		\
 	$(srcdir)/clutter-settings.h		\
@@ -195,7 +194,6 @@ source_c = \
 	$(srcdir)/clutter-path-constraint.c	\
 	$(srcdir)/clutter-path.c		\
 	$(srcdir)/clutter-rectangle.c 		\
-	$(srcdir)/clutter-score.c 		\
 	$(srcdir)/clutter-script.c		\
 	$(srcdir)/clutter-script-parser.c	\
 	$(srcdir)/clutter-scriptable.c		\
@@ -254,12 +252,14 @@ source_c_priv = \
 deprecated_h = \
 	$(srcdir)/deprecated/clutter-frame-source.h	\
 	$(srcdir)/deprecated/clutter-timeout-pool.h 	\
+	$(srcdir)/deprecated/clutter-score.h 		\
 	$(NULL)
 
 # deprecated source code
 deprecated_c = \
 	$(srcdir)/deprecated/clutter-frame-source.c	\
 	$(srcdir)/deprecated/clutter-timeout-pool.c	\
+	$(srcdir)/deprecated/clutter-score.c 		\
 	$(NULL)
 
 # deprecated private headers; these should not be installed
diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h
index d64f83f3a..9606b6c4e 100644
--- a/clutter/clutter-deprecated.h
+++ b/clutter/clutter-deprecated.h
@@ -5,6 +5,7 @@
 
 #include "deprecated/clutter-frame-source.h"
 #include "deprecated/clutter-timeout-pool.h"
+#include "deprecated/clutter-score.h"
 
 #undef __CLUTTER_DEPRECATED_H_INSIDE__
 
diff --git a/clutter/clutter.h b/clutter/clutter.h
index 88ce6e984..4e480107c 100644
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -28,8 +28,6 @@
 
 #define __CLUTTER_H_INSIDE__
 
-#include "clutter-deprecated.h"
-
 #include "clutter-config.h"
 
 #include "clutter-action.h"
@@ -89,7 +87,6 @@
 #include "clutter-path-constraint.h"
 #include "clutter-path.h"
 #include "clutter-rectangle.h"
-#include "clutter-score.h"
 #include "clutter-scriptable.h"
 #include "clutter-script.h"
 #include "clutter-settings.h"
@@ -113,6 +110,10 @@
 
 #include "clutter-enum-types.h"
 
+#ifndef CLUTTER_DISABLE_DEPRECATED
+#include "clutter-deprecated.h"
+#endif
+
 #undef __CLUTTER_H_INSIDE__
 
 #endif /* __CLUTTER_H__ */
diff --git a/clutter/clutter-score.c b/clutter/deprecated/clutter-score.c
similarity index 100%
rename from clutter/clutter-score.c
rename to clutter/deprecated/clutter-score.c
diff --git a/clutter/clutter-score.h b/clutter/deprecated/clutter-score.h
similarity index 100%
rename from clutter/clutter-score.h
rename to clutter/deprecated/clutter-score.h