[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2169-g9d03e99

[Sandro Santilli]

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  9d03e99c8b9967c9e132c23ebdfa4b29089b0d56 (commit)
      from  d821b4c9abbbabf03491a2cb0a02ebeeda4d5360 (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=9d03e99c8b9967c9e132c23ebdfa4b29089b0d56


commit 9d03e99c8b9967c9e132c23ebdfa4b29089b0d56
Author: Sandro Santilli <address@hidden>
Date:   Sat Oct 18 14:03:11 2014 +0200

    Revert "Make subdir-objects option as global default"
    
    This reverts commit f2ad7118e732da54be5afa5e3a01df801a34f595.
    
    It broke "distclean"

diff --git a/configure.ac b/configure.ac
index 2cbb9e9..10e7b49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,7 +220,7 @@ BUILDDATE="`date +%Y%m%d`"
 AC_SUBST(BUILDDATE)
 
 dnl These are required by automake
-AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_MAINTAINER_MODE
 AC_PROG_MAKE_SET
diff --git a/gui/pythonmod/Makefile.am b/gui/pythonmod/Makefile.am
index 58ffff4..4cb6750 100644
--- a/gui/pythonmod/Makefile.am
+++ b/gui/pythonmod/Makefile.am
@@ -72,15 +72,15 @@ inst_HEADERS = gnash-view.h
 
 RENDERER_GLUE =
 if BUILD_OGL_RENDERER
-RENDERER_GLUE += ../gtk/gtk_glue_gtkglext.cpp
+RENDERER_GLUE += $(top_srcdir)/gui/gtk/gtk_glue_gtkglext.cpp
 AM_CPPFLAGS += $(GLEXT_CFLAGS)
 gnash_la_LIBADD += $(GLEXT_LIBS)
 endif
 if BUILD_AGG_RENDERER
-RENDERER_GLUE += ../gtk/gtk_glue_agg.cpp
+RENDERER_GLUE += $(top_srcdir)/gui/gtk/gtk_glue_agg.cpp
 endif
 if BUILD_CAIRO_RENDERER
-RENDERER_GLUE += ../gtk/gtk_glue_cairo.cpp
+RENDERER_GLUE += $(top_srcdir)/gui/gtk/gtk_glue_cairo.cpp
 endif
 
 if USE_PYTHON
@@ -94,7 +94,7 @@ gnash_la_CPPFLAGS = $(AM_CPPFLAGS) $(GNASH_INCLUDES)
 gnash_la_SOURCES = \
        gnashmodule.c \
        gnash-view.cpp \
-       ../gtk/gtk_canvas.cpp \
+       $(top_srcdir)/gui/gtk/gtk_canvas.cpp \
        $(RENDERER_GLUE)
 
 gnash.c: gnash.defs gnash.override
diff --git a/testsuite/network.all/Makefile.am 
b/testsuite/network.all/Makefile.am
index 9e12432..20ebea6 100644
--- a/testsuite/network.all/Makefile.am
+++ b/testsuite/network.all/Makefile.am
@@ -84,8 +84,8 @@ check_SCRIPTS = \
 
 check_LTLIBRARIES = libgnashmingutils.la 
 libgnashmingutils_la_SOURCES = \
-       ../misc-ming.all/ming_utils.h \
-       ../misc-ming.all/ming_utils.c
+       $(top_srcdir)/testsuite/misc-ming.all/ming_utils.h \
+       $(top_srcdir)/testsuite/misc-ming.all/ming_utils.c
 libgnashmingutils_la_LIBADD = $(MING_LIBS)
 
 http.swf: $(srcdir)/http.as Dejagnu.swf Makefile ../actionscript.all/check.as 
../actionscript.all/utils.as

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

Summary of changes:
 configure.ac                      |    2 +-
 gui/pythonmod/Makefile.am         |    8 ++++----
 testsuite/network.all/Makefile.am |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Gnash