build: Use subdir-objects

(cherry picked from commit e2eb0b0adad71bbd3bd71d5e82288bd9d9c5985d)

Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>

1 files changed, 369 insertions, 367 deletions

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index d4093e395..8c6307029 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 # preamble
@@ -47,287 +49,287 @@ pc_files =
 
 # common sources - please, keep these sorted alphabetically
 source_h =					\
-	$(srcdir)/clutter-action.h		\
-	$(srcdir)/clutter-actor-meta.h		\
-	$(srcdir)/clutter-actor.h		\
-	$(srcdir)/clutter-align-constraint.h	\
-	$(srcdir)/clutter-animatable.h          \
-	$(srcdir)/clutter-backend.h		\
-	$(srcdir)/clutter-bind-constraint.h	\
-	$(srcdir)/clutter-binding-pool.h 	\
-	$(srcdir)/clutter-bin-layout.h		\
-	$(srcdir)/clutter-blur-effect.h		\
-	$(srcdir)/clutter-box-layout.h		\
-	$(srcdir)/clutter-brightness-contrast-effect.h	\
-	$(srcdir)/clutter-cairo.h		\
-	$(srcdir)/clutter-canvas.h		\
-	$(srcdir)/clutter-child-meta.h		\
-	$(srcdir)/clutter-click-action.h	\
-	$(srcdir)/clutter-cogl-compat.h 	\
-	$(srcdir)/clutter-clone.h		\
-	$(srcdir)/clutter-color-static.h	\
-	$(srcdir)/clutter-color.h		\
-	$(srcdir)/clutter-colorize-effect.h	\
-	$(srcdir)/clutter-constraint.h		\
-	$(srcdir)/clutter-container.h		\
-	$(srcdir)/clutter-content.h		\
-	$(srcdir)/clutter-deform-effect.h	\
-	$(srcdir)/clutter-deprecated.h		\
-	$(srcdir)/clutter-desaturate-effect.h	\
-	$(srcdir)/clutter-device-manager.h	\
-	$(srcdir)/clutter-drag-action.h		\
-	$(srcdir)/clutter-drop-action.h		\
-	$(srcdir)/clutter-effect.h		\
-	$(srcdir)/clutter-enums.h		\
-	$(srcdir)/clutter-event.h 		\
-	$(srcdir)/clutter-feature.h 		\
-	$(srcdir)/clutter-fixed-layout.h	\
-	$(srcdir)/clutter-flow-layout.h		\
-	$(srcdir)/clutter-gesture-action.h 	\
-	$(srcdir)/clutter-grid-layout.h 	\
-	$(srcdir)/clutter-group.h 		\
-	$(srcdir)/clutter-image.h		\
-	$(srcdir)/clutter-input-device.h	\
-        $(srcdir)/clutter-interval.h            \
-	$(srcdir)/clutter-keyframe-transition.h	\
-	$(srcdir)/clutter-keysyms.h 		\
-	$(srcdir)/clutter-layout-manager.h	\
-	$(srcdir)/clutter-layout-meta.h		\
-	$(srcdir)/clutter-list-model.h		\
-	$(srcdir)/clutter-macros.h		\
-	$(srcdir)/clutter-main.h		\
-	$(srcdir)/clutter-model.h		\
-	$(srcdir)/clutter-offscreen-effect.h	\
-	$(srcdir)/clutter-page-turn-effect.h	\
-	$(srcdir)/clutter-paint-nodes.h		\
-	$(srcdir)/clutter-paint-node.h		\
-	$(srcdir)/clutter-pan-action.h		\
-	$(srcdir)/clutter-path-constraint.h	\
-	$(srcdir)/clutter-path.h		\
-	$(srcdir)/clutter-property-transition.h	\
-	$(srcdir)/clutter-rotate-action.h	\
-	$(srcdir)/clutter-script.h		\
-	$(srcdir)/clutter-scriptable.h		\
-	$(srcdir)/clutter-scroll-actor.h	\
-	$(srcdir)/clutter-settings.h		\
-	$(srcdir)/clutter-shader-effect.h	\
-	$(srcdir)/clutter-shader-types.h	\
-	$(srcdir)/clutter-swipe-action.h	\
-	$(srcdir)/clutter-snap-constraint.h	\
-	$(srcdir)/clutter-stage.h 		\
-	$(srcdir)/clutter-stage-manager.h	\
-	$(srcdir)/clutter-tap-action.h		\
-	$(srcdir)/clutter-test-utils.h		\
-	$(srcdir)/clutter-texture.h 		\
-	$(srcdir)/clutter-text.h		\
-	$(srcdir)/clutter-text-buffer.h		\
-	$(srcdir)/clutter-timeline.h 		\
-	$(srcdir)/clutter-transition-group.h	\
-	$(srcdir)/clutter-transition.h		\
-	$(srcdir)/clutter-types.h		\
-	$(srcdir)/clutter-units.h 		\
-	$(srcdir)/clutter-zoom-action.h		\
+	clutter-action.h		\
+	clutter-actor-meta.h		\
+	clutter-actor.h		\
+	clutter-align-constraint.h	\
+	clutter-animatable.h          \
+	clutter-backend.h		\
+	clutter-bind-constraint.h	\
+	clutter-binding-pool.h 	\
+	clutter-bin-layout.h		\
+	clutter-blur-effect.h		\
+	clutter-box-layout.h		\
+	clutter-brightness-contrast-effect.h	\
+	clutter-cairo.h		\
+	clutter-canvas.h		\
+	clutter-child-meta.h		\
+	clutter-click-action.h	\
+	clutter-cogl-compat.h 	\
+	clutter-clone.h		\
+	clutter-color-static.h	\
+	clutter-color.h		\
+	clutter-colorize-effect.h	\
+	clutter-constraint.h		\
+	clutter-container.h		\
+	clutter-content.h		\
+	clutter-deform-effect.h	\
+	clutter-deprecated.h		\
+	clutter-desaturate-effect.h	\
+	clutter-device-manager.h	\
+	clutter-drag-action.h		\
+	clutter-drop-action.h		\
+	clutter-effect.h		\
+	clutter-enums.h		\
+	clutter-event.h 		\
+	clutter-feature.h 		\
+	clutter-fixed-layout.h	\
+	clutter-flow-layout.h		\
+	clutter-gesture-action.h 	\
+	clutter-grid-layout.h 	\
+	clutter-group.h 		\
+	clutter-image.h		\
+	clutter-input-device.h	\
+        clutter-interval.h            \
+	clutter-keyframe-transition.h	\
+	clutter-keysyms.h 		\
+	clutter-layout-manager.h	\
+	clutter-layout-meta.h		\
+	clutter-list-model.h		\
+	clutter-macros.h		\
+	clutter-main.h		\
+	clutter-model.h		\
+	clutter-offscreen-effect.h	\
+	clutter-page-turn-effect.h	\
+	clutter-paint-nodes.h		\
+	clutter-paint-node.h		\
+	clutter-pan-action.h		\
+	clutter-path-constraint.h	\
+	clutter-path.h		\
+	clutter-property-transition.h	\
+	clutter-rotate-action.h	\
+	clutter-script.h		\
+	clutter-scriptable.h		\
+	clutter-scroll-actor.h	\
+	clutter-settings.h		\
+	clutter-shader-effect.h	\
+	clutter-shader-types.h	\
+	clutter-swipe-action.h	\
+	clutter-snap-constraint.h	\
+	clutter-stage.h 		\
+	clutter-stage-manager.h	\
+	clutter-tap-action.h		\
+	clutter-test-utils.h		\
+	clutter-texture.h 		\
+	clutter-text.h		\
+	clutter-text-buffer.h		\
+	clutter-timeline.h 		\
+	clutter-transition-group.h	\
+	clutter-transition.h		\
+	clutter-types.h		\
+	clutter-units.h 		\
+	clutter-zoom-action.h		\
 	$(NULL)
 
 source_c = \
-	$(srcdir)/clutter-action.c		\
-	$(srcdir)/clutter-actor-box.c		\
-	$(srcdir)/clutter-actor-meta.c		\
-	$(srcdir)/clutter-actor.c		\
-	$(srcdir)/clutter-align-constraint.c	\
-	$(srcdir)/clutter-animatable.c		\
-	$(srcdir)/clutter-backend.c		\
-	$(srcdir)/clutter-base-types.c		\
-	$(srcdir)/clutter-bezier.c		\
-	$(srcdir)/clutter-bind-constraint.c	\
-	$(srcdir)/clutter-binding-pool.c	\
-	$(srcdir)/clutter-bin-layout.c		\
-	$(srcdir)/clutter-blur-effect.c		\
-	$(srcdir)/clutter-box-layout.c		\
-	$(srcdir)/clutter-brightness-contrast-effect.c	\
-	$(srcdir)/clutter-cairo.c		\
-	$(srcdir)/clutter-canvas.c		\
-	$(srcdir)/clutter-child-meta.c		\
-	$(srcdir)/clutter-click-action.c	\
-	$(srcdir)/clutter-clone.c		\
-	$(srcdir)/clutter-color.c 		\
-	$(srcdir)/clutter-colorize-effect.c	\
-	$(srcdir)/clutter-constraint.c		\
-	$(srcdir)/clutter-container.c		\
-	$(srcdir)/clutter-content.c		\
-	$(srcdir)/clutter-deform-effect.c	\
-	$(srcdir)/clutter-desaturate-effect.c	\
-	$(srcdir)/clutter-device-manager.c	\
-	$(srcdir)/clutter-drag-action.c		\
-	$(srcdir)/clutter-drop-action.c		\
-	$(srcdir)/clutter-effect.c		\
-	$(srcdir)/clutter-event.c 		\
-	$(srcdir)/clutter-feature.c 		\
-	$(srcdir)/clutter-fixed-layout.c	\
-	$(srcdir)/clutter-flatten-effect.c	\
-	$(srcdir)/clutter-flow-layout.c		\
-	$(srcdir)/clutter-gesture-action.c 	\
-	$(srcdir)/clutter-grid-layout.c 	\
-	$(srcdir)/clutter-image.c		\
-	$(srcdir)/clutter-input-device.c	\
-	$(srcdir)/clutter-interval.c            \
-	$(srcdir)/clutter-keyframe-transition.c	\
-	$(srcdir)/clutter-keysyms-table.c	\
-	$(srcdir)/clutter-layout-manager.c	\
-	$(srcdir)/clutter-layout-meta.c		\
-	$(srcdir)/clutter-list-model.c		\
-	$(srcdir)/clutter-main.c 		\
-	$(srcdir)/clutter-master-clock.c	\
-	$(srcdir)/clutter-model.c		\
-	$(srcdir)/clutter-offscreen-effect.c	\
-	$(srcdir)/clutter-page-turn-effect.c	\
-	$(srcdir)/clutter-paint-nodes.c		\
-	$(srcdir)/clutter-paint-node.c		\
-	$(srcdir)/clutter-pan-action.c		\
-	$(srcdir)/clutter-path-constraint.c	\
-	$(srcdir)/clutter-path.c		\
-	$(srcdir)/clutter-property-transition.c	\
-	$(srcdir)/clutter-rotate-action.c	\
-	$(srcdir)/clutter-script.c		\
-	$(srcdir)/clutter-script-parser.c	\
-	$(srcdir)/clutter-scriptable.c		\
-	$(srcdir)/clutter-scroll-actor.c	\
-	$(srcdir)/clutter-settings.c		\
-	$(srcdir)/clutter-shader-effect.c	\
-	$(srcdir)/clutter-shader-types.c	\
-	$(srcdir)/clutter-swipe-action.c	\
-	$(srcdir)/clutter-snap-constraint.c	\
-	$(srcdir)/clutter-stage.c		\
-	$(srcdir)/clutter-stage-manager.c	\
-	$(srcdir)/clutter-stage-window.c	\
-	$(srcdir)/clutter-tap-action.c		\
-	$(srcdir)/clutter-test-utils.c		\
-	$(srcdir)/clutter-text.c		\
-	$(srcdir)/clutter-text-buffer.c		\
-	$(srcdir)/clutter-transition-group.c	\
-	$(srcdir)/clutter-transition.c		\
-	$(srcdir)/clutter-timeline.c 		\
-	$(srcdir)/clutter-units.c		\
-	$(srcdir)/clutter-util.c 		\
-	$(srcdir)/clutter-paint-volume.c 	\
-	$(srcdir)/clutter-zoom-action.c 	\
+	clutter-action.c		\
+	clutter-actor-box.c		\
+	clutter-actor-meta.c		\
+	clutter-actor.c		\
+	clutter-align-constraint.c	\
+	clutter-animatable.c		\
+	clutter-backend.c		\
+	clutter-base-types.c		\
+	clutter-bezier.c		\
+	clutter-bind-constraint.c	\
+	clutter-binding-pool.c	\
+	clutter-bin-layout.c		\
+	clutter-blur-effect.c		\
+	clutter-box-layout.c		\
+	clutter-brightness-contrast-effect.c	\
+	clutter-cairo.c		\
+	clutter-canvas.c		\
+	clutter-child-meta.c		\
+	clutter-click-action.c	\
+	clutter-clone.c		\
+	clutter-color.c 		\
+	clutter-colorize-effect.c	\
+	clutter-constraint.c		\
+	clutter-container.c		\
+	clutter-content.c		\
+	clutter-deform-effect.c	\
+	clutter-desaturate-effect.c	\
+	clutter-device-manager.c	\
+	clutter-drag-action.c		\
+	clutter-drop-action.c		\
+	clutter-effect.c		\
+	clutter-event.c 		\
+	clutter-feature.c 		\
+	clutter-fixed-layout.c	\
+	clutter-flatten-effect.c	\
+	clutter-flow-layout.c		\
+	clutter-gesture-action.c 	\
+	clutter-grid-layout.c 	\
+	clutter-image.c		\
+	clutter-input-device.c	\
+	clutter-interval.c            \
+	clutter-keyframe-transition.c	\
+	clutter-keysyms-table.c	\
+	clutter-layout-manager.c	\
+	clutter-layout-meta.c		\
+	clutter-list-model.c		\
+	clutter-main.c 		\
+	clutter-master-clock.c	\
+	clutter-model.c		\
+	clutter-offscreen-effect.c	\
+	clutter-page-turn-effect.c	\
+	clutter-paint-nodes.c		\
+	clutter-paint-node.c		\
+	clutter-pan-action.c		\
+	clutter-path-constraint.c	\
+	clutter-path.c		\
+	clutter-property-transition.c	\
+	clutter-rotate-action.c	\
+	clutter-script.c		\
+	clutter-script-parser.c	\
+	clutter-scriptable.c		\
+	clutter-scroll-actor.c	\
+	clutter-settings.c		\
+	clutter-shader-effect.c	\
+	clutter-shader-types.c	\
+	clutter-swipe-action.c	\
+	clutter-snap-constraint.c	\
+	clutter-stage.c		\
+	clutter-stage-manager.c	\
+	clutter-stage-window.c	\
+	clutter-tap-action.c		\
+	clutter-test-utils.c		\
+	clutter-text.c		\
+	clutter-text-buffer.c		\
+	clutter-transition-group.c	\
+	clutter-transition.c		\
+	clutter-timeline.c 		\
+	clutter-units.c		\
+	clutter-util.c 		\
+	clutter-paint-volume.c 	\
+	clutter-zoom-action.c 	\
 	$(NULL)
 
 # private headers; these should not be distributed or introspected
 source_h_priv = \
-	$(srcdir)/clutter-actor-meta-private.h		\
-	$(srcdir)/clutter-actor-private.h		\
-	$(srcdir)/clutter-backend-private.h		\
-	$(srcdir)/clutter-bezier.h			\
-	$(srcdir)/clutter-content-private.h		\
-	$(srcdir)/clutter-debug.h 			\
-	$(srcdir)/clutter-device-manager-private.h	\
-	$(srcdir)/clutter-easing.h			\
-	$(srcdir)/clutter-effect-private.h		\
-	$(srcdir)/clutter-event-translator.h		\
-	$(srcdir)/clutter-event-private.h		\
-	$(srcdir)/clutter-flatten-effect.h		\
-	$(srcdir)/clutter-gesture-action-private.h	\
-	$(srcdir)/clutter-id-pool.h 			\
-	$(srcdir)/clutter-master-clock.h		\
-	$(srcdir)/clutter-model-private.h		\
-	$(srcdir)/clutter-offscreen-effect-private.h	\
-	$(srcdir)/clutter-paint-node-private.h		\
-	$(srcdir)/clutter-paint-volume-private.h	\
-	$(srcdir)/clutter-private.h 			\
-	$(srcdir)/clutter-profile.h			\
-	$(srcdir)/clutter-script-private.h		\
-	$(srcdir)/clutter-settings-private.h		\
-	$(srcdir)/clutter-stage-manager-private.h	\
-	$(srcdir)/clutter-stage-private.h		\
-	$(srcdir)/clutter-stage-window.h		\
+	clutter-actor-meta-private.h		\
+	clutter-actor-private.h		\
+	clutter-backend-private.h		\
+	clutter-bezier.h			\
+	clutter-content-private.h		\
+	clutter-debug.h 			\
+	clutter-device-manager-private.h	\
+	clutter-easing.h			\
+	clutter-effect-private.h		\
+	clutter-event-translator.h		\
+	clutter-event-private.h		\
+	clutter-flatten-effect.h		\
+	clutter-gesture-action-private.h	\
+	clutter-id-pool.h 			\
+	clutter-master-clock.h		\
+	clutter-model-private.h		\
+	clutter-offscreen-effect-private.h	\
+	clutter-paint-node-private.h		\
+	clutter-paint-volume-private.h	\
+	clutter-private.h 			\
+	clutter-profile.h			\
+	clutter-script-private.h		\
+	clutter-settings-private.h		\
+	clutter-stage-manager-private.h	\
+	clutter-stage-private.h		\
+	clutter-stage-window.h		\
 	$(NULL)
 
 # private source code; these should not be introspected
 source_c_priv = \
-	$(srcdir)/clutter-easing.c		\
-	$(srcdir)/clutter-event-translator.c	\
-	$(srcdir)/clutter-id-pool.c 		\
-	$(srcdir)/clutter-profile.c		\
+	clutter-easing.c		\
+	clutter-event-translator.c	\
+	clutter-id-pool.c 		\
+	clutter-profile.c		\
 	$(NULL)
 
 # deprecated installed headers
 deprecated_h = \
-	$(srcdir)/deprecated/clutter-actor.h			\
-	$(srcdir)/deprecated/clutter-alpha.h 			\
-	$(srcdir)/deprecated/clutter-animatable.h		\
-	$(srcdir)/deprecated/clutter-animation.h		\
-	$(srcdir)/deprecated/clutter-animator.h			\
-	$(srcdir)/deprecated/clutter-backend.h			\
-	$(srcdir)/deprecated/clutter-behaviour.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-bin-layout.h		\
-	$(srcdir)/deprecated/clutter-box.h			\
-	$(srcdir)/deprecated/clutter-cairo-texture.h		\
-	$(srcdir)/deprecated/clutter-container.h		\
-	$(srcdir)/deprecated/clutter-fixed.h			\
-	$(srcdir)/deprecated/clutter-frame-source.h		\
-	$(srcdir)/deprecated/clutter-group.h			\
-	$(srcdir)/deprecated/clutter-input-device.h		\
-	$(srcdir)/deprecated/clutter-keysyms.h			\
-	$(srcdir)/deprecated/clutter-main.h			\
-	$(srcdir)/deprecated/clutter-media.h			\
-	$(srcdir)/deprecated/clutter-rectangle.h		\
-	$(srcdir)/deprecated/clutter-score.h 			\
-	$(srcdir)/deprecated/clutter-shader.h 			\
-	$(srcdir)/deprecated/clutter-stage-manager.h		\
-	$(srcdir)/deprecated/clutter-stage.h			\
-	$(srcdir)/deprecated/clutter-state.h			\
-	$(srcdir)/deprecated/clutter-table-layout.h		\
-	$(srcdir)/deprecated/clutter-texture.h			\
-	$(srcdir)/deprecated/clutter-timeline.h 		\
-	$(srcdir)/deprecated/clutter-timeout-pool.h 		\
-	$(srcdir)/deprecated/clutter-util.h 			\
+	deprecated/clutter-actor.h			\
+	deprecated/clutter-alpha.h 			\
+	deprecated/clutter-animatable.h		\
+	deprecated/clutter-animation.h		\
+	deprecated/clutter-animator.h			\
+	deprecated/clutter-backend.h			\
+	deprecated/clutter-behaviour.h 		\
+	deprecated/clutter-behaviour-depth.h 		\
+	deprecated/clutter-behaviour-ellipse.h	\
+	deprecated/clutter-behaviour-opacity.h 	\
+	deprecated/clutter-behaviour-path.h 		\
+	deprecated/clutter-behaviour-rotate.h 	\
+	deprecated/clutter-behaviour-scale.h 		\
+	deprecated/clutter-bin-layout.h		\
+	deprecated/clutter-box.h			\
+	deprecated/clutter-cairo-texture.h		\
+	deprecated/clutter-container.h		\
+	deprecated/clutter-fixed.h			\
+	deprecated/clutter-frame-source.h		\
+	deprecated/clutter-group.h			\
+	deprecated/clutter-input-device.h		\
+	deprecated/clutter-keysyms.h			\
+	deprecated/clutter-main.h			\
+	deprecated/clutter-media.h			\
+	deprecated/clutter-rectangle.h		\
+	deprecated/clutter-score.h 			\
+	deprecated/clutter-shader.h 			\
+	deprecated/clutter-stage-manager.h		\
+	deprecated/clutter-stage.h			\
+	deprecated/clutter-state.h			\
+	deprecated/clutter-table-layout.h		\
+	deprecated/clutter-texture.h			\
+	deprecated/clutter-timeline.h 		\
+	deprecated/clutter-timeout-pool.h 		\
+	deprecated/clutter-util.h 			\
 	$(NULL)
 
 # deprecated source code
 deprecated_c = \
-	$(srcdir)/deprecated/clutter-actor-deprecated.c		\
-	$(srcdir)/deprecated/clutter-alpha.c 			\
-	$(srcdir)/deprecated/clutter-animation.c		\
-	$(srcdir)/deprecated/clutter-animator.c			\
-	$(srcdir)/deprecated/clutter-behaviour.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-box.c			\
-	$(srcdir)/deprecated/clutter-cairo-texture.c		\
-	$(srcdir)/deprecated/clutter-fixed.c			\
-	$(srcdir)/deprecated/clutter-frame-source.c		\
-	$(srcdir)/deprecated/clutter-group.c 			\
-	$(srcdir)/deprecated/clutter-input-device-deprecated.c	\
-	$(srcdir)/deprecated/clutter-layout-manager-deprecated.c \
-	$(srcdir)/deprecated/clutter-media.c			\
-	$(srcdir)/deprecated/clutter-rectangle.c 		\
-	$(srcdir)/deprecated/clutter-score.c 			\
-	$(srcdir)/deprecated/clutter-shader.c 			\
-	$(srcdir)/deprecated/clutter-state.c			\
-	$(srcdir)/deprecated/clutter-table-layout.c		\
-	$(srcdir)/deprecated/clutter-texture.c 			\
-	$(srcdir)/deprecated/clutter-timeout-pool.c		\
+	deprecated/clutter-actor-deprecated.c		\
+	deprecated/clutter-alpha.c 			\
+	deprecated/clutter-animation.c		\
+	deprecated/clutter-animator.c			\
+	deprecated/clutter-behaviour.c 		\
+	deprecated/clutter-behaviour-depth.c		\
+	deprecated/clutter-behaviour-ellipse.c	\
+	deprecated/clutter-behaviour-opacity.c	\
+	deprecated/clutter-behaviour-path.c		\
+	deprecated/clutter-behaviour-rotate.c		\
+	deprecated/clutter-behaviour-scale.c		\
+	deprecated/clutter-box.c			\
+	deprecated/clutter-cairo-texture.c		\
+	deprecated/clutter-fixed.c			\
+	deprecated/clutter-frame-source.c		\
+	deprecated/clutter-group.c 			\
+	deprecated/clutter-input-device-deprecated.c	\
+	deprecated/clutter-layout-manager-deprecated.c \
+	deprecated/clutter-media.c			\
+	deprecated/clutter-rectangle.c 		\
+	deprecated/clutter-score.c 			\
+	deprecated/clutter-shader.c 			\
+	deprecated/clutter-state.c			\
+	deprecated/clutter-table-layout.c		\
+	deprecated/clutter-texture.c 			\
+	deprecated/clutter-timeout-pool.c		\
 	$(NULL)
 
 # deprecated private headers; these should not be installed
 deprecated_h_priv = \
-	$(srcdir)/deprecated/clutter-timeout-interval.h	\
+	deprecated/clutter-timeout-interval.h	\
 	$(NULL)
 
 # deprecated private source code; these should not be introspected
 deprecated_c_priv = \
-	$(srcdir)/deprecated/clutter-timeout-interval.c	\
+	deprecated/clutter-timeout-interval.c	\
 	$(NULL)
 
 # built sources
@@ -384,45 +386,45 @@ backend_source_built =
 
 # X11 backend rules
 x11_source_c = \
-	$(srcdir)/x11/clutter-backend-x11.c		\
-	$(srcdir)/x11/clutter-device-manager-core-x11.c	\
-	$(srcdir)/x11/clutter-event-x11.c		\
-	$(srcdir)/x11/clutter-input-device-core-x11.c	\
-	$(srcdir)/x11/clutter-keymap-x11.c		\
-	$(srcdir)/x11/clutter-stage-x11.c		\
-	$(srcdir)/x11/clutter-x11-texture-pixmap.c	\
+	x11/clutter-backend-x11.c		\
+	x11/clutter-device-manager-core-x11.c	\
+	x11/clutter-event-x11.c		\
+	x11/clutter-input-device-core-x11.c	\
+	x11/clutter-keymap-x11.c		\
+	x11/clutter-stage-x11.c		\
+	x11/clutter-x11-texture-pixmap.c	\
 	$(NULL)
 
 x11_source_h = \
-	$(srcdir)/x11/clutter-x11.h			\
-	$(srcdir)/x11/clutter-x11-texture-pixmap.h	\
+	x11/clutter-x11.h			\
+	x11/clutter-x11-texture-pixmap.h	\
 	$(NULL)
 
 x11_source_h_priv = \
-	$(srcdir)/x11/clutter-backend-x11.h		\
-	$(srcdir)/x11/clutter-device-manager-core-x11.h	\
-	$(srcdir)/x11/clutter-input-device-core-x11.h	\
-	$(srcdir)/x11/clutter-keymap-x11.h		\
-	$(srcdir)/x11/clutter-settings-x11.h		\
-	$(srcdir)/x11/clutter-stage-x11.h		\
+	x11/clutter-backend-x11.h		\
+	x11/clutter-device-manager-core-x11.h	\
+	x11/clutter-input-device-core-x11.h	\
+	x11/clutter-keymap-x11.h		\
+	x11/clutter-settings-x11.h		\
+	x11/clutter-stage-x11.h		\
 	$(NULL)
 
 x11_source_c_priv = \
-	$(srcdir)/x11/xsettings/xsettings-client.c	\
-	$(srcdir)/x11/xsettings/xsettings-client.h	\
-	$(srcdir)/x11/xsettings/xsettings-common.c	\
-	$(srcdir)/x11/xsettings/xsettings-common.h	\
+	x11/xsettings/xsettings-client.c	\
+	x11/xsettings/xsettings-client.h	\
+	x11/xsettings/xsettings-common.c	\
+	x11/xsettings/xsettings-common.h	\
 	$(NULL)
 
 if BUILD_XI2
 x11_source_c += \
-	$(srcdir)/x11/clutter-device-manager-xi2.c	\
-	$(srcdir)/x11/clutter-input-device-xi2.c	\
+	x11/clutter-device-manager-xi2.c	\
+	x11/clutter-input-device-xi2.c	\
 	$(NULL)
 
 x11_source_h_priv += \
-	$(srcdir)/x11/clutter-device-manager-xi2.h	\
-	$(srcdir)/x11/clutter-input-device-xi2.h	\
+	x11/clutter-device-manager-xi2.h	\
+	x11/clutter-input-device-xi2.h	\
 	$(NULL)
 endif # BUILD_XI2
 
@@ -448,11 +450,11 @@ endif # SUPPORT_X11
 cogl_source_h =
 
 cogl_source_c = \
-	$(srcdir)/cogl/clutter-stage-cogl.c	\
+	cogl/clutter-stage-cogl.c	\
 	$(NULL)
 
 cogl_source_h_priv = \
-	$(srcdir)/cogl/clutter-stage-cogl.h	\
+	cogl/clutter-stage-cogl.h	\
 	$(NULL)
 
 cogl_source_c_priv =
@@ -474,9 +476,9 @@ endif
 #
 # Note: there wasn't actually anything GLX specific so we can add
 # the compatibility if clutter supports x11
-glx_source_c = $(srcdir)/x11/clutter-glx-texture-pixmap.c
-glx_source_h = $(srcdir)/x11/clutter-glx-texture-pixmap.h \
-	       $(srcdir)/x11/clutter-glx.h
+glx_source_c = x11/clutter-glx-texture-pixmap.c
+glx_source_h = x11/clutter-glx-texture-pixmap.h \
+	       x11/clutter-glx.h
 
 if SUPPORT_X11
 backend_source_h += $(glx_source_h)
@@ -497,23 +499,23 @@ endif
 
 # GDK backend rules
 gdk_source_c = \
-	$(srcdir)/gdk/clutter-backend-gdk.c 		\
-	$(srcdir)/gdk/clutter-device-manager-gdk.c 	\
-	$(srcdir)/gdk/clutter-input-device-gdk.c 	\
-	$(srcdir)/gdk/clutter-event-gdk.c 		\
-	$(srcdir)/gdk/clutter-stage-gdk.c		\
+	gdk/clutter-backend-gdk.c 		\
+	gdk/clutter-device-manager-gdk.c 	\
+	gdk/clutter-input-device-gdk.c 	\
+	gdk/clutter-event-gdk.c 		\
+	gdk/clutter-stage-gdk.c		\
 	$(NULL)
 
 gdk_source_h = \
-	$(srcdir)/gdk/clutter-gdk.h			\
+	gdk/clutter-gdk.h			\
 	$(NULL)
 
 gdk_source_h_priv = \
-	$(srcdir)/gdk/clutter-settings-gdk.h		\
-	$(srcdir)/gdk/clutter-backend-gdk.h 		\
-	$(srcdir)/gdk/clutter-device-manager-gdk.h 	\
-	$(srcdir)/gdk/clutter-input-device-gdk.h 	\
-	$(srcdir)/gdk/clutter-stage-gdk.h		\
+	gdk/clutter-settings-gdk.h		\
+	gdk/clutter-backend-gdk.h 		\
+	gdk/clutter-device-manager-gdk.h 	\
+	gdk/clutter-input-device-gdk.h 	\
+	gdk/clutter-stage-gdk.h		\
 	$(NULL)
 
 if SUPPORT_GDK
@@ -534,20 +536,20 @@ endif # SUPPORT_GDK
 
 # Windows backend rules
 win32_source_c = \
-	$(srcdir)/win32/clutter-backend-win32.c		\
-	$(srcdir)/win32/clutter-device-manager-win32.c	\
-	$(srcdir)/win32/clutter-event-win32.c		\
-	$(srcdir)/win32/clutter-stage-win32.c		\
+	win32/clutter-backend-win32.c		\
+	win32/clutter-device-manager-win32.c	\
+	win32/clutter-event-win32.c		\
+	win32/clutter-stage-win32.c		\
 	$(NULL)
 
 win32_source_h = \
-	$(srcdir)/win32/clutter-win32.h			\
+	win32/clutter-win32.h			\
 	$(NULL)
 
 win32_source_h_priv = \
-	$(srcdir)/win32/clutter-backend-win32.h		\
-	$(srcdir)/win32/clutter-device-manager-win32.h	\
-	$(srcdir)/win32/clutter-stage-win32.h		\
+	win32/clutter-backend-win32.h		\
+	win32/clutter-device-manager-win32.h	\
+	win32/clutter-stage-win32.h		\
 	$(NULL)
 
 if SUPPORT_WIN32
@@ -560,7 +562,7 @@ if SUPPORT_WIN32
 	mkdir -p win32
 	$(WINDRES) -I$(srcdir)/win32 $< $@
 
-win32/resources.o : $(srcdir)/win32/invisible-cursor.cur
+win32/resources.o : win32/invisible-cursor.cur
 
 win32_resources = win32/resources.o
 win32_resources_ldflag = -Wl,win32/resources.o
@@ -579,12 +581,12 @@ pc_files += clutter-win32-$(CLUTTER_API_VERSION).pc
 endif # SUPPORT_WIN32
 
 EXTRA_DIST += \
-	$(srcdir)/win32/invisible-cursor.cur 	\
-	$(srcdir)/win32/resources.rc		\
+	win32/invisible-cursor.cur 	\
+	win32/resources.rc		\
 	$(NULL)
 
-egl_tslib_h = $(srcdir)/tslib/clutter-event-tslib.h
-egl_tslib_c = $(srcdir)/tslib/clutter-event-tslib.c
+egl_tslib_h = tslib/clutter-event-tslib.h
+egl_tslib_c = tslib/clutter-event-tslib.c
 
 if USE_TSLIB
 backend_source_c_priv += $(egl_tslib_c)
@@ -592,14 +594,14 @@ backend_source_h_priv += $(egl_tslib_h)
 endif # SUPPORT_TSLIB
 
 evdev_c_priv = \
-	$(srcdir)/evdev/clutter-device-manager-evdev.c	\
-	$(srcdir)/evdev/clutter-input-device-evdev.c	\
+	evdev/clutter-device-manager-evdev.c	\
+	evdev/clutter-input-device-evdev.c	\
 	$(NULL)
 evdev_h_priv = \
-	$(srcdir)/evdev/clutter-device-manager-evdev.h	\
-	$(srcdir)/evdev/clutter-input-device-evdev.h	\
+	evdev/clutter-device-manager-evdev.h	\
+	evdev/clutter-input-device-evdev.h	\
 	$(NULL)
-evdev_h = $(srcdir)/evdev/clutter-evdev.h
+evdev_h = evdev/clutter-evdev.h
 
 if USE_EVDEV
 backend_source_c_priv += $(evdev_c_priv)
@@ -611,12 +613,12 @@ clutterevdev_include_HEADERS = $(evdev_h)
 endif # SUPPORT_EVDEV
 
 if NEED_XKB_UTILS
-backend_source_c += $(srcdir)/evdev/clutter-xkb-utils.c
-backend_source_h_priv += $(srcdir)/evdev/clutter-xkb-utils.h
+backend_source_c += evdev/clutter-xkb-utils.c
+backend_source_h_priv += evdev/clutter-xkb-utils.h
 endif
 
-cex_source_h_priv = $(srcdir)/cex100/clutter-backend-cex100.h
-cex_source_c = $(srcdir)/cex100/clutter-backend-cex100.c
+cex_source_h_priv = cex100/clutter-backend-cex100.h
+cex_source_c = cex100/clutter-backend-cex100.c
 cex_h = cex100/clutter-cex100.h
 BUILT_SOURCES += $(cex_h)
 EXTRA_DIST += $(srcdir)/$(cex_h).in
@@ -641,33 +643,33 @@ endif # SUPPORT_CEX100
 
 # EGL backend rules
 egl_source_h = \
-	$(srcdir)/egl/clutter-egl-headers.h	\
-	$(srcdir)/egl/clutter-egl.h		\
+	egl/clutter-egl-headers.h	\
+	egl/clutter-egl.h		\
 	$(NULL)
 
-egl_source_h_priv = $(srcdir)/egl/clutter-backend-eglnative.h $(srcdir)/egl/clutter-stage-eglnative.h
-egl_source_c = $(srcdir)/egl/clutter-backend-eglnative.c $(srcdir)/egl/clutter-stage-eglnative.c
+egl_source_h_priv = egl/clutter-backend-eglnative.h egl/clutter-stage-eglnative.h
+egl_source_c = egl/clutter-backend-eglnative.c egl/clutter-stage-eglnative.c
 
 # Wayland backend rules
 if SUPPORT_WAYLAND
 backend_source_h_priv += \
-       $(srcdir)/wayland/clutter-backend-wayland.h             \
-       $(srcdir)/wayland/clutter-backend-wayland-priv.h        \
-       $(srcdir)/wayland/clutter-stage-wayland.h               \
-       $(srcdir)/wayland/clutter-event-wayland.h               \
-       $(srcdir)/wayland/clutter-input-device-wayland.h        \
-       $(srcdir)/wayland/clutter-device-manager-wayland.h
+       wayland/clutter-backend-wayland.h             \
+       wayland/clutter-backend-wayland-priv.h        \
+       wayland/clutter-stage-wayland.h               \
+       wayland/clutter-event-wayland.h               \
+       wayland/clutter-input-device-wayland.h        \
+       wayland/clutter-device-manager-wayland.h
 
 backend_source_c += \
-       $(srcdir)/wayland/clutter-backend-wayland.c             \
-       $(srcdir)/wayland/clutter-stage-wayland.c               \
-       $(srcdir)/wayland/clutter-event-wayland.c               \
-       $(srcdir)/wayland/clutter-input-device-wayland.c        \
-       $(srcdir)/wayland/clutter-device-manager-wayland.c
+       wayland/clutter-backend-wayland.c             \
+       wayland/clutter-stage-wayland.c               \
+       wayland/clutter-event-wayland.c               \
+       wayland/clutter-input-device-wayland.c        \
+       wayland/clutter-device-manager-wayland.c
 
 
 clutterwayland_includedir = $(clutter_includedir)/wayland
-clutterwayland_include_HEADERS = $(srcdir)/wayland/clutter-wayland.h
+clutterwayland_include_HEADERS = wayland/clutter-wayland.h
 
 clutter-wayland-$(CLUTTER_API_VERSION).pc: clutter-$(CLUTTER_API_VERSION).pc
 	$(QUIET_GEN)cp -f $< $(@F)
@@ -677,11 +679,11 @@ endif # SUPPORT_WAYLAND
 
 if SUPPORT_WAYLAND_COMPOSITOR
 wayland_compositor_source_h = \
-	$(srcdir)/wayland/clutter-wayland-compositor.h		\
-	$(srcdir)/wayland/clutter-wayland-surface.h
+	wayland/clutter-wayland-compositor.h		\
+	wayland/clutter-wayland-surface.h
 backend_source_h += $(wayland_compositor_source_h)
 backend_source_c += \
-	$(srcdir)/wayland/clutter-wayland-surface.c
+	wayland/clutter-wayland-surface.c
 
 wayland_compositor_includedir = $(clutter_includedir)/wayland
 wayland_compositor_include_HEADERS = $(wayland_compositor_source_h)
@@ -708,23 +710,23 @@ endif # SUPPORT_EGL
 
 # OSX backend rules
 osx_source_c = \
-	$(srcdir)/osx/clutter-backend-osx.c	\
-	$(srcdir)/osx/clutter-stage-osx.c	\
+	osx/clutter-backend-osx.c	\
+	osx/clutter-stage-osx.c	\
 	$(NULL)
 
-osx_source_h = $(srcdir)/osx/clutter-osx.h
+osx_source_h = osx/clutter-osx.h
 
 osx_source_h_priv = \
-	$(srcdir)/osx/clutter-backend-osx.h	\
-	$(srcdir)/osx/clutter-event-loop-osx.h	\
-	$(srcdir)/osx/clutter-stage-osx.h	\
-	$(srcdir)/osx/clutter-device-manager-osx.h \
+	osx/clutter-backend-osx.h	\
+	osx/clutter-event-loop-osx.h	\
+	osx/clutter-stage-osx.h	\
+	osx/clutter-device-manager-osx.h \
 	$(NULL)
 
 osx_source_c_priv = \
-	$(srcdir)/osx/clutter-event-loop-osx.c	\
-	$(srcdir)/osx/clutter-event-osx.c	\
-	$(srcdir)/osx/clutter-device-manager-osx.c \
+	osx/clutter-event-loop-osx.c	\
+	osx/clutter-event-osx.c	\
+	osx/clutter-device-manager-osx.c \
 	$(NULL)
 
 if SUPPORT_OSX
@@ -748,35 +750,35 @@ endif # SUPPORT_OSX
 
 # cally
 cally_sources_h = \
-	$(srcdir)/cally/cally-actor.h		\
-	$(srcdir)/cally/cally-clone.h		\
-	$(srcdir)/cally/cally-factory.h		\
-	$(srcdir)/cally/cally-group.h		\
-	$(srcdir)/cally/cally.h			\
-	$(srcdir)/cally/cally-main.h		\
-	$(srcdir)/cally/cally-rectangle.h	\
-	$(srcdir)/cally/cally-root.h		\
-	$(srcdir)/cally/cally-stage.h		\
-	$(srcdir)/cally/cally-text.h		\
-	$(srcdir)/cally/cally-texture.h		\
-	$(srcdir)/cally/cally-util.h		\
+	cally/cally-actor.h		\
+	cally/cally-clone.h		\
+	cally/cally-factory.h		\
+	cally/cally-group.h		\
+	cally/cally.h			\
+	cally/cally-main.h		\
+	cally/cally-rectangle.h	\
+	cally/cally-root.h		\
+	cally/cally-stage.h		\
+	cally/cally-text.h		\
+	cally/cally-texture.h		\
+	cally/cally-util.h		\
 	$(NULL)
 
 cally_sources_c = \
-	$(srcdir)/cally/cally-actor.c		\
-	$(srcdir)/cally/cally.c			\
-	$(srcdir)/cally/cally-clone.c		\
-	$(srcdir)/cally/cally-group.c		\
-	$(srcdir)/cally/cally-rectangle.c	\
-	$(srcdir)/cally/cally-root.c		\
-	$(srcdir)/cally/cally-stage.c		\
-	$(srcdir)/cally/cally-text.c		\
-	$(srcdir)/cally/cally-texture.c		\
-	$(srcdir)/cally/cally-util.c		\
+	cally/cally-actor.c		\
+	cally/cally.c			\
+	cally/cally-clone.c		\
+	cally/cally-group.c		\
+	cally/cally-rectangle.c	\
+	cally/cally-root.c		\
+	cally/cally-stage.c		\
+	cally/cally-text.c		\
+	cally/cally-texture.c		\
+	cally/cally-util.c		\
 	$(NULL)
 
 cally_sources_private = \
-	$(srcdir)/cally/cally-actor-private.h	\
+	cally/cally-actor-private.h	\
 	$(NULL)
 
 cally_includedir = $(clutter_base_includedir)/cally