[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2165-g3cf70e5

[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  3cf70e56b5b8a696a5c8db39c895e561004043a6 (commit)
      from  d4c84310e7bfbdb1b7d9e0cb2ab71898ce85c470 (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=3cf70e56b5b8a696a5c8db39c895e561004043a6


commit 3cf70e56b5b8a696a5c8db39c895e561004043a6
Author: Sandro Santilli <address@hidden>
Date:   Thu Oct 9 19:33:16 2014 +0200

    Revert "Add subdir-objects option to automake files"
    
    This reverts commit d4c84310e7bfbdb1b7d9e0cb2ab71898ce85c470.
    
    Building fails with those options, needs more work ...

diff --git a/cygnal/testsuite/cygnal.all/Makefile.am 
b/cygnal/testsuite/cygnal.all/Makefile.am
index a7449d1..a6d1dd5 100644
--- a/cygnal/testsuite/cygnal.all/Makefile.am
+++ b/cygnal/testsuite/cygnal.all/Makefile.am
@@ -19,7 +19,7 @@
 
 ## Process this file with automake to generate Makefile.in
 
-AUTOMAKE_OPTIONS = dejagnu subdir-objects
+AUTOMAKE_OPTIONS = dejagnu
 
 noinst_LTLIBRARIES = libcygnal.la
 libcygnal_la_SOURCES = \
diff --git a/gui/Makefile.am b/gui/Makefile.am
index c37e680..a3933c3 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -21,7 +21,7 @@
 # haiku-gnash and dump-gnash
 #
 
-AUTOMAKE_OPTIONS = -Wno-portability subdir-objects
+AUTOMAKE_OPTIONS = -Wno-portability
 
 SUBDIRS = .
 
diff --git a/gui/pythonmod/Makefile.am b/gui/pythonmod/Makefile.am
index 898bbfe..4cb6750 100644
--- a/gui/pythonmod/Makefile.am
+++ b/gui/pythonmod/Makefile.am
@@ -16,8 +16,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 pkgpythondir = $(pyexecdir)/gtk-2.0
 pkgpyexecdir = $(pyexecdir)/gtk-2.0
 
diff --git a/libcore/Makefile.am b/libcore/Makefile.am
index 7168b85..edce528 100644
--- a/libcore/Makefile.am
+++ b/libcore/Makefile.am
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = 
 
 SUBDIRS = parser vm
 
diff --git a/libdevice/Makefile.am b/libdevice/Makefile.am
index 86fa3f7..6cd0c9e 100644
--- a/libdevice/Makefile.am
+++ b/libdevice/Makefile.am
@@ -19,7 +19,7 @@
 
 ## Process this file with automake to generate Makefile.in
 
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS =
 
 # this is where Gnash plugins get installed
 pluginsdir = $(libdir)/gnash/plugins
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index 584c27f..985e034 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-AUTOMAKE_OPTIONS = foreign subdir-objects
+AUTOMAKE_OPTIONS = foreign
 
 AM_CXXFLAGS = $(CROSS_CXXFLAGS) -DREGISTER_MEDIA_HANDLERS
 AM_LDFLAGS = $(CROSS_LDFLAGS)
diff --git a/librender/Makefile.am b/librender/Makefile.am
index 88462a0..970d78d 100644
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@ -19,7 +19,7 @@
 
 ## Process this file with automake to generate Makefile.in
 
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS =
 
 # this is where Gnash plugins get installed
 pluginsdir = $(libdir)/gnash/plugins
diff --git a/libsound/Makefile.am b/libsound/Makefile.am
index a7aada8..a771188 100644
--- a/libsound/Makefile.am
+++ b/libsound/Makefile.am
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-AUTOMAKE_OPTIONS = foreign subdir-objects
+AUTOMAKE_OPTIONS = foreign
 
 pkglib_LTLIBRARIES = libgnashsound.la
 
diff --git a/plugin/npapi/Makefile.am b/plugin/npapi/Makefile.am
index 7faa660..e101269 100644
--- a/plugin/npapi/Makefile.am
+++ b/plugin/npapi/Makefile.am
@@ -17,7 +17,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = 
 
 SUBDIRS =
 
diff --git a/testsuite/network.all/Makefile.am 
b/testsuite/network.all/Makefile.am
index 44c6076..20ebea6 100644
--- a/testsuite/network.all/Makefile.am
+++ b/testsuite/network.all/Makefile.am
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-AUTOMAKE_OPTIONS = dejagnu -Wno-portability subdir-objects
+AUTOMAKE_OPTIONS = dejagnu -Wno-portability
 
 abs_top_builddir=$(shell cd $(top_builddir); pwd)
 abs_builddir=$(shell cd $(top_builddir)/testsuite/network.all; pwd)

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

Summary of changes:
 cygnal/testsuite/cygnal.all/Makefile.am |    2 +-
 gui/Makefile.am                         |    2 +-
 gui/pythonmod/Makefile.am               |    2 --
 libcore/Makefile.am                     |    2 +-
 libdevice/Makefile.am                   |    2 +-
 libmedia/Makefile.am                    |    2 +-
 librender/Makefile.am                   |    2 +-
 libsound/Makefile.am                    |    2 +-
 plugin/npapi/Makefile.am                |    2 +-
 testsuite/network.all/Makefile.am       |    2 +-
 10 files changed, 9 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Gnash