From 6750d166883304b0e52f00739d3aecb69a03d329 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 5 Feb 2001 09:11:10 +0000 Subject: [PATCH] * automake.in (handle_texinfo): No longer hard code the clean targets. (texinfos.am): Include them. --- ChangeLog | 6 ++++++ Makefile.in | 20 +++++++++----------- automake.in | 20 ++++---------------- lib/am/texinfos.am | 24 +++++++++++++++++++++++- texinfos.am | 24 +++++++++++++++++++++++- 5 files changed, 65 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6156edb0..b9a815a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-02-05 Akim Demaille + + * automake.in (handle_texinfo): No longer hard code the clean + targets. + (texinfos.am): Include them. + 2001-02-05 Akim Demaille * Makefile.am (perl4-check): Remove, we now require Perl 5. diff --git a/Makefile.in b/Makefile.in index bb82edbb..8c4530b9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -307,12 +307,9 @@ mostlyclean-aminfo: automake.tps automake.vr automake.vrs automake.op automake.tr \ automake.cv automake.cn automake.cm automake.ov -clean-aminfo: - -distclean-aminfo: - maintainer-clean-aminfo: - cd $(srcdir) && for i in $(INFO_DEPS); do \ + cd $(srcdir) && \ + for i in $(INFO_DEPS); do \ rm -f $$i; \ if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ rm -f $$i-[0-9]*; \ @@ -616,12 +613,13 @@ install-exec-am install-exec-recursive install-info-am \ install-recursive install-strip installcheck installcheck-am \ installcheck-local installcheck-recursive installdirs installdirs-am \ installdirs-recursive maintainer-clean maintainer-clean-aminfo \ -maintainer-clean-generic maintainer-clean-recursive \ -maintainer-clean-tags maintainer-clean-vti mostlyclean \ -mostlyclean-aminfo mostlyclean-generic mostlyclean-recursive \ -mostlyclean-tags mostlyclean-vti tags tags-recursive uninstall \ -uninstall-am uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \ -uninstall-dist_scriptDATA uninstall-info uninstall-recursive +maintainer-clean-aminfo maintainer-clean-generic \ +maintainer-clean-recursive maintainer-clean-tags maintainer-clean-vti \ +mostlyclean mostlyclean-aminfo mostlyclean-aminfo mostlyclean-generic \ +mostlyclean-recursive mostlyclean-tags mostlyclean-vti tags \ +tags-recursive uninstall uninstall-am uninstall-binSCRIPTS \ +uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA uninstall-info \ +uninstall-recursive install-data-hook: diff --git a/automake.in b/automake.in index 1a6b4ef8..40a4606f 100755 --- a/automake.in +++ b/automake.in @@ -2386,26 +2386,14 @@ sub handle_texinfo $texinfodir = '$(srcdir)'; $need_texi_file = 1; } - $xform .= &transform ('TEXINFODIR' => $texinfodir); + $xform .= &transform ('TEXINFODIR' => $texinfodir, + 'TEXICLEAN' => &pretty_print_internal ("\t-rm -f", + "\t ", + @texi_cleans)); $output_rules .= &file_contents ('texinfos', $xform); push (@dist_targets, 'dist-info'); - # How to clean. The funny name is due to --cygnus influence; in - # Cygnus mode, `clean-info' is a target that users can use. - $output_rules .= "\nmostlyclean-aminfo:\n"; - &pretty_print_rule ("\t-rm -f", "\t ", @texi_cleans); - $output_rules .= ("\nclean-aminfo:\n\ndistclean-aminfo:\n\n" - . "maintainer-clean-aminfo:\n\t" - # Eww. But how else can we find all the output - # files from makeinfo? - . ($cygnus_mode ? '' : 'cd $(srcdir) && ') - . 'for i in $(INFO_DEPS); do' . " \\\n" - . "\t" . ' rm -f $$i;' . " \\\n" - . "\t" . ' if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then' . " \\\n" - . "\t" . ' rm -f $$i-[0-9]*;' . " \\\n" - . "\t" . ' fi;' . " \\\n" - . "\tdone\n"); &push_phony_cleaners ('aminfo'); if ($cygnus_mode) { diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 9414badb..583b3b5f 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000 +## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -209,3 +209,25 @@ CYGNUS if test -f $$base; then d=.; else d=$(srcdir); fi; \ done .PHONY: install-info-am uninstall-info + + +## How to clean. The funny name is due to --cygnus influence; in +## Cygnus mode, `clean-info' is a target that users can use. + +.PHONY: mostlyclean-aminfo +mostlyclean-aminfo: +@TEXICLEAN@ + +.PHONY: maintainer-clean-aminfo +maintainer-clean-aminfo: +## Eww. But how else can we find all the output files from makeinfo? +NOTCYGNUS cd $(srcdir) && \ + for i in $(INFO_DEPS); do \ + rm -f $$i; \ + if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ + rm -f $$i-[0-9]*; \ + fi; \ + done + +CYGNUS.PHONY: clean-info +CYGNUSclean-info: mostlyclean-aminfo diff --git a/texinfos.am b/texinfos.am index 9414badb..583b3b5f 100644 --- a/texinfos.am +++ b/texinfos.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000 +## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -209,3 +209,25 @@ CYGNUS if test -f $$base; then d=.; else d=$(srcdir); fi; \ done .PHONY: install-info-am uninstall-info + + +## How to clean. The funny name is due to --cygnus influence; in +## Cygnus mode, `clean-info' is a target that users can use. + +.PHONY: mostlyclean-aminfo +mostlyclean-aminfo: +@TEXICLEAN@ + +.PHONY: maintainer-clean-aminfo +maintainer-clean-aminfo: +## Eww. But how else can we find all the output files from makeinfo? +NOTCYGNUS cd $(srcdir) && \ + for i in $(INFO_DEPS); do \ + rm -f $$i; \ + if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ + rm -f $$i-[0-9]*; \ + fi; \ + done + +CYGNUS.PHONY: clean-info +CYGNUSclean-info: mostlyclean-aminfo -- 2.43.5