diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 435b13929..041a009f5 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -61,12 +61,6 @@ source_h = \ $(srcdir)/clutter-animator.h \ $(srcdir)/clutter-backend.h \ $(srcdir)/clutter-behaviour.h \ - $(srcdir)/clutter-behaviour-depth.h \ - $(srcdir)/clutter-behaviour-ellipse.h \ - $(srcdir)/clutter-behaviour-opacity.h \ - $(srcdir)/clutter-behaviour-path.h \ - $(srcdir)/clutter-behaviour-rotate.h \ - $(srcdir)/clutter-behaviour-scale.h \ $(srcdir)/clutter-bind-constraint.h \ $(srcdir)/clutter-binding-pool.h \ $(srcdir)/clutter-bin-layout.h \ @@ -143,12 +137,6 @@ source_c = \ $(srcdir)/clutter-animator.c \ $(srcdir)/clutter-backend.c \ $(srcdir)/clutter-behaviour.c \ - $(srcdir)/clutter-behaviour-depth.c \ - $(srcdir)/clutter-behaviour-ellipse.c \ - $(srcdir)/clutter-behaviour-opacity.c \ - $(srcdir)/clutter-behaviour-path.c \ - $(srcdir)/clutter-behaviour-rotate.c \ - $(srcdir)/clutter-behaviour-scale.c \ $(srcdir)/clutter-bezier.c \ $(srcdir)/clutter-bind-constraint.c \ $(srcdir)/clutter-binding-pool.c \ @@ -248,18 +236,30 @@ source_c_priv = \ # deprecated installed headers deprecated_h = \ - $(srcdir)/deprecated/clutter-frame-source.h \ - $(srcdir)/deprecated/clutter-timeout-pool.h \ - $(srcdir)/deprecated/clutter-score.h \ - $(srcdir)/deprecated/clutter-shader.h \ + $(srcdir)/deprecated/clutter-behaviour-depth.h \ + $(srcdir)/deprecated/clutter-behaviour-ellipse.h \ + $(srcdir)/deprecated/clutter-behaviour-opacity.h \ + $(srcdir)/deprecated/clutter-behaviour-path.h \ + $(srcdir)/deprecated/clutter-behaviour-rotate.h \ + $(srcdir)/deprecated/clutter-behaviour-scale.h \ + $(srcdir)/deprecated/clutter-frame-source.h \ + $(srcdir)/deprecated/clutter-timeout-pool.h \ + $(srcdir)/deprecated/clutter-score.h \ + $(srcdir)/deprecated/clutter-shader.h \ $(NULL) # deprecated source code deprecated_c = \ - $(srcdir)/deprecated/clutter-frame-source.c \ - $(srcdir)/deprecated/clutter-timeout-pool.c \ - $(srcdir)/deprecated/clutter-score.c \ - $(srcdir)/deprecated/clutter-shader.c \ + $(srcdir)/deprecated/clutter-behaviour-depth.c \ + $(srcdir)/deprecated/clutter-behaviour-ellipse.c \ + $(srcdir)/deprecated/clutter-behaviour-opacity.c \ + $(srcdir)/deprecated/clutter-behaviour-path.c \ + $(srcdir)/deprecated/clutter-behaviour-rotate.c \ + $(srcdir)/deprecated/clutter-behaviour-scale.c \ + $(srcdir)/deprecated/clutter-frame-source.c \ + $(srcdir)/deprecated/clutter-timeout-pool.c \ + $(srcdir)/deprecated/clutter-score.c \ + $(srcdir)/deprecated/clutter-shader.c \ $(NULL) # deprecated private headers; these should not be installed diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h index 0837afad8..0e8b5e4d2 100644 --- a/clutter/clutter-deprecated.h +++ b/clutter/clutter-deprecated.h @@ -3,6 +3,12 @@ #define __CLUTTER_DEPRECATED_H_INSIDE__ +#include "deprecated/clutter-behaviour-depth.h" +#include "deprecated/clutter-behaviour-ellipse.h" +#include "deprecated/clutter-behaviour-opacity.h" +#include "deprecated/clutter-behaviour-path.h" +#include "deprecated/clutter-behaviour-rotate.h" +#include "deprecated/clutter-behaviour-scale.h" #include "deprecated/clutter-frame-source.h" #include "deprecated/clutter-timeout-pool.h" #include "deprecated/clutter-score.h" diff --git a/clutter/clutter.h b/clutter/clutter.h index 9ccbcf96d..82569087e 100644 --- a/clutter/clutter.h +++ b/clutter/clutter.h @@ -39,13 +39,7 @@ #include "clutter-animation.h" #include "clutter-animator.h" #include "clutter-backend.h" -#include "clutter-behaviour-depth.h" -#include "clutter-behaviour-ellipse.h" #include "clutter-behaviour.h" -#include "clutter-behaviour-opacity.h" -#include "clutter-behaviour-path.h" -#include "clutter-behaviour-rotate.h" -#include "clutter-behaviour-scale.h" #include "clutter-bind-constraint.h" #include "clutter-binding-pool.h" #include "clutter-bin-layout.h" diff --git a/clutter/clutter-behaviour-depth.c b/clutter/deprecated/clutter-behaviour-depth.c similarity index 100% rename from clutter/clutter-behaviour-depth.c rename to clutter/deprecated/clutter-behaviour-depth.c diff --git a/clutter/clutter-behaviour-depth.h b/clutter/deprecated/clutter-behaviour-depth.h similarity index 100% rename from clutter/clutter-behaviour-depth.h rename to clutter/deprecated/clutter-behaviour-depth.h diff --git a/clutter/clutter-behaviour-ellipse.c b/clutter/deprecated/clutter-behaviour-ellipse.c similarity index 100% rename from clutter/clutter-behaviour-ellipse.c rename to clutter/deprecated/clutter-behaviour-ellipse.c diff --git a/clutter/clutter-behaviour-ellipse.h b/clutter/deprecated/clutter-behaviour-ellipse.h similarity index 100% rename from clutter/clutter-behaviour-ellipse.h rename to clutter/deprecated/clutter-behaviour-ellipse.h diff --git a/clutter/clutter-behaviour-opacity.c b/clutter/deprecated/clutter-behaviour-opacity.c similarity index 100% rename from clutter/clutter-behaviour-opacity.c rename to clutter/deprecated/clutter-behaviour-opacity.c diff --git a/clutter/clutter-behaviour-opacity.h b/clutter/deprecated/clutter-behaviour-opacity.h similarity index 100% rename from clutter/clutter-behaviour-opacity.h rename to clutter/deprecated/clutter-behaviour-opacity.h diff --git a/clutter/clutter-behaviour-path.c b/clutter/deprecated/clutter-behaviour-path.c similarity index 100% rename from clutter/clutter-behaviour-path.c rename to clutter/deprecated/clutter-behaviour-path.c diff --git a/clutter/clutter-behaviour-path.h b/clutter/deprecated/clutter-behaviour-path.h similarity index 100% rename from clutter/clutter-behaviour-path.h rename to clutter/deprecated/clutter-behaviour-path.h diff --git a/clutter/clutter-behaviour-rotate.c b/clutter/deprecated/clutter-behaviour-rotate.c similarity index 100% rename from clutter/clutter-behaviour-rotate.c rename to clutter/deprecated/clutter-behaviour-rotate.c diff --git a/clutter/clutter-behaviour-rotate.h b/clutter/deprecated/clutter-behaviour-rotate.h similarity index 100% rename from clutter/clutter-behaviour-rotate.h rename to clutter/deprecated/clutter-behaviour-rotate.h diff --git a/clutter/clutter-behaviour-scale.c b/clutter/deprecated/clutter-behaviour-scale.c similarity index 100% rename from clutter/clutter-behaviour-scale.c rename to clutter/deprecated/clutter-behaviour-scale.c diff --git a/clutter/clutter-behaviour-scale.h b/clutter/deprecated/clutter-behaviour-scale.h similarity index 100% rename from clutter/clutter-behaviour-scale.h rename to clutter/deprecated/clutter-behaviour-scale.h