[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1193-gf589a7e

[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  f589a7ecbba04c47094c1248897c6bbef41f82f9 (commit)
      from  38b71599f4558122d9070080fa97b5df548bee3a (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=f589a7ecbba04c47094c1248897c6bbef41f82f9


commit f589a7ecbba04c47094c1248897c6bbef41f82f9
Author: Sandro Santilli <address@hidden>
Date:   Sun Sep 25 11:56:22 2011 +0200

    Revert "Re-enable distribution of cygnal and libdevice."
    
    This reverts commit 38b71599f4558122d9070080fa97b5df548bee3a.

diff --git a/Makefile.am b/Makefile.am
index 27e3b6a..cafb7d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,22 +45,32 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --enable-python \
        --enable-cygnal
 
+if CYGNAL
+CYGNAL_DIR = cygnal
+endif
+
+if BUILD_DEVICES
+DEVICES_DIR = libdevice
+endif
+
 STD_DIRS = \
        desktop \
        libbase \
        libmedia \
        libsound \
        libcore \
+       $(DEVICES_DIR) \
        librender \
        gui \
        plugin \
+       $(CYGNAL_DIR) \
        utilities \
        doc \
        po \
        $(NULL)
 
-SUBDIRS = $(STD_DIRS) 
-DIST_SUBDIRS = $(STD_DIRS) testsuite extensions cygnal libdevice
+SUBDIRS = $(STD_DIRS)
+DIST_SUBDIRS = $(STD_DIRS) extensions testsuite
 
 if TESTSUITE
 SUBDIRS += testsuite
@@ -70,15 +80,6 @@ if BUILD_EXTENSIONS
 SUBDIRS += extensions
 endif
 
-if CYGNAL
-SUBDIRS += cygnal
-endif
-
-if BUILD_DEVICES
-SUBDIRS += libdevice
-endif
-
-
 # man_MANS = doc/gnash.1 doc/gprocessor.1 doc/dumpshm.1 soldumper.1
 
 EXTRA_DIST =  \

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

Summary of changes:
 Makefile.am |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Gnash