Move ClutterScore to the deprecated section

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

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__
 

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__ */