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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/03/02 01:28:33

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

Log message:
                * doc/C/Makefile.am: Tweak dependencies more to deal with all 
the
                weird variations of docbook utils and docbook2X between 
platforms.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/Makefile.am?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5770&r2=1.5771

Patches:
Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- doc/C/Makefile.am   1 Mar 2008 21:14:04 -0000       1.56
+++ doc/C/Makefile.am   2 Mar 2008 01:28:32 -0000       1.57
@@ -84,7 +84,7 @@
 # dependency anyway.
 dist_man_MANS = gnash.1 gprocessor.1 dumpshm.1 soldumper.1 cygnal.1
 MANSRC = $(dist_man_MANS:.1=.man-xml)
-INFOS  = gnash_user.info gnashuser.info gnash_ref.info gnashref.info
+INFOS  = gnash_user.info gnash_ref.info
 HTMLS  = $(XML_MAIN:.xml=.html)
 PDFS   = $(XML_MAIN:.xml=.pdf)
 TEXIS  = gnash_user.texi gnashuser.texi gnash_ref.texi gnashref.texi
@@ -106,7 +106,6 @@
 info: images $(INFOS)
 texi: images $(TEXIS)
 
-
 #
 # Gnash uses suffix rules to build all the various supported
 # output formats. This section contains all the code that does
@@ -121,7 +120,7 @@
 # for end users because the documentation in xml, html, and info
 # formats is always available.
 #
-SUFFIXES = .xml .html .texi .pdf .info .1 .fo .man-xml
+SUFFIXES = .xml .html .texi .pdf .info .1 .fo .man-xml .in
 
 if ENABLE_FOP
 .xml.pdf:
@@ -161,11 +160,13 @@
          basefile="$*"; \
           $(DB2X_XSLTPROC) -s texi $< --output $${basefile}.txml; \
          out=`$(DB2X_TEXIXML) --encoding=us-ascii//TRANSLIT --list-files 
$${basefile}.txml` ; \
-         if test ! -f $out; then \
+         if test ! -f $${out}; then \
           out=`echo $${out} | tr -d '_'`; \
          fi; \
          rm $${basefile}.txml; \
+         if test -f $${out}; then \
          mv $${out} $${basefile}.texi; \
+         fi; \
        fi
 endif
 
@@ -173,11 +174,7 @@
 if ENABLE_TEXI
        -$(MAKEINFO) --force $<
 else
-       @if test -d $(top_srcdir)/packaging/doc; then \
-         $(LN_S) -f $(top_srcdir)/packaging/doc/address@hidden ./$@; \
-       else \
-         touch $@; \
-       fi
+       touch $@;
 endif
 
 .man-xml.1:
@@ -197,21 +194,29 @@
        fi
 endif
 
-if DOCBOOK
 gnash_user.info gnashuser.info: gnashuser.texi
 gnash_ref.info gnashref.info: gnashref.texi
 gnashuser.texi gnash_user.texi: gnashuser.xml
 gnashref.texi gnash_user.texi: gnashref.xml
-else
+if ! DOCBOOK
 gnash_user.info: gnashuser.xml
        @if test -d $(top_srcdir)/packaging/doc; then \
          $(LN_S) -f $(top_srcdir)/packaging/doc/gnash_user.info.in 
./gnash_user.info; \
        fi
 
+gnashuser.info: gnashuser.xml
+       @if test -d $(top_srcdir)/packaging/doc; then \
+         $(LN_S) -f $(top_srcdir)/packaging/doc/gnash_user.info.in 
./gnashuser.info; \
+       fi
+
 gnash_ref.info: gnashref.xml
        @if test -d $(top_srcdir)/packaging/doc; then \
          $(LN_S) -f $(top_srcdir)/packaging/doc/gnash_ref.info.in 
./gnash_ref.info; \
        fi
+gnashref.info: gnashref.xml
+       @if test -d $(top_srcdir)/packaging/doc; then \
+         $(LN_S) -f $(top_srcdir)/packaging/doc/gnash_ref.info.in 
./gnashref.info; \
+       fi
 endif
 
 # When we build in a seperate build tree, we need links to the images

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5770
retrieving revision 1.5771
diff -u -b -r1.5770 -r1.5771
--- ChangeLog   1 Mar 2008 21:14:04 -0000       1.5770
+++ ChangeLog   2 Mar 2008 01:28:33 -0000       1.5771
@@ -1,5 +1,13 @@
 2008-03-01  Rob Savoye  <address@hidden>
 
+       * doc/C/Makefile.am: Tweak dependencies more to deal with all the
+       weird variations of docbook utils and docbook2X between platforms.
+
+       * packaging/deb.am: Add snapshot-deb target.
+
+       * testsuite/misc-ming.all/Makefile.am: Add BOOST_CFLAGS for older
+       compilers.
+
        * doc/C/refmanual/logging.xml: Add new log_*() functions. Mark C++
        streaming API as discouraged.
        * doc/C/Makefile.am: Add extra dependencies for the gnash