[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [improved] Fix building autoconf.1 [trivial]
From: |
Noah Misch |
Subject: |
Re: [improved] Fix building autoconf.1 [trivial] |
Date: |
Fri, 10 Dec 2004 11:05:31 -0800 |
User-agent: |
Mutt/1.5.6i |
On Fri, Dec 10, 2004 at 01:18:37PM +0100, Stepan Kasal wrote:
> The man files are newer than autoconf.as, so they won't get regenerated, yet
> they are wrong--extracted from an obsolete version of the script.
Sure enough.
> Another comment: why are the *.x files listed in the dependences? I think
> that it is enough that the .x suffix is in the pattern rule. Thus I removed
> them.
Agreed.
> diff -u -r1.18 Makefile.am
> --- man/Makefile.am 10 Dec 2004 05:00:01 -0000 1.18
> +++ man/Makefile.am 10 Dec 2004 12:14:42 -0000
> @@ -18,31 +18,43 @@
> ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
> ## 02111-1307, USA.
>
> -dist_man_MANS = autoconf.1 autoreconf.1 autoheader.1 autoupdate.1 ifnames.1 \
> -autoscan.1 autom4te.1 config.guess.1 config.sub.1
> +dist_man_MANS = autoconf.1 autoheader.1 autom4te.1 autoreconf.1 autoscan.1 \
> +autoupdate.1 ifnames.1 config.guess.1 config.sub.1
>
> -man_aux = autoconf.x autoreconf.x autoheader.x autoupdate.x ifnames.x \
> -autoscan.x autom4te.x config.guess.x config.sub.x
> +man_aux = autoconf.x autoheader.x autom4te.x autoreconf.x autoscan.x \
> +autoupdate.x ifnames.x config.guess.x config.sub.x
Is the new order significant? If so, a comment would be helpful.
> -EXTRA_DIST = $(man_aux) common.x
> +man_stamps = autoconf.stamp autoheader.stamp autom4te.stamp \
> +autoreconf.stamp autoscan.stamp autoupdate.stamp ifnames.stamp \
> +config.guess.stamp config.sub.stamp
There is (properly) no config.guess.stamp or config.sub.stamp.
> +
> +EXTRA_DIST = $(man_aux) common.x $(man_stamps)
Using `EXTRA_DIST = $(dist_man_MANS:.1=.x) common.x $(man_stamps)' and removing
man_aux would be nice. Do you know how portable that is? POSIX does define it.
(This is orthogonal to your patch.)
> MAINTAINERCLEANFILES = $(dist_man_MANS)
>
> # Depend on configure.ac to get version number changes.
> common_dep = $(top_srcdir)/configure.ac $(srcdir)/common.x
> binsrcdir = $(top_srcdir)/bin
> -autoconf.1: $(common_dep) $(srcdir)/autoconf.x $(binsrcdir)/autoconf.as
> -autoheader.1: $(common_dep) $(srcdir)/autoheader.x $(binsrcdir)/autoheader.in
> -autom4te.1: $(common_dep) $(srcdir)/autom4te.x $(binsrcdir)/autom4te.in
> -autoreconf.1: $(common_dep) $(srcdir)/autoreconf.x $(binsrcdir)/autoreconf.in
> -autoscan.1: $(common_dep) $(srcdir)/autoscan.x $(binsrcdir)/autoscan.in
> -autoupdate.1: $(common_dep) $(srcdir)/autoupdate.x $(binsrcdir)/autoupdate.in
> -ifnames.1: $(common_dep) $(srcdir)/ifnames.x $(binsrcdir)/ifnames.in
> +autoconf.1: $(common_dep) autoconf.stamp
> +autoheader.1: $(common_dep) autoheader.stamp
> +autom4te.1: $(common_dep) autom4te.stamp
> +autoreconf.1: $(common_dep) autoreconf.stamp
> +autoscan.1: $(common_dep) autoscan.stamp
> +autoupdate.1: $(common_dep) autoupdate.stamp
> +ifnames.1: $(common_dep) ifnames.stamp
> +
> +autoconf.stamp: $(binsrcdir)/autoconf.as
> +autoheader.stamp: $(binsrcdir)/autoheader.in
> +autom4te.stamp: $(binsrcdir)/autom4te.in
> +autoreconf.stamp: $(binsrcdir)/autoreconf.in
> +autoscan.stamp: $(binsrcdir)/autoscan.in
> +autoupdate.stamp: $(binsrcdir)/autoupdate.in
> +ifnames.stamp: $(binsrcdir)/ifnames.in
The stamps, not the man pages, should depend on $(common_dep). If you unpack a
clean distribution, touch common.x, and build, the scripts in tests/ will not
yet exist.
I think your patch is a substantial improvement. With config.guess.stamp and
config.sub.stamp removed from man_stamps, `make distcheck' passes here.