If you compare the .PHONY, we won one target: maintainer-clean-aminfo.
It seems that it's right, and was missing before.
There is something which sounds wrong in this patch: I have not
introduced the empty target clean-aminfo and distclean-aminfo, but
it's knowing what the forthcoming 24 does.
Akim
Index: ChangeLog
from Akim Demaille <[EMAIL PROTECTED]>
* automake.in (handle_texinfo): No longer hard code the clean
targets.
(texinfos.am): Include them.
Index: automake.in
--- automake.in Fri, 02 Feb 2001 07:28:15 +0100 akim (am/f/39_automake.i 1.29 755)
+++ automake.in Sun, 04 Feb 2001 00:46:27 +0100 akim (am/f/39_automake.i 1.29 755)
@@ -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)
{
Index: texinfos.am
--- texinfos.am Sun, 28 Jan 2001 15:51:12 +0100 akim (am/g/10_texinfos.a 1.2 644)
+++ texinfos.am Sun, 04 Feb 2001 00:41:19 +0100 akim (am/g/10_texinfos.a 1.2 644)
@@ -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 @@
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
Index: Makefile.in
--- Makefile.in Fri, 02 Feb 2001 07:25:57 +0100 akim (am/h/16_Makefile.i 1.4 644)
+++ Makefile.in Sun, 04 Feb 2001 00:47:34 +0100 akim (am/h/16_Makefile.i 1.4 644)
@@ -306,12 +306,9 @@
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]*; \
@@ -614,12 +611,13 @@
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: