[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11784: don't use LIBLTDL, as it's a
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11784: don't use LIBLTDL, as it's a convienience lib, we don't need to do that. |
|
Date: |
Wed, 20 Jan 2010 17:27:19 -0700 |
|
User-agent: |
Bazaar (2.0.2) |
------------------------------------------------------------
revno: 11784
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2010-01-20 17:27:19 -0700
message:
don't use LIBLTDL, as it's a convienience lib, we don't need to do that.
modified:
cygnal/Makefile.am
extensions/dbus/Makefile.am
extensions/dejagnu/Makefile.am
extensions/fileio/Makefile.am
extensions/gtk2/Makefile.am
extensions/launcher/Makefile.am
extensions/lirc/Makefile.am
gui/Makefile.am
libbase/Makefile.am
libcore/Makefile.am
libnet/Makefile.am
libsound/Makefile.am
testsuite/libamf.all/Makefile.am
utilities/Makefile.am
=== modified file 'cygnal/Makefile.am'
--- a/cygnal/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/cygnal/Makefile.am 2010-01-21 00:27:19 +0000
@@ -47,15 +47,20 @@
AM_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\"
AM_LDFLAGS = \
- ../libbase/libgnashbase.la \
- ../libcore/libgnashcore.la \
- ../libnet/libgnashnet.la \
- ../libamf/libgnashamf.la \
+ $(top_builddir)/libbase/libgnashbase.la \
+ $(top_builddir)/libcore/libgnashcore.la \
+ $(top_builddir)/libnet/libgnashnet.la \
+ $(top_builddir)/libamf/libgnashamf.la \
$(GLIB_LIBS) \
+ $(LIBINTL) \
$(CURL_LIBS) \
$(BOOST_LIBS) \
- $(LIBINTL) \
- $(PTHREAD_LIBS)
+ $(PTHREAD_LIBS) \
+ $(NULL)
+
+if LIBLTDL2
+AM_LDFLAGS += $(top_builddir)/libltdl/libltdlc.la
+endif
localedir = $(datadir)/locale
=== modified file 'extensions/dbus/Makefile.am'
--- a/extensions/dbus/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/extensions/dbus/Makefile.am 2010-01-21 00:27:19 +0000
@@ -33,7 +33,7 @@
dbus_la_SOURCES = dbus_ext.cpp dbus_ext.h
dbus_la_LDFLAGS = -module -avoid-version -no-undefined
-dbus_la_LIBDADD = $(LIBADD_DL) $(LIBLTDL) \
+dbus_la_LIBDADD = $(LIBADD_DL) \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libcore/libgnashcore.la \
$(PTHREAD_LIBS) \
=== modified file 'extensions/dejagnu/Makefile.am'
--- a/extensions/dejagnu/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/extensions/dejagnu/Makefile.am 2010-01-21 00:27:19 +0000
@@ -39,7 +39,7 @@
dejagnu_la_SOURCES = dejagnu.cpp dejagnu.h
dejagnu_la_LDFLAGS = -module -avoid-version -no-undefined
-dejagnu_la_LIBDADD = $(LIBADD_DL) $(LIBLTDL) $(AM_LDFLAGS)
+dejagnu_la_LIBDADD = $(LIBADD_DL) $(AM_LDFLAGS)
check_PROGRAMS = # SharedTest
CLEANFILES = \
=== modified file 'extensions/fileio/Makefile.am'
--- a/extensions/fileio/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/extensions/fileio/Makefile.am 2010-01-21 00:27:19 +0000
@@ -46,7 +46,7 @@
fileio_la_SOURCES = fileio.cpp fileio.h
fileio_la_LDFLAGS = -module -avoid-version -no-undefined
-fileio_la_LIBDADD = $(LIBADD_DL) $(LIBLTDL) $(AM_LDFLAGS)
+fileio_la_LIBDADD = $(LIBADD_DL) $(AM_LDFLAGS)
check_SCRIPTS =
=== modified file 'extensions/gtk2/Makefile.am'
--- a/extensions/gtk2/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/extensions/gtk2/Makefile.am 2010-01-21 00:27:19 +0000
@@ -59,7 +59,7 @@
gtkext_la_SOURCES = gtkext.cpp gtkext.h
gtkext_la_LDFLAGS = -module -avoid-version # -no-undefined
-gtkext_la_LIBDADD = $(LIBADD_DL) $(LIBLTDL) $(AM_LDFLAGS)
+gtkext_la_LIBDADD = $(LIBADD_DL) $(AM_LDFLAGS)
# check_PROGRAMS = hello
CLEANFILES = \
=== modified file 'extensions/launcher/Makefile.am'
--- a/extensions/launcher/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/extensions/launcher/Makefile.am 2010-01-21 00:27:19 +0000
@@ -36,7 +36,7 @@
launcher_ext_la_SOURCES = launcher_ext.cpp launcher_ext.h
launcher_ext_la_LDFLAGS = -module -avoid-version -no-undefined
-launcher_ext_la_LIBDADD = $(LIBADD_DL) $(LIBLTDL) \
+launcher_ext_la_LIBDADD = $(LIBADD_DL) \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libcore/libgnashcore.la \
$(PTHREAD_LIBS) \
=== modified file 'extensions/lirc/Makefile.am'
--- a/extensions/lirc/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/extensions/lirc/Makefile.am 2010-01-21 00:27:19 +0000
@@ -35,7 +35,7 @@
lirc_la_SOURCES = lirc_ext.cpp lirc_ext.h
lirc_la_LDFLAGS = -module -avoid-version -no-undefined
-lirc_la_LIBDADD = $(LIBADD_DL) $(LIBLTDL) \
+lirc_la_LIBDADD = $(LIBADD_DL) \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libcore/libgnashcore.la \
$(PTHREAD_LIBS) \
=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/gui/Makefile.am 2010-01-21 00:27:19 +0000
@@ -96,9 +96,7 @@
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_LDFLAGS = \
$(GLIB_LIBS) \
- $(LIBLTDL) \
$(CURL_LIBS) \
- $(INCLTDL) \
$(LIRC_LIBS) \
$(MYSQL_LIBS) \
$(BOOST_LIBS) \
@@ -113,6 +111,10 @@
$(top_builddir)/libsound/libgnashsound.la \
$(top_builddir)/libbase/libgnashbase.la
+if LIBLTDL2
+GNASH_LIBS += $(top_builddir)/libltdl/libltdlc.la
+endif
+
# Only build loadable modules unless statically linking
# if DYNAMIC_GUI # make shared libraries suitable for dlopen().
# if ENABLE_SHARED
=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am 2010-01-14 21:42:16 +0000
+++ b/libbase/Makefile.am 2010-01-21 00:27:19 +0000
@@ -24,14 +24,15 @@
# 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) libgnashbase.la
+pkglib_LTLIBRARIES = libgnashbase.la
libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
- -I$(top_srcdir)/libnet \
- -I$(top_srcdir)/libamf \
+ -I$(top_srcdir)/libnet \
+ -I$(top_srcdir)/libamf \
-I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/swf \
+ -I$(top_srcdir)/libcore/swf \
+ -I$(top_srcdir)/libltdl \
$(PTHREAD_CFLAGS) \
$(PNG_CFLAGS) \
$(GIF_CFLAGS) \
@@ -57,8 +58,6 @@
$(LIBINTL) \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
- $(LIBLTDL) \
- $(LIBADD_DL) \
$(NULL)
libgnashbase_la_SOURCES = \
@@ -114,9 +113,6 @@
noinst_LTLIBRARIES = libltdlc.la
libltdlc_la_CPPFLAGS = $(LTDLINCL) -I$(top_srcdir)/libltdl
libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
-# if WIN32
-# libltdlc_la_LDFLAGS = -static
-# endif
endif
if WIN32
=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am 2010-01-14 11:45:08 +0000
+++ b/libcore/Makefile.am 2010-01-21 00:27:19 +0000
@@ -317,27 +317,29 @@
libgnashcore_la_SOURCES += debugger.cpp
endif
-#libserver_la_LIBDADD = address@hidden@ # $(LIBLTDL)
+#libserver_la_LIBDADD = address@hidden@
libgnashcore_la_LDFLAGS = -release $(VERSION) -export-dynamic
-if WIN32
- libgnashcore_la_LDFLAGS += -no-undefined
- libgnashcore_la_LIBADD += \
- $(top_builddir)/libmedia/libgnashmedia_la-MediaParser.lo \
- $(top_builddir)/libmedia/libgnashmedia_la-MediaHandler.lo \
- $(top_builddir)/libmedia/libgnashmedia_la-FLVParser.lo \
- $(top_builddir)/libmedia/libgnashmedia_la-AudioInput.lo \
- $(top_builddir)/libmedia/libgnashmedia_la-AudioDecoderNellymoser.lo \
- $(top_builddir)/libmedia/libgnashmedia_la-AudioDecoderSimple.lo \
- $(top_builddir)/libmedia/libgnashmedia_la-AudioResampler.lo
-if HAVE_SPEEX
- libgnashcore_la_LIBADD += \
- $(top_builddir)/libmedia/libgnashmedia_la-AudioDecoderSpeex.lo
-endif
-else
- libgnashcore_la_LIBADD += $(top_builddir)/libmedia/libgnashmedia.la \
- $(top_builddir)/libsound/libgnashsound.la
-endif
+# if WIN32
+# libgnashcore_la_LDFLAGS += -no-undefined
+# libgnashcore_la_LIBADD += \
+# $(top_builddir)/libmedia/libgnashmedia_la-MediaParser.lo \
+# $(top_builddir)/libmedia/libgnashmedia_la-MediaHandler.lo \
+# $(top_builddir)/libmedia/libgnashmedia_la-FLVParser.lo \
+# if USE_FFMPEG_ENGINE
+# $(top_builddir)/libmedia/libgnashmedia_la-AudioInput.lo \
+# endif
+# $(top_builddir)/libmedia/libgnashmedia_la-AudioDecoderNellymoser.lo \
+# $(top_builddir)/libmedia/libgnashmedia_la-AudioDecoderSimple.lo \
+# $(top_builddir)/libmedia/libgnashmedia_la-AudioResampler.lo
+# if HAVE_SPEEX
+# libgnashcore_la_LIBADD += \
+# $(top_builddir)/libmedia/libgnashmedia_la-AudioDecoderSpeex.lo
+# endif
+# else
+# libgnashcore_la_LIBADD += $(top_builddir)/libmedia/libgnashmedia.la \
+# $(top_builddir)/libsound/libgnashsound.la
+# endif
# Rebuild with GCC 4.x Mudflap support
mudflap:
=== modified file 'libnet/Makefile.am'
--- a/libnet/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/libnet/Makefile.am 2010-01-21 00:27:19 +0000
@@ -25,14 +25,14 @@
AM_LDFLAGS = \
../libbase/libgnashbase.la \
../libamf/libgnashamf.la \
- $(LIBLTDL) \
$(SSH_LIBS) \
$(SSL_LIBS) \
$(GLIB_LIBS) \
$(CURL_LIBS) \
$(LIBADD_DL) \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS)
+ $(PTHREAD_LIBS) \
+ $(NULL)
localedir = $(datadir)/locale
@@ -45,7 +45,8 @@
$(SSH_CFLAGS) \
$(CURL_CFLAGS) \
$(BOOST_CFLAGS) \
- $(PTHREAD_CFLAGS)
+ $(PTHREAD_CFLAGS) \
+ $(NULL)
noinst_HEADERS = \
cque.h \
=== modified file 'libsound/Makefile.am'
--- a/libsound/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/libsound/Makefile.am 2010-01-21 00:27:19 +0000
@@ -23,17 +23,14 @@
libgnashsound_la_CPPFLAGS = \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libmedia \
+ -I$(top_srcdir)/libmedia \
$(PTHREAD_CFLAGS) \
$(DMALLOC_CFLAGS) \
$(BOOST_CFLAGS) \
- $(INCLTDL) \
$(SDL_CFLAGS) \
$(NULL)
libgnashsound_la_LIBADD = \
- $(LIBLTDL) \
- $(LIBLTDLHEAD) \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
$(SDL_LIBS) \
@@ -52,7 +49,7 @@
InputStream.h \
EmbedSound.h \
EmbedSoundInst.h \
- AuxStream.h
+ AuxStream.h
$(NULL)
if USE_SOUND_SDL
=== modified file 'testsuite/libamf.all/Makefile.am'
--- a/testsuite/libamf.all/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/testsuite/libamf.all/Makefile.am 2010-01-21 00:27:19 +0000
@@ -21,7 +21,6 @@
AM_LDFLAGS = \
../../libbase/libgnashbase.la \
../../libamf/libgnashamf.la \
- $(LIBLTDL) \
$(GLIB_LIBS) \
$(CURL_LIBS) \
$(BOOST_LIBS) \
=== modified file 'utilities/Makefile.am'
--- a/utilities/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/utilities/Makefile.am 2010-01-21 00:27:19 +0000
@@ -32,6 +32,10 @@
$(top_builddir)/libsound/libgnashsound.la \
$(NULL)
+if LIBLTDL2
+GNASH_LIBS += $(top_builddir)/libltdl/libltdlc.la
+endif
+
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_LDFLAGS = \
@@ -42,9 +46,13 @@
$(BOOST_LIBS) \
$(PYTHON_LIBS) \
$(PTHREAD_LIBS) \
- $(LIBLTDL) \
$(NULL)
+# bzip2 is a dependency of some libraries with mingw32
+if WIN32
+AM_LDFLAGS += $(BZ2_LIBS)
+endif
+
localedir = $(datadir)/locale
#AM_CPPFLAGS = # -Wall
@@ -104,7 +112,6 @@
# export our symbols so they can be used by Gnash plugins
gprocessor_LDFLAGS = -export-dynamic
gprocessor_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
-gprocessor_DEPENDENCIES = $(LTDLDEPS)
dumpshm_SOURCES = dumpshm.cpp
dumpshm_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11784: don't use LIBLTDL, as it's a convienience lib, we don't need to do that.,
Rob Savoye <=