[Gnash-commit] /srv/bzr/gnash/trunk r11817: build libcore before libsound to keep windoze happy. libcore depends on libmedia, and libsound depends on libcore.

[Rob Savoye]

------------------------------------------------------------
revno: 11817
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2010-01-27 20:47:40 -0700
message:
  build libcore before libsound to keep windoze happy. libcore depends on 
libmedia, and libsound depends on libcore.
modified:
  Makefile.am
  libcore/Makefile.am
  testsuite/libcore.all/Makefile.am

=== modified file 'Makefile.am'
--- a/Makefile.am       2010-01-22 21:18:43 +0000
+++ b/Makefile.am       2010-01-28 03:47:40 +0000
@@ -46,8 +46,8 @@
        libamf \
        libnet \
        libmedia \
+       libcore \
        libsound \
-       libcore \
        backend \
        utilities \
        gui \
@@ -76,7 +76,7 @@
 
 # man_MANS = doc/gnash.1 doc/gprocessor.1 doc/dumpshm.1 soldumper.1
 
-DIST_SUBDIRS = $(LIBLTDLDIR) $(STD_DIRS) cygnal extensions testsuite
+DIST_SUBDIRS = $(STD_DIRS) cygnal extensions testsuite libltdl
 
 EXTRA_DIST =  \
        autogen.sh \

=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am       2010-01-28 00:56:01 +0000
+++ b/libcore/Makefile.am       2010-01-28 03:47:40 +0000
@@ -294,7 +294,6 @@
        $(top_builddir)/libnet/libgnashnet.la \
        $(top_builddir)/libcore/parser/libgnashparser.la \
        $(top_builddir)/libcore/vm/libgnashvm.la \
-       $(top_builddir)/libsound/libgnashsound.la \
        $(top_builddir)/libmedia/libgnashmedia.la \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS) \

=== modified file 'testsuite/libcore.all/Makefile.am'
--- a/testsuite/libcore.all/Makefile.am 2010-01-25 02:41:23 +0000
+++ b/testsuite/libcore.all/Makefile.am 2010-01-28 03:47:40 +0000
@@ -63,10 +63,10 @@
 
 AM_LDFLAGS = \
        $(top_builddir)/libcore/libgnashcore.la \
-       $(top_builddir)/libmedia/libgnashmedia.la \
+       $(top_builddir)/libbase/libgnashbase.la \
+       $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libsound/libgnashsound.la \
-       $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/libamf/libgnashamf.la
+       $(top_builddir)/libmedia/libgnashmedia.la
 
 if LIBLTDL2
 AM_LDFLAGS += $(top_builddir)/libltdl/libltdlc.la