[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1192-g38b7159

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


commit 38b71599f4558122d9070080fa97b5df548bee3a
Author: Sandro Santilli <address@hidden>
Date:   Sun Sep 25 10:58:31 2011 +0200

    Re-enable distribution of cygnal and libdevice.
    
    STD_SUBDIRS should be the unconditional set of subdirs.
    SUBDIRS is the dirs we are building (depend on configuration setting and is 
appended to based on those).
    DIST_SUBDIRS is _all_ the available dirs, so STD_SUBDIRS plus all the 
conditionally enabled.

diff --git a/Makefile.am b/Makefile.am
index cafb7d8..27e3b6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,32 +45,22 @@ 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) extensions testsuite
+SUBDIRS = $(STD_DIRS) 
+DIST_SUBDIRS = $(STD_DIRS) testsuite extensions cygnal libdevice
 
 if TESTSUITE
 SUBDIRS += testsuite
@@ -80,6 +70,15 @@ 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, 11 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Gnash