[Gnash-commit] gnash doc/C/Makefile.am configure.ac ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/03/01 15:45:17

Modified files:
        doc/C          : Makefile.am 
        .              : configure.ac ChangeLog 

Log message:
                * doc/C/Makefile.am: Link to the preformatted info file, which 
is
                messy because of the name transformation.
                * configure.ac: Always Define Docbook Conditionals or make 
fails.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/Makefile.am?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.489&r2=1.490
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5767&r2=1.5768

Patches:
Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- doc/C/Makefile.am   1 Mar 2008 14:47:16 -0000       1.50
+++ doc/C/Makefile.am   1 Mar 2008 15:45:14 -0000       1.51
@@ -80,7 +80,7 @@
 #noinst_SCRIPT = gen-doc.sh
 dist_man_MANS = gnash.1 gprocessor.1 dumpshm.1 soldumper.1 cygnal.1
 MANSRC = $(dist_man_MANS:.1=.man-xml)
-INFOS  = $(XML_MAIN:.xml=.info)
+INFOS  = gnash_user.info gnash_ref.info
 HTMLS  = $(XML_MAIN:.xml=.html)
 PDFS   = $(XML_MAIN:.xml=.pdf)
 TEXIS  = $(XML_MAIN:.xml=.texi)
@@ -90,8 +90,8 @@
 
 all-local: images html man info
 
-gnashuser.html gnashuser.pdf gnash_user_manual.info: gnashuser.xml $(USERMAN)
-gnashref.html gnashref.pdf gnash_reference_manual.info: gnashref.xml $(REFMAN)
+gnashuser.html gnashuser.pdf gnash_user.info: gnashuser.xml $(USERMAN)
+gnashref.html gnashref.pdf gnash_ref.info: gnashref.xml $(REFMAN)
 
 # Convienience rules for developers of these manuals. By default
 # all output formats are built if the Docbook tools are installed
@@ -191,6 +191,14 @@
        fi
 endif
 
+if !ENABLE_DOCBOOK
+gnash_user.info:
+       $(LN_S) -f $(top_srcdir)/packaging/doc/gnash_user.info.in 
./gnash_user.info; \
+
+gnash_ref.info:
+       $(LN_S) -f $(top_srcdir)/packaging/doc/gnash_ref.info.in 
./gnash_ref.info; \
+endif
+
 # When we build in a seperate build tree, we need links to the images
 # subdirectory to have them be included in the final output.
 images:

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -b -r1.489 -r1.490
--- configure.ac        1 Mar 2008 15:21:33 -0000       1.489
+++ configure.ac        1 Mar 2008 15:45:16 -0000       1.490
@@ -1639,6 +1639,13 @@
 GNASH_DOCBOOK
 AM_CONDITIONAL(ENABLE_INFO, test x${INSTALL_INFO} != x)
 AM_CONDITIONAL(DOCBOOK, test x$docbook = xyes)
+AM_CONDITIONAL(ENABLE_TEXI, [ test x"$DB2X_TEXI" != x -o x"$DB2X_TEXIXML" != x 
])
+AM_CONDITIONAL(ENABLE_PDF, [ test x"$DB2X_PDF" ])
+AM_CONDITIONAL(ENABLE_HTML, [ test x"$XSLTPROC" != x -a x"$docbook_styles" != 
x ])
+AM_CONDITIONAL(ENABLE_FOP, [ test x"$FOP" != x -a x"$docbook_styles" != x ])
+AM_CONDITIONAL(ENABLE_XMLTEX, [ test x"$PDFXMLTEX" != x -a x"$XSLTPROC" != x 
-a x"$docbook_styles" != x ])
+dnl  AM_CONDITIONAL(ENABLE_DBLATEX, [ test x"$DBLATEX" != x ])
+AM_CONDITIONAL(ENABLE_MAN, [ test x"$DB2X_MAN" != x -o x"$DB2X_MANXML" != x ])
 AM_CONDITIONAL(HAVE_AGG, [test x"${AGG_LIBS}" != x])
 
 GNASH_PATH_CURL

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5767
retrieving revision 1.5768
diff -u -b -r1.5767 -r1.5768
--- ChangeLog   1 Mar 2008 14:48:46 -0000       1.5767
+++ ChangeLog   1 Mar 2008 15:45:16 -0000       1.5768
@@ -1,5 +1,15 @@
 2008-03-01  Rob Savoye  <address@hidden>
 
+       * doc/C/Makefile.am: Link to the preformatted info file, which is
+       messy because of the name transformation.
+       * configure.ac: Always Define Docbook Conditionals or make fails.
+       
+       * packaging/gnash_ref.info.in, gnash_user.info.in,
+       gnashuser.html.in gnashuser.ref.in: Preformatted versions of the docs.
+       
+       * doc/C/usermanual/usage, installation, actionscript: Move to
+       reference manual. 
+       
        * macros/docbook.m4: Look for install-info program too, which we
        need to add entries to the system wide info 'dirs' file.