Move ClutterModel to the deprecated area

And deal with the fallout in the source tree.

clutter/Makefile.am

@@ -96,7 +96,6 @@ source_h =					\
 	clutter-layout-meta.h		\
 	clutter-macros.h		\
 	clutter-main.h		\
-	clutter-model.h		\
 	clutter-offscreen-effect.h	\
 	clutter-page-turn-effect.h	\
 	clutter-paint-nodes.h		\
@@ -178,7 +177,6 @@ source_c = \
 	clutter-main.c 		\
 	clutter-master-clock.c	\
 	clutter-master-clock-default.c	\
-	clutter-model.c		\
 	clutter-offscreen-effect.c	\
 	clutter-page-turn-effect.c	\
 	clutter-paint-nodes.c		\
@@ -232,7 +230,6 @@ source_h_priv = \
 	clutter-id-pool.h 			\
 	clutter-master-clock.h			\
 	clutter-master-clock-default.h		\
-	clutter-model-private.h			\
 	clutter-offscreen-effect-private.h	\
 	clutter-paint-node-private.h		\
 	clutter-paint-volume-private.h		\
@@ -278,6 +275,7 @@ deprecated_h = \
 	deprecated/clutter-list-model.h			\
 	deprecated/clutter-main.h			\
 	deprecated/clutter-media.h			\
+	deprecated/clutter-model.h			\
 	deprecated/clutter-rectangle.h		\
 	deprecated/clutter-score.h 			\
 	deprecated/clutter-shader.h 			\
@@ -313,6 +311,7 @@ deprecated_c = \
 	deprecated/clutter-layout-manager-deprecated.c \
 	deprecated/clutter-list-model.c			\
 	deprecated/clutter-media.c			\
+	deprecated/clutter-model.c			\
 	deprecated/clutter-rectangle.c 		\
 	deprecated/clutter-score.c 			\
 	deprecated/clutter-shader.c 			\
@@ -324,6 +323,7 @@ deprecated_c = \
 
 # deprecated private headers; these should not be installed
 deprecated_h_priv = \
+	deprecatec/clutter-model-private.h	\
 	deprecated/clutter-timeout-interval.h	\
 	$(NULL)
 

clutter/clutter-deprecated.h

@@ -28,6 +28,7 @@
 #include "deprecated/clutter-list-model.h"
 #include "deprecated/clutter-main.h"
 #include "deprecated/clutter-media.h"
+#include "deprecated/clutter-model.h"
 #include "deprecated/clutter-rectangle.h"
 #include "deprecated/clutter-score.h"
 #include "deprecated/clutter-shader.h"

clutter/clutter.h

@@ -78,7 +78,6 @@
 #include "clutter-layout-meta.h"
 #include "clutter-macros.h"
 #include "clutter-main.h"
-#include "clutter-model.h"
 #include "clutter-offscreen-effect.h"
 #include "clutter-page-turn-effect.h"
 #include "clutter-paint-nodes.h"

clutter/deprecated/clutter-list-model.h

@@ -32,7 +32,7 @@
 #ifndef __CLUTTER_LIST_MODEL_H__
 #define __CLUTTER_LIST_MODEL_H__
 
-#include <clutter/clutter-model.h>
+#include <clutter/deprecated/clutter-model.h>
 
 G_BEGIN_DECLS
 

clutter/deprecated/clutter-model-private.h

@@ -26,8 +26,8 @@
 #ifndef __CLUTTER_MODEL_PRIVATE_H__
 #define __CLUTTER_MODEL_PRIVATE_H__
 
-#include <clutter/clutter-types.h>
+#include "clutter-types.h"
-#include <clutter/clutter-model.h>
+#include "clutter-model.h"
 
 G_BEGIN_DECLS