[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-527-g004434e

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  004434e54c603e1d3ab6cc2cfb194eec44bfff72 (commit)
      from  fcad8d0fef75b9084535d5d75f9defa9fea71e1a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=004434e54c603e1d3ab6cc2cfb194eec44bfff72


commit 004434e54c603e1d3ab6cc2cfb194eec44bfff72
Author: Bastiaan Jacques <address@hidden>
Date:   Wed Apr 6 22:10:17 2011 +0200

    Link gprocessor and rtmpget only to the libraries they use directly.

diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index ef0eb02..30b988b 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -35,22 +35,16 @@ GNASH_LIBS = \
 AM_LDFLAGS = \
        $(LIBINTL) \
        $(LIBADD_DL) \
-       $(BOOST_LIBS) \
        $(NULL)
 
-# bzip2 is a dependency of some libraries with mingw32
-if WIN32
-AM_LDFLAGS += $(BZ2_LIBS)
-endif
-
 localedir = $(datadir)/locale
 
 AM_CPPFLAGS = \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/librender \
-               -I$(top_srcdir)/librender/agg \
-               -I$(top_srcdir)/librender/cairo \
-               -I$(top_srcdir)/librender/opengl \
+       -I$(top_srcdir)/librender/agg \
+       -I$(top_srcdir)/librender/cairo \
+       -I$(top_srcdir)/librender/opengl \
         -I$(top_srcdir)/libcore \
         -I$(top_srcdir)/libcore/asobj \
         -I$(top_srcdir)/libcore/swf \
@@ -67,6 +61,8 @@ AM_CPPFLAGS = \
        $(NULL)
 
 if WIN32
+  # bzip2 is a dependency of some libraries with mingw32
+  AM_LDFLAGS += $(BZ2_LIBS)
   GNASH_LIBS += -lintl -lz -lws2_32
 endif
 
@@ -108,7 +104,7 @@ gprocessor_LDFLAGS = -export-dynamic
 gprocessor_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
 
 rtmpget_SOURCES = rtmpget.cpp 
-rtmpget_LDADD =  $(GNASH_LIBS) $(AM_LDFLAGS)
+rtmpget_LDADD = $(top_builddir)/libbase/libgnashbase.la $(AM_LDFLAGS)
 
 #dumpshm_SOURCES = dumpshm.cpp
 #dumpshm_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)

-----------------------------------------------------------------------

Summary of changes:
 utilities/Makefile.am |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Gnash