[Gnash-commit] /srv/bzr/gnash/trunk r11793: link in the static libltdl library.

[Rob Savoye]

------------------------------------------------------------
revno: 11793
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-22 09:18:18 -0700
message:
  link in the static libltdl library.
modified:
  testsuite/Makefile.am
  testsuite/libcore.all/Makefile.am
  testsuite/misc-ming.all/Makefile.am
  testsuite/network.all/Makefile.am

=== modified file 'testsuite/Makefile.am'
--- a/testsuite/Makefile.am     2010-01-01 17:48:26 +0000
+++ b/testsuite/Makefile.am     2010-01-22 16:18:18 +0000
@@ -116,6 +116,14 @@
        $(top_builddir)/libcore/libgnashcore.la \
        $(top_builddir)/libbase/libgnashbase.la \
        $(NULL)
+
+if LIBLTDL2
+libtestsuite_la_LIBADD += $(top_builddir)/libltdl/libltdlc.la
+endif
+if LIBLTDL1
+libtestsuite_la_LIBADD += $(top_builddir)/libbase/libltdlc.la
+endif
+
 libtestsuite_la_CXXFLAGS = \
        -I$(top_srcdir)/libbase \
        -I$(top_srcdir)/libmedia \

=== modified file 'testsuite/libcore.all/Makefile.am'
--- a/testsuite/libcore.all/Makefile.am 2010-01-22 15:05:33 +0000
+++ b/testsuite/libcore.all/Makefile.am 2010-01-22 16:18:18 +0000
@@ -70,6 +70,13 @@
        $(top_builddir)/libsound/libgnashsound.la \
        $(NULL)
 
+if LIBLTDL2
+GNASH_LIBS += $(top_builddir)/libltdl/libltdlc.la
+endif
+if LIBLTDL1
+GNASH_LIBS += $(top_builddir)/libbase/libltdlc.la
+endif
+
 if USE_FFMPEG_ENGINE
        GNASH_LIBS += $(FFMPEG_LIBS)
 endif

=== modified file 'testsuite/misc-ming.all/Makefile.am'
--- a/testsuite/misc-ming.all/Makefile.am       2010-01-01 17:48:26 +0000
+++ b/testsuite/misc-ming.all/Makefile.am       2010-01-22 16:18:18 +0000
@@ -71,6 +71,12 @@
        $(GIF_LIBS) \
        $(NULL)
 
+if LIBLTDL2
+AM_LDFLAGS  += $(top_builddir)/libltdl/libltdlc.la
+endif
+if LIBLTDL1
+AM_LDFLAGS += $(top_builddir)/libbase/libltdlc.la
+endif
 
 check_PROGRAMS = \
        SpriteButtonEventsTest \

=== modified file 'testsuite/network.all/Makefile.am'
--- a/testsuite/network.all/Makefile.am 2010-01-22 15:05:33 +0000
+++ b/testsuite/network.all/Makefile.am 2010-01-22 16:18:18 +0000
@@ -58,8 +58,6 @@
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libnet/libgnashnet.la \
-       $(top_builddir)/libmedia/libgnashmedia.la \
-       $(top_builddir)/libsound/libgnashsound.la \
        $(OPENGL_LIBS) \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS)