2008-06-30 Emmanuele Bassi <ebassi@openedhand.com>

	* clutter/Makefile.am:
	* clutter/eglx/Makefile.am:
	* clutter/glx/Makefile.am: Build the X11 base backend before
	the backends that depend on it.

diff --git a/ChangeLog b/ChangeLog
index f444ffd..5be69ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-06-30  Emmanuele Bassi  <ebassi@openedhand.com>
 
+       * clutter/Makefile.am:
+       * clutter/eglx/Makefile.am:
+       * clutter/glx/Makefile.am: Build the X11 base backend before
+       the backends that depend on it.
+
+2008-06-30  Emmanuele Bassi  <ebassi@openedhand.com>
+
        Bug 1000 - clutter-x11 should define gtypes for its enumerations
 
        * clutter/x11/Makefile.am:

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 1e51e15..39570c5 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-SUBDIRS = cogl pango $(clutterbackend) $(backendextra)
+SUBDIRS = cogl pango $(backendextra) $(clutterbackend)
 
 if LOCAL_JSON_GLIB
 SUBDIRS += json

diff --git a/clutter/eglx/Makefile.am b/clutter/eglx/Makefile.am
index 8cd9673..88950b8 100644 (file)
--- a/clutter/eglx/Makefile.am
+++ b/clutter/eglx/Makefile.am
@@ -16,6 +16,9 @@ LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la
 noinst_LTLIBRARIES = libclutter-eglx.la
 
 libclutter_eglx_la_SOURCES = \
+       $(top_builddir)/clutter/x11/libclutter-x11.la
+
+libclutter_eglx_la_SOURCES = \
        clutter-backend-egl.h \
        clutter-backend-egl.c \
        clutter-stage-egl.h \

diff --git a/clutter/glx/Makefile.am b/clutter/glx/Makefile.am
index dbfc977..0db1a16 100644 (file)
--- a/clutter/glx/Makefile.am
+++ b/clutter/glx/Makefile.am
@@ -15,6 +15,9 @@ LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la
 
 noinst_LTLIBRARIES = libclutter-glx.la
 
+libclutter_glx_la_DEPENDENCIES = \
+       $(top_builddir)/clutter/x11/libclutter-x11.la
+
 libclutter_glx_la_SOURCES = \
        clutter-backend-glx.h \
        clutter-backend-glx.c \