[Gnash-commit] /srv/bzr/gnash/trunk r11749: we only build the static convienience library, so drop confusing installed support for libltdl.

[Rob Savoye]

------------------------------------------------------------
revno: 11749
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2010-01-14 14:42:16 -0700
message:
  we only build the static convienience library, so drop confusing installed 
support for libltdl.
modified:
  libbase/Makefile.am

=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am       2010-01-01 17:48:26 +0000
+++ b/libbase/Makefile.am       2010-01-14 21:42:16 +0000
@@ -105,29 +105,20 @@
 if USE_PNG
 libgnashbase_la_SOURCES += GnashImagePng.cpp
 endif
+
 if USE_GIF
 libgnashbase_la_SOURCES += GnashImageGif.cpp
 endif
 
-if INSTALL_LTDL
-if LIBLTDL1
-include_HEADERS =  $(top_srcdir)/libltdl/ltdl.h
-LIBLTDLLIB = libltdl.la
-LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
-endif
-endif
-
-if LIBLTDL1
+if LIBLTDL1
+noinst_LTLIBRARIES = libltdlc.la
 libltdlc_la_CPPFLAGS = $(LTDLINCL) -I$(top_srcdir)/libltdl
-if CONVENIENCE_LTDL
-noinst_LTLIBRARIES = libltdlc.la
 libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+# if WIN32
+# libltdlc_la_LDFLAGS = -static
+# endif
 endif
 
-libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
-libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
-libltdl_la_LIBADD = $(LIBADD_DL)
-
 if WIN32
   libgnashbase_la_LIBADD += -lws2_32 -lwinmm
 endif
@@ -215,10 +206,6 @@
   libgnashbase_la_LIBADD += -lws2_32 -lwinmm
 endif
 
-if WIN32
-  libltdl_la_LDFLAGS += -static
-endif
-endif
 CLEANFILES = libltdl.la libltdlc.la gnashrc gnashpluginrc
 
 # Rebuild with GCC 4.x Mudflap support