isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clean up deprecated header inclusion

Browse Source 
The build should not add deprecated/ into the default INCLUDE paths, so
that deprecated headers are clearly separated; this will make it easier
to get rid of them when we branch out for 2.0.
This commit is contained in:
Emmanuele Bassi 2012-06-21 17:15:44 +01:00
parent 8fe8b9c89e
commit 550168eee3
7 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/Makefile.am
View File

@ -14,7 +14,6 @@ lib_LTLIBRARIES =
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
-I$(top_srcdir)/clutter/deprecated \
-I$(top_srcdir)/clutter/cally \ -I$(top_srcdir)/clutter/cally \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_builddir)/clutter \ -I$(top_builddir)/clutter \

3
clutter/clutter-interval.c
View File

@ -58,11 +58,12 @@
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>
#include "clutter-color.h" #include "clutter-color.h"
#include "clutter-fixed.h"
#include "clutter-interval.h" #include "clutter-interval.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-units.h" #include "clutter-units.h"
#include "deprecated/clutter-fixed.h"
enum enum
{ {
PROP_0, PROP_0,

1
clutter/clutter-main.c
View File

@ -104,7 +104,6 @@
#include "clutter-device-manager-private.h" #include "clutter-device-manager-private.h"
#include "clutter-event-private.h" #include "clutter-event-private.h"
#include "clutter-feature.h" #include "clutter-feature.h"
#include "clutter-frame-source.h"
#include "clutter-main.h" #include "clutter-main.h"
#include "clutter-master-clock.h" #include "clutter-master-clock.h"
#include "clutter-private.h" #include "clutter-private.h"

2
clutter/clutter-script.c
View File

@ -237,7 +237,6 @@
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-actor.h" #include "clutter-actor.h"
#include "clutter-alpha.h"
#include "clutter-stage.h" #include "clutter-stage.h"
#include "clutter-texture.h" #include "clutter-texture.h"
@ -249,6 +248,7 @@
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-debug.h" #include "clutter-debug.h"
#include "deprecated/clutter-alpha.h"
#include "deprecated/clutter-behaviour.h" #include "deprecated/clutter-behaviour.h"
#include "deprecated/clutter-container.h" #include "deprecated/clutter-container.h"
#include "deprecated/clutter-state.h" #include "deprecated/clutter-state.h"

1
clutter/clutter-stage.c
View File

@ -75,7 +75,6 @@
#include "clutter-profile.h" #include "clutter-profile.h"
#include "clutter-stage-manager-private.h" #include "clutter-stage-manager-private.h"
#include "clutter-stage-private.h" #include "clutter-stage-private.h"
#include "clutter-util.h"
#include "clutter-version.h" /* For flavour */ #include "clutter-version.h" /* For flavour */
#include "clutter-private.h" #include "clutter-private.h"

1
clutter/cogl/clutter-stage-cogl.c
View File

@ -46,7 +46,6 @@
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-profile.h" #include "clutter-profile.h"
#include "clutter-stage-private.h" #include "clutter-stage-private.h"
#include "clutter-util.h"
static void clutter_stage_window_iface_init (ClutterStageWindowIface *iface); static void clutter_stage_window_iface_init (ClutterStageWindowIface *iface);

1
clutter/osx/clutter-backend-osx.c
View File

@ -30,7 +30,6 @@
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-shader.h"
#include "clutter-stage-private.h" #include "clutter-stage-private.h"
#include "cogl/cogl.h" #include "cogl/cogl.h"