* Makefile.am, doc/Makefile.am: Remove pdf targets, handled by

Automake 1.6c.
* Makefile.am (maintainer-clean-local): Remove.
(MAINTAINERCLEANFILES): Remove COPYING.

diff --git a/.cvsignore b/.cvsignore
index 058fc724eae6b69000b0945542349442cb52582e..1bd22761bf25820a678e4659a57b0a0d5804a8d8 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,9 +1,7 @@
 Makefile
-autoheader autoconf autom4te autoreconf autoscan autoupdate ifnames
 config.cache
 config.log
 config.status
-INSTALL.txt
 configure.scan
 autoconf-[0-9].*
 *.log log

diff --git a/ChangeLog b/ChangeLog
index 120973460ebfc904315e4c67053e85b1e47900e5..65c99ff52d7ee77e28dcaf36252c0d955497f545 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-04  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.am, doc/Makefile.am: Remove pdf targets, handled by
+       Automake 1.6c.
+       * Makefile.am (maintainer-clean-local): Remove.
+       (MAINTAINERCLEANFILES): Remove COPYING.
+
 2002-09-03  Paul Eggert  <eggert@twinsun.com>
 
        * doc/autoconf.texi (Configuration Commands): Remove obsolete

diff --git a/Makefile.am b/Makefile.am
index 94a4f0cbc911ecf7995179e3baca60b8ca17bcbd..67cf869b8ffcd4ae35155768c10677e258d6e176 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,16 +30,16 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
              BUGS \
              GNUmakefile Makefile.maint
 
-MAINTAINERCLEANFILES = COPYING INSTALL
+MAINTAINERCLEANFILES = INSTALL
 
 ## -------------------- ##
 ## Forwarding targets.  ##
 ## -------------------- ##
 
-html pdf:
+html:
        cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
 
-.PHONY: html pdf
+.PHONY: html
 
 
 ## --------- ##
@@ -52,9 +52,6 @@ INSTALL: $(top_srcdir)/doc/install.texi
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -o $(srcdir)/INSTALL \
          $(top_srcdir)/doc/install.texi
 
-maintainer-clean-local:
-       -rm -rf autom4te.cache
-
 ## maintainer-check ##
 maintainer-check: maintainer-check-tests
 maintainer-check-tests:

diff --git a/Makefile.in b/Makefile.in
index 285d90ac14f2850d804564c0d8e9efe62f972125..b054b6eea0343a8cb7f62cbb02a70ca1f4896d10 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -103,7 +103,7 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
              GNUmakefile Makefile.maint
 
 
-MAINTAINERCLEANFILES = COPYING INSTALL
+MAINTAINERCLEANFILES = INSTALL
 
 pkgdata_DATA = INSTALL
 AM_MAKEINFOFLAGS = --no-headers --no-validate --no-split
@@ -480,8 +480,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf autom4te.cache
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-       maintainer-clean-local
+maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
@@ -511,25 +510,21 @@ uninstall-info: uninstall-info-recursive
        install-recursive install-strip installcheck installcheck-am \
        installdirs installdirs-am installdirs-recursive \
        maintainer-clean maintainer-clean-generic \
-       maintainer-clean-local maintainer-clean-recursive mostlyclean \
-       mostlyclean-generic mostlyclean-recursive pdf pdf-am \
-       pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-       uninstall uninstall-am uninstall-info-am \
-       uninstall-info-recursive uninstall-pkgdataDATA \
-       uninstall-recursive
+       maintainer-clean-recursive mostlyclean mostlyclean-generic \
+       mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
+       ps-recursive tags tags-recursive uninstall uninstall-am \
+       uninstall-info-am uninstall-info-recursive \
+       uninstall-pkgdataDATA uninstall-recursive
 
 
-html pdf:
+html:
        cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
 
-.PHONY: html pdf
+.PHONY: html
 INSTALL: $(top_srcdir)/doc/install.texi
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -o $(srcdir)/INSTALL \
          $(top_srcdir)/doc/install.texi
 
-maintainer-clean-local:
-       -rm -rf autom4te.cache
-
 maintainer-check: maintainer-check-tests
 maintainer-check-tests:
        cd tests && make maintainer-check

diff --git a/bin/.cvsignore b/bin/.cvsignore
index 6120849a0fb90601ea07cbbc2ef8fd81e75c5098..4fc286e154a1ca1638f33c594af80513f6a12684 100644 (file)
--- a/bin/.cvsignore
+++ b/bin/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 autoheader autoconf autom4te autoreconf autoscan autoupdate ifnames
+autom4te.cache

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 446e2d823a5335d5a83db00fa1452570d0101df5..163bdf575801fb5fe3030e4befbcfa57b5ca411f 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in.
 
 ## Makefile for Autoconf.
-## Copyright 2000, 2001 Free Software Foundation, Inc.
+## Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -31,8 +31,7 @@ standards_TEXINFOS = make-stds.texi
 CLEANFILES = autoconf.acs  autoconf.cvs  autoconf.mss  autoconf.prs \
             autoconf.ats  autoconf.evs  autoconf.fns  autoconf.ovs \
              autoconf.tmp \
-            autoconf*.html standards*.html \
-            autoconf*.pdf standards*.pdf
+            autoconf*.html standards*.html
 
 
 ## ----------------------------- ##
@@ -48,12 +47,4 @@ standards_1.html: standards.texi make-stds.texi
        $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/standards.texi
 
 
-pdf: autoconf.pdf standards.pdf
-
-autoconf.pdf: autoconf.texi install.texi
-       $(TEXI2DVI) --pdf --batch $(srcdir)/autoconf.texi
-
-standards.pdf: standards.texi make-stds.texi
-       $(TEXI2DVI) --pdf --batch $(srcdir)/standards.texi
-
-.PHONY: html pdf
+.PHONY: html

diff --git a/doc/Makefile.in b/doc/Makefile.in
index da3ebee78ef0497f2b74e8fdaa476efde8953648..8258918aeb8aff32c50409fe3466d1e99639fa3b 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -103,8 +103,7 @@ standards_TEXINFOS = make-stds.texi
 CLEANFILES = autoconf.acs  autoconf.cvs  autoconf.mss  autoconf.prs \
             autoconf.ats  autoconf.evs  autoconf.fns  autoconf.ovs \
              autoconf.tmp \
-            autoconf*.html standards*.html \
-            autoconf*.pdf standards*.pdf
+            autoconf*.html standards*.html
 
 subdir = doc
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -145,6 +144,7 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        $(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
 autoconf.info: version.texi $(autoconf_TEXINFOS)
 autoconf.dvi: version.texi $(autoconf_TEXINFOS)
+autoconf.pdf: version.texi $(autoconf_TEXINFOS)
 version.texi:  stamp-vti
 stamp-vti: autoconf.texi $(top_srcdir)/configure.ac
        @(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \
@@ -166,6 +166,7 @@ maintainer-clean-vti:
        -rm -f stamp-vti version.texi
 standards.info: $(standards_TEXINFOS)
 standards.dvi: $(standards_TEXINFOS)
+standards.pdf: $(standards_TEXINFOS)
 TEXI2DVI = texi2dvi
 
 TEXI2PDF = $(TEXI2DVI) --pdf
@@ -375,15 +376,7 @@ autoconf_1.html: autoconf.texi install.texi
 standards_1.html: standards.texi make-stds.texi
        $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/standards.texi
 
-pdf: autoconf.pdf standards.pdf
-
-autoconf.pdf: autoconf.texi install.texi
-       $(TEXI2DVI) --pdf --batch $(srcdir)/autoconf.texi
-
-standards.pdf: standards.texi make-stds.texi
-       $(TEXI2DVI) --pdf --batch $(srcdir)/standards.texi
-
-.PHONY: html pdf
+.PHONY: html
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: