[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11883: Fix the long-standing linkin
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11883: Fix the long-standing linking dependency bug. Libcore depends on libmedia and libsound, libsound depends on libmedia. Period. No circular deps... |
Date: |
Thu, 04 Feb 2010 01:01:07 +0100 |
User-agent: |
Bazaar (2.0.2) |
------------------------------------------------------------
revno: 11883
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-04 01:01:07 +0100
message:
Fix the long-standing linking dependency bug. Libcore depends on libmedia and
libsound, libsound depends on libmedia. Period. No circular deps...
modified:
Makefile.am
libcore/Makefile.am
libsound/Makefile.am
=== modified file 'Makefile.am'
--- a/Makefile.am 2010-01-29 17:52:40 +0000
+++ b/Makefile.am 2010-02-04 00:01:07 +0000
@@ -46,8 +46,8 @@
libamf \
libnet \
libmedia \
+ libsound \
libcore \
- libsound \
backend \
gui \
plugin \
=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am 2010-02-03 12:23:38 +0000
+++ b/libcore/Makefile.am 2010-02-04 00:01:07 +0000
@@ -294,6 +294,7 @@
$(top_builddir)/libcore/parser/libgnashparser.la \
$(top_builddir)/libcore/vm/libgnashvm.la \
$(top_builddir)/libmedia/libgnashmedia.la \
+ $(top_builddir)/libsound/libgnashsound.la \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
$(FREETYPE2_LIBS) \
=== modified file 'libsound/Makefile.am'
--- a/libsound/Makefile.am 2010-01-21 00:27:19 +0000
+++ b/libsound/Makefile.am 2010-02-04 00:01:07 +0000
@@ -22,7 +22,6 @@
libgnashsound_la_CPPFLAGS = \
-I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libcore \
-I$(top_srcdir)/libmedia \
$(PTHREAD_CFLAGS) \
$(DMALLOC_CFLAGS) \
@@ -67,7 +66,7 @@
libgnashsound_la_LDFLAGS += -no-undefined
libgnashsound_la_LIBADD += \
$(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/libcore/libgnashcore.la \
+ $(top_builddir)/libmedia/libgnashmedia.la \
-lintl
endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11883: Fix the long-standing linking dependency bug. Libcore depends on libmedia and libsound, libsound depends on libmedia. Period. No circular deps...,
Sandro Santilli <=