[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-497-g73a370d

[Benjamin Wolsey]

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  73a370d1aa3f519429c89a6acaf589f65920f3c2 (commit)
      from  6da65a7bd31a1dd16ecc74e9c8a5ffb81e5dbb21 (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=73a370d1aa3f519429c89a6acaf589f65920f3c2


commit 73a370d1aa3f519429c89a6acaf589f65920f3c2
Author: Benjamin Wolsey <address@hidden>
Date:   Sat Apr 2 20:54:58 2011 +0200

    Revert "Don't use pthread cflags except in libbase,
    as OpenBSD needs them.
    
    This reverts commit bc436656d96adeb98b2f27c924bda25c92efff45.
    
    Conflicts:
    
        gui/Makefile.am
        libcore/parser/Makefile.am
        libcore/vm/Makefile.am
        libmedia/Makefile.am
        librender/Makefile.am
        libsound/Makefile.am

diff --git a/extensions/fileio/Makefile.am b/extensions/fileio/Makefile.am
index 29d54d1..a7fbfc7 100644
--- a/extensions/fileio/Makefile.am
+++ b/extensions/fileio/Makefile.am
@@ -36,6 +36,7 @@ INCLUDES =  \
            -I$(top_srcdir)/libcore/parser \
            -I$(top_srcdir)/libcore/asobj \
            $(BOOST_CFLAGS) \
+           $(PTHREAD_CFLAGS) \
            $(NULL)
 
 AM_LDFLAGS =  \
diff --git a/extensions/gtk2/Makefile.am b/extensions/gtk2/Makefile.am
index e5bc749..02cb286 100644
--- a/extensions/gtk2/Makefile.am
+++ b/extensions/gtk2/Makefile.am
@@ -35,6 +35,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libcore/asobj \
        $(SDL_CFLAGS) \
        $(BOOST_CFLAGS) \
+       $(PTHREAD_CFLAGS) \
        $(GTK2_CFLAGS) \
        $(GLEXT_CFLAGS) \
        $(GLIB_CFLAGS) \
diff --git a/gui/Makefile.am b/gui/Makefile.am
index de87299..4572961 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -81,6 +81,7 @@ AM_CPPFLAGS = \
        -DPLUGINSDIR=\"$(pluginsdir)\" \
        -DLIBAVCODEC_IDENT=\"$(LIBAVCODEC_IDENT)\" \
        $(BOOST_CFLAGS) \
+       $(PTHREAD_CFLAGS) \
        $(NULL)
 
 GTK_CFLAGS = \
diff --git a/gui/dump/Makefile.am b/gui/dump/Makefile.am
index 2af04af..ed737e3 100644
--- a/gui/dump/Makefile.am
+++ b/gui/dump/Makefile.am
@@ -51,6 +51,7 @@ AM_CPPFLAGS = \
        $(LIRC_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(PYTHON_LIBS) \
+       $(PTHREAD_CFLAGS) \
        $(NULL)
 
 AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
diff --git a/gui/fb/Makefile.am b/gui/fb/Makefile.am
index c1c9d92..f55db64 100644
--- a/gui/fb/Makefile.am
+++ b/gui/fb/Makefile.am
@@ -49,6 +49,7 @@ AM_CPPFLAGS = \
        $(LIRC_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(PYTHON_LIBS) \
+       $(PTHREAD_CFLAGS) \
        $(NULL)
 
 AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
diff --git a/libcore/Makefile.am b/libcore/Makefile.am
index add8fa2..d3872fa 100644
--- a/libcore/Makefile.am
+++ b/libcore/Makefile.am
@@ -42,6 +42,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libbase \
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libsound \
+       $(PTHREAD_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(FREETYPE2_CFLAGS) \
diff --git a/libcore/parser/Makefile.am b/libcore/parser/Makefile.am
index 66a9af4..ba31701 100644
--- a/libcore/parser/Makefile.am
+++ b/libcore/parser/Makefile.am
@@ -38,6 +38,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libbase \
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libsound \
+       $(PTHREAD_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(NULL)
 
diff --git a/libcore/vm/Makefile.am b/libcore/vm/Makefile.am
index a0553b5..0cd69d3 100644
--- a/libcore/vm/Makefile.am
+++ b/libcore/vm/Makefile.am
@@ -32,6 +32,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libbase \
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libsound \
+       $(PTHREAD_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(NULL)
 
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index 4be42c3..e3e1901 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -29,6 +29,7 @@ pkglib_LTLIBRARIES =  libgnashmedia.la
 
 libgnashmedia_la_CPPFLAGS = \
        -I$(top_srcdir)/libbase \
+       $(PTHREAD_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(NULL)
 
diff --git a/librender/Makefile.am b/librender/Makefile.am
index 32f27ae..f820314 100644
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@ -33,6 +33,7 @@ AM_CPPFLAGS = -I.. \
        -I$(top_srcdir)/libcore/swf \
        -I$(top_srcdir)/libbase \
        -I$(top_srcdir)/librender \
+       $(PTHREAD_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(OPENGL_CFLAGS) \
        $(AGG_CFLAGS) \
diff --git a/libsound/Makefile.am b/libsound/Makefile.am
index 5e2ef65..877c060 100644
--- a/libsound/Makefile.am
+++ b/libsound/Makefile.am
@@ -23,6 +23,7 @@ pkglib_LTLIBRARIES =  libgnashsound.la
 libgnashsound_la_CPPFLAGS = \
        -I$(top_srcdir)/libbase \
        -I$(top_srcdir)/libmedia \
+       $(PTHREAD_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(SDL_CFLAGS) \
        $(NULL)
diff --git a/testsuite/libbase.all/Makefile.am 
b/testsuite/libbase.all/Makefile.am
index a9e233e..f0c0a81 100644
--- a/testsuite/libbase.all/Makefile.am
+++ b/testsuite/libbase.all/Makefile.am
@@ -29,8 +29,8 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/testsuite \
         $(MING_CFLAGS) \
        $(BOOST_CFLAGS) \
-       $(DEJAGNU_CFLAGS) \
        $(PTHREAD_CFLAGS) \
+       $(DEJAGNU_CFLAGS) \
        $(NULL)
 
 abs_builddir=`(cd $(top_builddir)/testsuite/libbase; pwd)`
diff --git a/testsuite/libmedia.all/Makefile.am 
b/testsuite/libmedia.all/Makefile.am
index 8f0c7d4..b1e1e2c 100644
--- a/testsuite/libmedia.all/Makefile.am
+++ b/testsuite/libmedia.all/Makefile.am
@@ -44,6 +44,7 @@ INCLUDES = \
        -DLOCALEDIR=\"$(localedir)\" \
        $(BOOST_CFLAGS) \
        $(DEJAGNU_CFLAGS) \
+       $(PTHREAD_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(GSTAPP_CFLAGS) \
        $(GSTINTERFACES_CFLAGS) 
diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 3a279aa..1119565 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -63,6 +63,7 @@ AM_CPPFLAGS = \
        $(GSTREAMER_PLUGINS_BASE_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(BOOST_CFLAGS) \
+       $(PTHREAD_CFLAGS) \
        $(NULL)
 
 if WIN32

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

Summary of changes:
 extensions/fileio/Makefile.am      |    1 +
 extensions/gtk2/Makefile.am        |    1 +
 gui/Makefile.am                    |    1 +
 gui/dump/Makefile.am               |    1 +
 gui/fb/Makefile.am                 |    1 +
 libcore/Makefile.am                |    1 +
 libcore/parser/Makefile.am         |    1 +
 libcore/vm/Makefile.am             |    1 +
 libmedia/Makefile.am               |    1 +
 librender/Makefile.am              |    1 +
 libsound/Makefile.am               |    1 +
 testsuite/libbase.all/Makefile.am  |    2 +-
 testsuite/libmedia.all/Makefile.am |    1 +
 utilities/Makefile.am              |    1 +
 14 files changed, 14 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash