From 4b748f433419462bd3daba18191f2fc173224a76 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 4 Oct 2011 10:57:28 +0100 Subject: [PATCH] Move timeout pool to the deprecated section --- clutter/Makefile.am | 8 ++++---- clutter/clutter-deprecated.h | 1 + clutter/clutter.h | 1 - clutter/{ => deprecated}/clutter-timeout-interval.c | 0 clutter/{ => deprecated}/clutter-timeout-interval.h | 0 clutter/{ => deprecated}/clutter-timeout-pool.c | 0 clutter/{ => deprecated}/clutter-timeout-pool.h | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename clutter/{ => deprecated}/clutter-timeout-interval.c (100%) rename clutter/{ => deprecated}/clutter-timeout-interval.h (100%) rename clutter/{ => deprecated}/clutter-timeout-pool.c (100%) rename clutter/{ => deprecated}/clutter-timeout-pool.h (100%) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 7ddb7f050..6fb1ec16f 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -128,7 +128,6 @@ source_h = \ $(srcdir)/clutter-texture.h \ $(srcdir)/clutter-text.h \ $(srcdir)/clutter-timeline.h \ - $(srcdir)/clutter-timeout-pool.h \ $(srcdir)/clutter-types.h \ $(srcdir)/clutter-units.h \ $(srcdir)/clutter-util.h \ @@ -214,7 +213,6 @@ source_c = \ $(srcdir)/clutter-texture.c \ $(srcdir)/clutter-text.c \ $(srcdir)/clutter-timeline.c \ - $(srcdir)/clutter-timeout-pool.c \ $(srcdir)/clutter-units.c \ $(srcdir)/clutter-util.c \ $(srcdir)/clutter-paint-volume.c \ @@ -243,7 +241,6 @@ source_h_priv = \ $(srcdir)/clutter-settings-private.h \ $(srcdir)/clutter-stage-manager-private.h \ $(srcdir)/clutter-stage-private.h \ - $(srcdir)/clutter-timeout-interval.h \ $(NULL) # private source code; these should not be introspected @@ -251,25 +248,28 @@ source_c_priv = \ $(srcdir)/clutter-event-translator.c \ $(srcdir)/clutter-id-pool.c \ $(srcdir)/clutter-profile.c \ - $(srcdir)/clutter-timeout-interval.c \ $(NULL) # deprecated installed headers deprecated_h = \ $(srcdir)/deprecated/clutter-frame-source.h \ + $(srcdir)/deprecated/clutter-timeout-pool.h \ $(NULL) # deprecated source code deprecated_c = \ $(srcdir)/deprecated/clutter-frame-source.c \ + $(srcdir)/deprecated/clutter-timeout-pool.c \ $(NULL) # deprecated private headers; these should not be installed deprecated_h_priv = \ + $(srcdir)/deprecated/clutter-timeout-interval.h \ $(NULL) # deprecated private source code; these should not be introspected deprecated_c_priv = \ + $(srcdir)/deprecated/clutter-timeout-interval.c \ $(NULL) # built sources diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h index 0d0c5adf5..d64f83f3a 100644 --- a/clutter/clutter-deprecated.h +++ b/clutter/clutter-deprecated.h @@ -4,6 +4,7 @@ #define __CLUTTER_DEPRECATED_H_INSIDE__ #include "deprecated/clutter-frame-source.h" +#include "deprecated/clutter-timeout-pool.h" #undef __CLUTTER_DEPRECATED_H_INSIDE__ diff --git a/clutter/clutter.h b/clutter/clutter.h index e9c731a6d..88ce6e984 100644 --- a/clutter/clutter.h +++ b/clutter/clutter.h @@ -106,7 +106,6 @@ #include "clutter-texture.h" #include "clutter-text.h" #include "clutter-timeline.h" -#include "clutter-timeout-pool.h" #include "clutter-types.h" #include "clutter-units.h" #include "clutter-util.h" diff --git a/clutter/clutter-timeout-interval.c b/clutter/deprecated/clutter-timeout-interval.c similarity index 100% rename from clutter/clutter-timeout-interval.c rename to clutter/deprecated/clutter-timeout-interval.c diff --git a/clutter/clutter-timeout-interval.h b/clutter/deprecated/clutter-timeout-interval.h similarity index 100% rename from clutter/clutter-timeout-interval.h rename to clutter/deprecated/clutter-timeout-interval.h diff --git a/clutter/clutter-timeout-pool.c b/clutter/deprecated/clutter-timeout-pool.c similarity index 100% rename from clutter/clutter-timeout-pool.c rename to clutter/deprecated/clutter-timeout-pool.c diff --git a/clutter/clutter-timeout-pool.h b/clutter/deprecated/clutter-timeout-pool.h similarity index 100% rename from clutter/clutter-timeout-pool.h rename to clutter/deprecated/clutter-timeout-pool.h