[Gnash-commit] gnash ./ChangeLog ./Makefile.am ./Makefile.in d...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     05/12/27 03:12:33

Modified files:
        .              : ChangeLog Makefile.am Makefile.in 
        doc            : Makefile.am 

Log message:
        * Makefile.am: Add doc subdirectory to DIST_SUBDIRS so it gets
        included in the tarball, but isn't part of the SUBDIRS, since we
        don't always want to build the docs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.in.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.11 gnash/ChangeLog:1.12
--- gnash/ChangeLog:1.11        Tue Dec 27 00:45:59 2005
+++ gnash/ChangeLog     Tue Dec 27 03:12:33 2005
@@ -1,5 +1,9 @@
 2005-12-26  Rob Savoye  <address@hidden>
 
+       * Makefile.am: Add doc subdirectory to DIST_SUBDIRS so it gets
+       included in the tarball, but isn't part of the SUBDIRS, since we
+       don't always want to build the docs.
+
        * macros/libXML.m4: Make the --with-libxml-include and
        --with-libxml-libraries add the library to the path. Test if
        pk-config exists. Use it if it does, but if it doesn't, do a brute
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.4 gnash/Makefile.am:1.5
--- gnash/Makefile.am:1.4       Tue Dec 27 00:05:03 2005
+++ gnash/Makefile.am   Tue Dec 27 03:12:33 2005
@@ -11,7 +11,8 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = dejagnu
 
-STD_DIRS = libbase libgeometry server backend utilities doc # testsuite
+STD_DIRS = libbase libgeometry server backend utilities # testsuite
+DIST_SUBDIRS = doc
 if PLUGIN
 SUBDIRS = $(STD_DIRS) plugin
 else
Index: gnash/Makefile.in
diff -u gnash/Makefile.in:1.6 gnash/Makefile.in:1.7
--- gnash/Makefile.in:1.6       Tue Dec 27 00:45:59 2005
+++ gnash/Makefile.in   Tue Dec 27 03:12:33 2005
@@ -90,7 +90,6 @@
 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
 EXPECT = expect
 RUNTEST = runtest
-DIST_SUBDIRS = libbase libgeometry server backend utilities doc plugin
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -246,7 +245,8 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = dejagnu
-STD_DIRS = libbase libgeometry server backend utilities doc # testsuite
+STD_DIRS = libbase libgeometry server backend utilities # testsuite
+DIST_SUBDIRS = doc
 @address@hidden = $(STD_DIRS)
 @address@hidden = $(STD_DIRS) plugin
 
Index: gnash/doc/Makefile.am
diff -u gnash/doc/Makefile.am:1.1 gnash/doc/Makefile.am:1.2
--- gnash/doc/Makefile.am:1.1   Tue Dec 20 20:52:15 2005
+++ gnash/doc/Makefile.am       Tue Dec 27 03:12:33 2005
@@ -18,4 +18,3 @@
 #
 
 SUBDIRS = C
-