[Gnash-commit] gnash ChangeLog Makefile.am

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/03 19:27:30

Modified files:
        .              : ChangeLog Makefile.am 

Log message:
        * Makefile.am: only descend in doc/ subdir if DOCBOOK is enabled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3935&r2=1.3936
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.85&r2=1.86

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3935
retrieving revision 1.3936
diff -u -b -r1.3935 -r1.3936
--- ChangeLog   3 Aug 2007 18:48:37 -0000       1.3935
+++ ChangeLog   3 Aug 2007 19:27:28 -0000       1.3936
@@ -1,5 +1,9 @@
 2007-08-02 Sandro Santilli <address@hidden>
 
+       * Makefile.am: only descend in doc/ subdir if DOCBOOK is enabled.
+
+2007-08-02 Sandro Santilli <address@hidden>
+
        * configure.ac: check GTK dependencies only if $build_gtk=yes.
          print a WARNING and set $build_gtk=no if deps are not met.
          All of this is done *before* NSAPI is checked, so it would

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- Makefile.am 3 Aug 2007 18:28:38 -0000       1.85
+++ Makefile.am 3 Aug 2007 19:27:29 -0000       1.86
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.85 2007/08/03 18:28:38 strk Exp $
+# $Id: Makefile.am,v 1.86 2007/08/03 19:27:29 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -41,11 +41,15 @@
 CYGNAL_DIRS = cygnal
 endif
 
-SUBDIRS      = $(STD_DIRS) $(CYGNAL_DIRS)
+if DOCBOOK
+DOC_DIRS = doc
+endif
+
+SUBDIRS      = $(STD_DIRS) $(CYGNAL_DIRS) $(DOC_DIRS)
 
 man_MANS = doc/gnash.1
 
-DIST_SUBDIRS = $(STD_DIRS) cygnal 
+DIST_SUBDIRS = $(STD_DIRS) cygnal doc
 
 EXTRA_DIST = config.rpath $(man_MANS) macros/incllist macros/libslist