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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/01/28 23:14:47

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

Log message:
        * doc/C/Makefile.am: Add pdf and info to SUFFIXES so the rules
        actually work.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.47 gnash/ChangeLog:1.48
--- gnash/ChangeLog:1.47        Sat Jan 28 23:08:34 2006
+++ gnash/ChangeLog     Sat Jan 28 23:14:46 2006
@@ -1,5 +1,8 @@
 2006-01-28  Rob Savoye  <address@hidden>
 
+       * doc/C/Makefile.am: Add pdf and info to SUFFIXES so the rules
+       actually work.
+
        * doc/omf.make (install-data-hook-omf): Only install if you are
        root, as this requires writing to system directories.
        * configure.ac: Link the doc/C/images directory to the build
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.3 gnash/doc/C/Makefile.am:1.4
--- gnash/doc/C/Makefile.am:1.3 Sat Jan 28 23:08:34 2006
+++ gnash/doc/C/Makefile.am     Sat Jan 28 23:14:46 2006
@@ -43,7 +43,7 @@
 info: gnash.info
 gnash.pdf gnash.html gnash.texi gnash.info gnash.1: gnash.xml
 
-SUFFIXES = .xml .html .texi .1
+SUFFIXES = .xml .html .texi .pdf .info .1
 
 .xml.html:
        @echo "Making HTML from XML source..."
@@ -75,32 +75,6 @@
          echo "You need to install the texinfo package"; \
        fi
        address@hidden(RM) gnash.texi
-#      mv gnash_manual_v*.info gnash.info
-
-builddocs:
-       @echo "Making HTML from XML source..."
-       @if test x"$(XSLTPROC)" != x; then \
-         $(XSLTPROC) --output gnash.html --nonet $(STYLESDIR)/html/docbook.xsl 
$(srcdir)/gnash.xml ; \
-       else \
-         echo "You need to install the xsltproc package"; \
-       fi
-       @echo "Making PDF from XML source..."
-       @if test x"$(FOP)" != x; then \
-         $(FOP) -xsl $(STYLESDIR)/fo/docbook.xsl -xml $(srcdir)/gnash.xml -pdf 
gnash.pdf; \
-       fi
-       @echo "Making Texinfo from XML source..."
-       @echo "Making Texinfo from XML source..."
-       @if test x"$(DB2X_XSLTPROC)" != x -a x"$(DB2X_TEXIXML)" != x; then \
-         $(DB2X_XSLTPROC) -s texi $(srcdir)/gnash.xml -o gnash.txml; \
-         $(DB2X_TEXIXML) gnash.txml; \
-       fi
-       address@hidden(RM) gnash.txml
-       @echo "Making INFO from Texinfo source..."
-       @if test x"$(MAKEINFO)" != x; then \
-         $(MAKEINFO) --force gnash.texi; \
-       else \
-         echo "You need to install the texinfo package"; \
-       fi
 
 dist-hook: app-dist-hook
 
@@ -127,8 +101,9 @@
 gnash.1: gnash-man.xml
        @echo "Making man pages from XML source..."
        @if test x"$(DB2X_XSLTPROC)" != x -a x"$(DB2X_MANXML)" != x; then \
-       db2x_xsltproc -s man $(srcdir)/gnash-man.xml -o gnash.mxml
-       db2x_manxml gnash.mxml
+         $(DB2X_XSLTPROC) -s man $(srcdir)/gnash-man.xml -o gnash.mxml;\
+         $(DB2X_MANXML) gnash.mxml;\
+       fi
        address@hidden(RM) gnash.mxml