[Gnash-commit] gnash ChangeLog libmedia/Makefile.am

[Russ Nelson]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Russ Nelson <nelsonrn>  08/05/09 01:49:35

Modified files:
        .              : ChangeLog 
        libmedia       : Makefile.am 

Log message:
        * libmedia/Makefile.am: don't build libltdl here, as it's already
          being built by libbase.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6562&r2=1.6563
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/Makefile.am?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6562
retrieving revision 1.6563
diff -u -b -r1.6562 -r1.6563
--- ChangeLog   8 May 2008 22:37:54 -0000       1.6562
+++ ChangeLog   9 May 2008 01:49:34 -0000       1.6563
@@ -1,3 +1,8 @@
+2008-05-08 Russ Nelson <address@hidden>
+
+       * libmedia/Makefile.am: don't build libltdl here, as it's already
+         being built by libbase.
+
 2008-05-08 Sandro Santilli <address@hidden>
 
        * libbase/curl_adapter.cpp (CurlStreamFile::seek): remove

Index: libmedia/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libmedia/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libmedia/Makefile.am        29 Mar 2008 19:35:52 -0000      1.18
+++ libmedia/Makefile.am        9 May 2008 01:49:34 -0000       1.19
@@ -22,14 +22,12 @@
 pluginsdir = $(prefix)/lib/gnash/plugins
 
 if INSTALL_LTDL
-include_HEADERS =  $(top_srcdir)/libltdl/ltdl.h
-LIBLTDLLIB = libltdl.la
 LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
 endif
 
 # If we are using an installable libltdl, then it needs to be built
 # before libgnash, as libgnash depends on it for extensions.
-pkglib_LTLIBRARIES =  $(LIBLTDLLIB) libgnashmedia.la
+pkglib_LTLIBRARIES =  libgnashmedia.la
 
 libgnashmedia_la_CPPFLAGS = \
        -I.. -I$(srcdir) \
@@ -172,15 +170,15 @@
 libgnashmedia_la_LDFLAGS = -release $(VERSION)
 
 libltdlc_la_CPPFLAGS = $(LTDLINCL)
-if CONVENIENCE_LTDL
-noinst_LTLIBRARIES = libltdlc.la
-libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
-endif
-CLEANFILES = libltdl.la libltdlc.la
-
-libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
-libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
-libltdl_la_LIBADD = $(LIBADD_DL)
+#if CONVENIENCE_LTDL
+#noinst_LTLIBRARIES = libltdlc.la
+#libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+#endif
+#CLEANFILES = libltdl.la libltdlc.la
+
+#libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+#libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
+#libltdl_la_LIBADD = $(LIBADD_DL)
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap: