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

[Rob Savoye]

------------------------------------------------------------
revno: 11792
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-22 08:05:33 -0700
message:
  link in the static libltdl library.
modified:
  testsuite/libamf.all/Makefile.am
  testsuite/libbase.all/Makefile.am
  testsuite/libcore.all/Makefile.am
  testsuite/libnet.all/Makefile.am
  testsuite/network.all/Makefile.am

=== modified file 'testsuite/libamf.all/Makefile.am'
--- a/testsuite/libamf.all/Makefile.am  2010-01-21 00:27:19 +0000
+++ b/testsuite/libamf.all/Makefile.am  2010-01-22 15:05:33 +0000
@@ -19,13 +19,16 @@
 AUTOMAKE_OPTIONS = dejagnu
 
 AM_LDFLAGS = \
-       ../../libbase/libgnashbase.la \
-       ../../libamf/libgnashamf.la \
+       $(top_builddir)/libbase/libgnashbase.la \
+       $(top_builddir)/libamf/libgnashamf.la \
+       $(top_builddir)/libmedia/libgnashmedia.la \
+       $(top_builddir)/libsound/libgnashsound.la \
        $(GLIB_LIBS) \
        $(CURL_LIBS) \
        $(BOOST_LIBS) \
        $(DEJAGNU_CFLAGS) \
-       $(PTHREAD_LIBS)
+       $(PTHREAD_LIBS) \
+       $(NULL)
 
 AM_CPPFLAGS = -DSRCDIR=\"$(srcdir)\"
 
@@ -40,8 +43,12 @@
        $(DEJAGNU_CFLAGS) \
        $(PTHREAD_CFLAGS)
 
-# AM_LDFLAGS  = $(OPENGL_LIBNS) $(SDL_LIBS)
-
+if LIBLTDL2
+AM_LDFLAGS  += $(top_builddir)/libltdl/libltdlc.la
+endif
+if LIBLTDL1
+AM_LDFLAGS += $(top_builddir)/libbase/libltdlc.la
+endif
 
 check_PROGRAMS = \
        test_amf \

=== modified file 'testsuite/libbase.all/Makefile.am'
--- a/testsuite/libbase.all/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/testsuite/libbase.all/Makefile.am 2010-01-22 15:05:33 +0000
@@ -21,6 +21,14 @@
 LDADD = $(top_builddir)/libbase/libgnashbase.la \
        $(LIBINTL)
 
+
+if LIBLTDL2
+LDADD  += $(top_builddir)/libltdl/libltdlc.la
+endif
+if LIBLTDL1
+LDADD += $(top_builddir)/libbase/libltdlc.la
+endif
+
 # AM_CPPFLAGS isn't right here since per-program *_CPPFLAGS override global
 # AM_CPPFLAGS
 INCLUDES = \

=== modified file 'testsuite/libcore.all/Makefile.am'
--- a/testsuite/libcore.all/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/testsuite/libcore.all/Makefile.am 2010-01-22 15:05:33 +0000
@@ -66,6 +66,8 @@
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libcore/libgnashcore.la \
+       $(top_builddir)/libmedia/libgnashmedia.la \
+       $(top_builddir)/libsound/libgnashsound.la \
        $(NULL)
 
 if USE_FFMPEG_ENGINE

=== modified file 'testsuite/libnet.all/Makefile.am'
--- a/testsuite/libnet.all/Makefile.am  2010-01-01 17:48:26 +0000
+++ b/testsuite/libnet.all/Makefile.am  2010-01-22 15:05:33 +0000
@@ -26,10 +26,19 @@
        $(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 \
        $(BOOST_LIBS) \
        $(DEJAGNU_CFLAGS) \
        $(PTHREAD_LIBS)
 
+if LIBLTDL2
+AM_LDFLAGS  += $(top_builddir)/libltdl/libltdlc.la
+endif
+if LIBLTDL1
+AM_LDFLAGS += $(top_builddir)/libbase/libltdlc.la
+endif
+
 localedir = $(datadir)/locale
 
 INCLUDES = \

=== modified file 'testsuite/network.all/Makefile.am'
--- a/testsuite/network.all/Makefile.am 2010-01-01 20:41:28 +0000
+++ b/testsuite/network.all/Makefile.am 2010-01-22 15:05:33 +0000
@@ -58,12 +58,21 @@
        $(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)
        $(MING_LIBS) \
        $(NULL)
 
+if LIBLTDL2
+AM_LDFLAGS  += $(top_builddir)/libltdl/libltdlc.la
+endif
+if LIBLTDL1
+AM_LDFLAGS += $(top_builddir)/libbase/libltdlc.la
+endif
+
 if BUILD_SSL
 TEST_SSL = test_ssl
 endif