[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2038-g3222fca

[Petter Reinholdtsen]

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  3222fcaabcce42eef852db67aa95ab7f7954b5ec (commit)
      from  4661b5f191466001a76d87174181af7ba7ac7bf4 (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=3222fcaabcce42eef852db67aa95ab7f7954b5ec


commit 3222fcaabcce42eef852db67aa95ab7f7954b5ec
Author: Petter Reinholdtsen <address@hidden>
Date:   Wed May 21 11:56:07 2014 +0200

    Revert rename from INCLUDES to AM_CPPFLAGS for gui/pythonmod/Makefile.am.
    
    The rename did not work for this file.  Reverting while trying to figure out
    how to properly fix it.

diff --git a/gui/pythonmod/Makefile.am b/gui/pythonmod/Makefile.am
index d22af18..aee24b4 100644
--- a/gui/pythonmod/Makefile.am
+++ b/gui/pythonmod/Makefile.am
@@ -38,7 +38,7 @@ GNASH_INCLUDES = \
        -I$(top_srcdir)/libdevice/vaapi \
        -I$(top_srcdir)/libsound
 
-AM_CPPFLAGS = \
+INCLUDES = \
        $(PYTHON_CFLAGS) \
        $(PYGTK_CFLAGS) \
        $(GTK2_CFLAGS) \
@@ -73,7 +73,7 @@ inst_HEADERS = gnash-view.h
 RENDERER_GLUE =
 if BUILD_OGL_RENDERER
 RENDERER_GLUE += $(top_srcdir)/gui/gtk/gtk_glue_gtkglext.cpp
-AM_CPPFLAGS += $(GLEXT_CFLAGS)
+INCLUDES += $(GLEXT_CFLAGS)
 gnash_la_LIBADD += $(GLEXT_LIBS)
 endif
 if BUILD_AGG_RENDERER

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

Summary of changes:
 gui/pythonmod/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash