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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_8_2_rc1
Changes by:     Sandro Santilli <strk>  08/03/04 18:21:57

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

Log message:
        Remove generated dox on 'make clean' (not maintainer-clean).
        Drop references to gnashuser.info and gnashref.info
        (the official ones are gnash_user.info and gnash_ref.info).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.5711.2.53&r2=1.5711.2.54
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.48.2.5&r2=1.48.2.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5711.2.53
retrieving revision 1.5711.2.54
diff -u -b -r1.5711.2.53 -r1.5711.2.54
--- ChangeLog   4 Mar 2008 17:34:41 -0000       1.5711.2.53
+++ ChangeLog   4 Mar 2008 18:21:55 -0000       1.5711.2.54
@@ -1,5 +1,12 @@
 2008-03-04 Sandro Santilli <address@hidden>
 
+       * doc/C/Makefile.am: remove generated dox on 'make clean'
+         (not maintainer-clean). drop references to gnashuser.info
+         and gnashref.info (the official ones are gnash_user.info
+         and gnash_ref.info).
+
+2008-03-04 Sandro Santilli <address@hidden>
+
        * doc/C/Makefile.am: don't distribute a second copy of
          preformatted .info, .html and man files, all preformatted
          copies are already in the preformatted/ subdir.

Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.48.2.5
retrieving revision 1.48.2.6
diff -u -b -r1.48.2.5 -r1.48.2.6
--- doc/C/Makefile.am   4 Mar 2008 17:34:42 -0000       1.48.2.5
+++ doc/C/Makefile.am   4 Mar 2008 18:21:56 -0000       1.48.2.6
@@ -92,8 +92,8 @@
 
 all-local: info html man
 
-gnashuser.html gnashuser.pdf gnash_user.info gnashuser.info: gnashuser.xml 
$(USERMAN) $(COMMON)
-gnashref.html gnashref.pdf gnash_ref.info gnashref.info: gnashref.xml 
$(REFMAN) $(COMMON)
+gnashuser.html gnashuser.pdf gnash_user.info: gnashuser.xml $(USERMAN) 
$(COMMON)
+gnashref.html gnashref.pdf gnash_ref.info: gnashref.xml $(REFMAN) $(COMMON)
 
 # Convienience rules for developers of these manuals. By default
 # all output formats are built if the Docbook tools are installed
@@ -192,33 +192,22 @@
        fi
 endif
 
-gnash_user.info gnashuser.info: gnashuser.texi
-gnash_ref.info gnashref.info: gnashref.texi
+if DOCBOOK
+gnash_user.info: gnashuser.texi
+gnash_ref.info: gnashref.texi
 gnashuser.texi gnash_user.texi: gnashuser.xml
 gnashref.texi gnash_user.texi: gnashref.xml
-if ! DOCBOOK
+else
 gnash_user.info: gnashuser.xml
        @if test -d $(srcdir)/preformatted; then \
          echo "WARNING: Linking to preformatted version of $@, it could be out 
of date."; \
          $(LN_S) -f $(srcdir)/preformatted/gnash_user.info.in 
./gnash_user.info; \
        fi
-
-gnashuser.info: gnashuser.xml
-       @if test -d $(srcdir)/preformatted; then \
-         echo "WARNING: Linking to preformatted version of $@, it could be out 
of date."; \
-         $(LN_S) -f $(srcdir)/preformatted/gnash_user.info.in 
./gnashuser.info; \
-       fi
-
 gnash_ref.info: gnashref.xml
        @if test -d $(srcdir)/preformatted; then \
          echo "WARNING: Linking to preformatted version of $@, it could be out 
of date."; \
          $(LN_S) -f $(srcdir)/preformatted/gnash_ref.info.in ./gnash_ref.info; 
\
        fi
-gnashref.info: gnashref.xml
-       @if test -d $(srcdir)/preformatted; then \
-         echo "WARNING: Linking to preformatted version of $@, it could be out 
of date."; \
-         $(LN_S) -f $(srcdir)/preformatted/gnash_ref.info.in ./gnashref.info; \
-       fi
 gnashref.html: gnashref.xml
        @if test -d $(srcdir)/preformatted; then \
          echo "WARNING: Linking to preformatted version of $@, it could be out 
of date."; \
@@ -349,6 +338,10 @@
        -$(SCROLLUPDATE) -v 
 
 CLEANFILES = \
+        $(PDFS) \
+       $(MANS) \
+       $(INFOS) \
+        $(HTMLS) \
        gnash-C.omf.out \
        manpage.links  \
        manpage.refs  \
@@ -364,13 +357,6 @@
        gnashref.mxml \
        omf_timestamp
 
-MAINTAINERCLEANFILES = \
-        gnash.pdf \
-       $(MANS) \
-        gnash_user.info \
-        gnash_ref.info \
-        gnashuser.html \
-        gnashref.html
 
 # Always execute these targets as they have no real dependencies.
 .PHONY: images install-info-hook uninstall-info-hook install-html-hook 
uninstall-html-hook uninstall-data-hook install-data-hook