[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-308-g6f3d304

[Rob Savoye]

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  6f3d304f189bfb3ce5ea3b5ff1cbab235bc4612e (commit)
       via  856418a28e9b28b33163b0f6a79bda013a50a924 (commit)
      from  cb9aa89e7ac2cbc4b39d7b5f09b22a045e6050e8 (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=6f3d304f189bfb3ce5ea3b5ff1cbab235bc4612e


commit 6f3d304f189bfb3ce5ea3b5ff1cbab235bc4612e
Author: Rob Savoye <address@hidden>
Date:   Fri Apr 22 10:05:12 2011 -0600

    rtmpget needs PTHREAD_LIBS on natty

diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 6d28c8c..3ccba02 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -35,6 +35,7 @@ GNASH_LIBS = \
 AM_LDFLAGS = \
        $(LIBINTL) \
        $(LIBADD_DL) \
+       $(PTHREAD_LIBS) \
        $(NULL)
 
 localedir = $(datadir)/locale

http://git.savannah.gnu.org/cgit//commit/?id=856418a28e9b28b33163b0f6a79bda013a50a924


commit 856418a28e9b28b33163b0f6a79bda013a50a924
Author: Rob Savoye <address@hidden>
Date:   Thu Apr 21 14:55:37 2011 -0600

    add default for gtk_gnash_LDADD, renders add only those libs

diff --git a/gui/gtk/gtk.am b/gui/gtk/gtk.am
index 1e4e5fb..1c83cc5 100644
--- a/gui/gtk/gtk.am
+++ b/gui/gtk/gtk.am
@@ -29,20 +29,28 @@ gtk_gnash_SOURCES = $(GUI_SRCS) $(GTK_CANVAS) \
 gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
        $(AM_CPPFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS)
 gtk_gnash_LDFLAGS = -export-dynamic $(AM_LDFLAGS)
+gtk_gnash_LDADD = \
+       $(top_builddir)/librender/libgnashrender.la \
+       $(GNASH_LIBS) \
+       $(GTK_LIBS) \
+       $(NULL)
+
 #gtk_gnash_DEPENDENCIES = .configline
 
 if BUILD_OGL_RENDERER
 gtk_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
 gtk_gnash_SOURCES += gtk/gtk_glue_gtkglext.cpp gtk/gtk_glue_gtkglext.h 
-gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
-               $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS)
+gtk_gnash_LDADD += \
+       $(OPENGL_LIBS) \
+       $(NULL)
 endif  # BUILD_OGL_RENDERER
 
 if BUILD_AGG_RENDERER
 gtk_gnash_CPPFLAGS += $(AGG_CFLAGS)
 gtk_gnash_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h 
-gtk_gnash_LDADD = $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
-
+gtk_gnash_LDADD += $(GNASH_LIBS) \
+       $(AGG_LIBS) \
+       $(NULL)
 if HAVE_VAAPI
 noinst_HEADERS         += gtk/gtk_glue_agg_vaapi.h
 gtk_gnash_SOURCES      += gtk/gtk_glue_agg_vaapi.cpp
@@ -52,10 +60,10 @@ gtk_gnash_CPPFLAGS  += \
        -I$(top_srcdir)/libvaapi \
        $(NULL)
 gtk_gnash_LDADD += \
+       $(top_builddir)/libvaapi/libgnashvaapi.la \
        $(X11_LIBS) \
        $(LIBVA_LIBS) \
        $(LIBVA_X11_LIBS) \
-       $(top_builddir)/libvaapi/libgnashvaapi.la \
        $(NULL)
 endif   # USE_VAAPI
 endif  # BUILD_AGG_RENDERER
@@ -63,12 +71,8 @@ endif        # BUILD_AGG_RENDERER
 if BUILD_CAIRO_RENDERER
 gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
 gtk_gnash_SOURCES += gtk/gtk_glue_cairo.cpp gtk/gtk_glue_cairo.h 
-gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
-       $(GNASH_LIBS) \
-       $(GTK_LIBS) \
+gtk_gnash_LDADD += \
        $(CAIRO_LIBS) \
-       $(LIBVA_LIBS) \
-       $(LIBVA_X11_LIBS) \
        $(NULL)
 endif  # BUILD_CAIRO_RENDERER
 

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

Summary of changes:
 gui/gtk/gtk.am        |   24 ++++++++++++++----------
 utilities/Makefile.am |    1 +
 2 files changed, 15 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Gnash