Move clutter-fixed.[ch] to the deprecated section

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index fcb4a93..dc0f4ab 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -84,7 +84,6 @@ source_h =                                    \
        $(srcdir)/clutter-effect.h              \
        $(srcdir)/clutter-event.h               \
        $(srcdir)/clutter-feature.h             \
-       $(srcdir)/clutter-fixed.h               \
        $(srcdir)/clutter-fixed-layout.h        \
        $(srcdir)/clutter-flow-layout.h         \
        $(srcdir)/clutter-gesture-action.h      \
@@ -158,7 +157,6 @@ source_c = \
        $(srcdir)/clutter-effect.c              \
        $(srcdir)/clutter-event.c               \
        $(srcdir)/clutter-feature.c             \
-       $(srcdir)/clutter-fixed.c               \
        $(srcdir)/clutter-fixed-layout.c        \
        $(srcdir)/clutter-flatten-effect.c      \
        $(srcdir)/clutter-flow-layout.c         \
@@ -241,6 +239,7 @@ deprecated_h = \
        $(srcdir)/deprecated/clutter-behaviour-path.h           \
        $(srcdir)/deprecated/clutter-behaviour-rotate.h         \
        $(srcdir)/deprecated/clutter-behaviour-scale.h          \
+       $(srcdir)/deprecated/clutter-fixed.h                    \
        $(srcdir)/deprecated/clutter-frame-source.h             \
        $(srcdir)/deprecated/clutter-timeout-pool.h             \
        $(srcdir)/deprecated/clutter-score.h                    \
@@ -256,6 +255,7 @@ deprecated_c = \
        $(srcdir)/deprecated/clutter-behaviour-path.c           \
        $(srcdir)/deprecated/clutter-behaviour-rotate.c         \
        $(srcdir)/deprecated/clutter-behaviour-scale.c          \
+       $(srcdir)/deprecated/clutter-fixed.c                    \
        $(srcdir)/deprecated/clutter-frame-source.c             \
        $(srcdir)/deprecated/clutter-timeout-pool.c             \
        $(srcdir)/deprecated/clutter-score.c                    \

diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h
index cb27c83..9ac1504 100644 (file)
--- a/clutter/clutter-deprecated.h
+++ b/clutter/clutter-deprecated.h
@@ -10,6 +10,7 @@
 #include "deprecated/clutter-behaviour-path.h"
 #include "deprecated/clutter-behaviour-rotate.h"
 #include "deprecated/clutter-behaviour-scale.h"
+#include "deprecated/clutter-fixed.h"
 #include "deprecated/clutter-frame-source.h"
 #include "deprecated/clutter-timeout-pool.h"
 #include "deprecated/clutter-score.h"

diff --git a/clutter/clutter-timeline.h b/clutter/clutter-timeline.h
index adc0f90..ce28910 100644 (file)
--- a/clutter/clutter-timeline.h
+++ b/clutter/clutter-timeline.h
@@ -29,7 +29,6 @@
 #define __CLUTTER_TIMELINE_H__
 
 #include <glib-object.h>
-#include <clutter/clutter-fixed.h>
 
 G_BEGIN_DECLS
 

diff --git a/clutter/clutter-fixed.c b/clutter/deprecated/clutter-fixed.c
similarity index 100%
rename from clutter/clutter-fixed.c
rename to clutter/deprecated/clutter-fixed.c

diff --git a/clutter/clutter-fixed.h b/clutter/deprecated/clutter-fixed.h
similarity index 100%
rename from clutter/clutter-fixed.h
rename to clutter/deprecated/clutter-fixed.h