From: Akim Demaille Date: Wed, 4 Sep 2002 16:03:12 +0000 (+0000) Subject: * Makefile.am, doc/Makefile.am: Remove pdf targets, handled by X-Git-Tag: AUTOCONF-2.54~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea94a810c2f65ae9ea9a56be384a79a36a31978f;p=thirdparty%2Fautoconf.git * 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 058fc724e..1bd22761b 100644 --- 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 120973460..65c99ff52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-09-04 Akim Demaille + + * 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 * doc/autoconf.texi (Configuration Commands): Remove obsolete diff --git a/Makefile.am b/Makefile.am index 94a4f0cbc..67cf869b8 100644 --- 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 285d90ac1..b054b6eea 100644 --- 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 6120849a0..4fc286e15 100644 --- 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 446e2d823..163bdf575 100644 --- 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 da3ebee78..8258918ae 100644 --- 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: