From b510d2827cb615e83631dc9a4246957257a24e22 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 30 Jun 2008 15:58:25 +0000 Subject: [PATCH] 2008-06-30 Emmanuele Bassi * clutter/Makefile.am: * clutter/eglx/Makefile.am: * clutter/glx/Makefile.am: Build the X11 base backend before the backends that depend on it. --- ChangeLog | 7 +++++++ clutter/Makefile.am | 2 +- clutter/eglx/Makefile.am | 3 +++ clutter/glx/Makefile.am | 3 +++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f444ffd82..5be69bad7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-30 Emmanuele Bassi + + * 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 Bug 1000 - clutter-x11 should define gtypes for its enumerations diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 1e51e1518..39570c562 100644 --- 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 8cd96738a..88950b81e 100644 --- a/clutter/eglx/Makefile.am +++ b/clutter/eglx/Makefile.am @@ -15,6 +15,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 \ diff --git a/clutter/glx/Makefile.am b/clutter/glx/Makefile.am index dbfc97720..0db1a161e 100644 --- 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 \