Merge branch 'wip/non-recursive'

* wip/non-recursive:
  build: Start moving to a non-recursive layout

diff --cc clutter/Makefile.am
index f9f26c2,38772ae..898742c
--- 1/clutter/Makefile.am
--- 2/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@@ -238,19 -212,9 +212,10 @@@ source_c = 
        $(srcdir)/clutter-timeout-pool.c        \
        $(srcdir)/clutter-units.c               \
        $(srcdir)/clutter-util.c                \
 +      $(srcdir)/clutter-paint-volume.c        \
        $(NULL)
  
- source_c_priv = \
-       $(srcdir)/clutter-id-pool.c             \
-       $(srcdir)/clutter-profile.c             \
-       $(srcdir)/clutter-timeout-interval.c    \
-       $(NULL)
- 
- built_source_c = \
-       clutter-enum-types.c                    \
-       clutter-marshal.c
- 
+ # private headers; these should not be distributed or introspected
  source_h_priv = \
        $(srcdir)/clutter-actor-meta-private.h  \
        $(srcdir)/clutter-bezier.h              \