[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?
From: |
Jim Meyering |
Subject: |
Re: [PATCH 00/22] Towards a non-recursive build system for coreutils? |
Date: |
Thu, 30 Aug 2012 12:10:38 +0200 |
Stefano Lattarini wrote:
> On 08/30/2012 01:14 AM, Jim Meyering wrote:
>> Thanks for all the work.
>>
>> Would you please mail to me (or to the list) the concatenation of those
>> patches
Thanks again. I've begun looking at these changes, so here's
some preliminary feedback.
As expected, the build now seems faster.
I haven't yet measured it.
I've had to make a few changes:
- "make distcheck" failed due to a typo in man/local.mk.
I fixed that by s,dir/,man/, below.
- "make syntax-check" failed due to a long line and to a TAB
followed by 8 spaces. To address the long line, rather than
splitting the just-lengthened line, I preferred to factor out
this definition:
texi_files = $(srcdir)/doc/*.texi
diff --git a/doc/local.mk b/doc/local.mk
index 190db85..585faf0 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -60,26 +60,28 @@ syntax_checks = \
sc-lower-case-var \
sc-use-small-caps-NUL
+texi_files = $(srcdir)/doc/*.texi
+
.PHONY: $(syntax_checks) check-texinfo
# List words/regexps here that should not appear in the texinfo documentation.
check-texinfo: $(syntax_checks)
$(AM_V_GEN)fail=0; \
- grep '@url{' $(srcdir)/doc/*.texi && fail=1; \
- grep '\$$@"' $(srcdir)/doc/*.texi && fail=1; \
- grep -n '[^[:punct:]]@footnote' $(srcdir)/doc/*.texi && fail=1; \
- grep -n filename $(srcdir)/doc/*.texi \
+ grep '@url{' $(texi_files) && fail=1; \
+ grep '\$$@"' $(texi_files) && fail=1; \
+ grep -n '[^[:punct:]]@footnote' $(texi_files) && fail=1; \
+ grep -n filename $(texi_files) \
| $(EGREP) -v 'setfilename|[{]filename[}]' \
&& fail=1; \
exit $$fail
sc-avoid-builtin:
- $(AM_V_GEN)$(EGREP) -i '$(_W)builtins?$(W_)' $(srcdir)/doc/*.texi \
+ $(AM_V_GEN)$(EGREP) -i '$(_W)builtins?$(W_)' $(texi_files) \
&& exit 1 || :
sc-avoid-path:
$(AM_V_GEN)fail=0; \
- $(EGREP) -i '$(_W)path(name)?s?$(W_)' $(srcdir)/doc/*.texi \
+ $(EGREP) -i '$(_W)path(name)?s?$(W_)' $(texi_files) \
| $(EGREP) -v \
'PATH=|path search|search path|@vindex PATH$$|@env[{]PATH[}]' \
&& fail=1; \
@@ -87,28 +89,28 @@ sc-avoid-path:
# Use "time zone", not "timezone".
sc-avoid-timezone:
- $(AM_V_GEN)$(EGREP) timezone $(srcdir)/doc/*.texi && exit 1 || :
+ $(AM_V_GEN)$(EGREP) timezone $(texi_files) && exit 1 || :
# Check for insufficient exponent grouping, e.g.,
# @math{2^64} should be @math{2^{64}}.
sc-exponent-grouping:
- $(AM_V_GEN)$(EGREP) '\{.*\^[0-9][0-9]' $(srcdir)/doc/*.texi && exit 1
|| :
+ $(AM_V_GEN)$(EGREP) '\{.*\^[0-9][0-9]' $(texi_files) && exit 1 || :
# E.g., use @sc{nul}, not NUL.
sc-use-small-caps-NUL:
- $(AM_V_GEN)$(EGREP) '$(_W)NUL$(W_)' $(srcdir)/doc/*.texi && exit 1 || :
+ $(AM_V_GEN)$(EGREP) '$(_W)NUL$(W_)' $(texi_files) && exit 1 || :
# Say I/O, not IO.
sc-avoid-io:
- $(AM_V_GEN)$(EGREP) '$(_W)IO$(W_)' $(srcdir)/doc/*.texi && exit 1 || :
+ $(AM_V_GEN)$(EGREP) '$(_W)IO$(W_)' $(texi_files) && exit 1 || :
# I prefer nonzero over non-zero.
sc-avoid-non-zero:
- $(AM_V_GEN)$(EGREP) non-zero $(srcdir)/doc/*.texi && exit 1 || :
+ $(AM_V_GEN)$(EGREP) non-zero $(texi_files) && exit 1 || :
# Use "zeros", not "zeroes" (nothing wrong with "zeroes"; just be consistent).
sc-avoid-zeroes:
- $(AM_V_GEN)$(EGREP) -i '$(_W)zeroes$(W_)' $(srcdir)/doc/*.texi \
+ $(AM_V_GEN)$(EGREP) -i '$(_W)zeroes$(W_)' $(texi_files) \
&& exit 1 || :
# The quantity inside @var{...} should not contain upper case letters.
@@ -124,6 +126,6 @@ find_upper_case_var = \
END {$$m and (warn "$@: do not use upper case in \@var{...}\n"), exit 1}'
sc-lower-case-var:
$(AM_V_GEN)$(PERL) -e 1 || { echo $@: skipping test; exit 0; }; \
- $(PERL) -lne $(find_upper_case_var) $(srcdir)/doc/*.texi
+ $(PERL) -lne $(find_upper_case_var) $(texi_files)
check-local: check-texinfo
diff --git a/man/local.mk b/man/local.mk
index 25385eb..d42c982 100644
--- a/man/local.mk
+++ b/man/local.mk
@@ -30,8 +30,8 @@ MAINTAINERCLEANFILES += $(dist_man1_MANS)
# use GNU make when doing so), it's not big deal if this won't work with
# some dumber make implementation.
EXTRA_DIST += \
- $(NO_INSTALL_PROGS_DEFAULT:%=dir/%.x) \
- $(NO_INSTALL_PROGS_DEFAULT:%=dir/%.1)
+ $(NO_INSTALL_PROGS_DEFAULT:%=man/%.x) \
+ $(NO_INSTALL_PROGS_DEFAULT:%=man/%.1)
# Depend on this to get version number changes.
mandep = .version
@@ -163,7 +163,7 @@ $(MAN): $(top_srcdir)/src/system.h
case $$name in \
install) prog='ginstall';; \
test) prog='[';; \
- *) prog=$$name;; \
+ *) prog=$$name;; \
esac; \
## Note the use of $$t/$*, rather than just '$*' as in other packages.
## That is necessary to avoid failures for programs that are also shell
- [PATCH 18/22] maint: move man-related syntax checks in cfg.mk, (continued)
- [PATCH 18/22] maint: move man-related syntax checks in cfg.mk, Stefano Lattarini, 2012/08/29
- [PATCH 20/22] maint: adjust syntax check 'sc_option_desc_uppercase', Stefano Lattarini, 2012/08/29
- [PATCH 19/22] maint: adjust syntax check 'check-x-vs-1', Stefano Lattarini, 2012/08/29
- [PATCH 17/22] build: don't use recursive make to build the 'man' subdirectory, Stefano Lattarini, 2012/08/29
- [PATCH 22/22] maint: update gitignore entries, Stefano Lattarini, 2012/08/29
- [PATCH 21/22] build: remove redundant indirection with variable '$(doc_srcdir)', Stefano Lattarini, 2012/08/29
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Jim Meyering, 2012/08/29
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Stefano Lattarini, 2012/08/30
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?,
Jim Meyering <=
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Stefano Lattarini, 2012/08/30
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Jim Meyering, 2012/08/30
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Stefano Lattarini, 2012/08/30
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Jim Meyering, 2012/08/30
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Stefano Lattarini, 2012/08/30
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Bob Proulx, 2012/08/31
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Stefano Lattarini, 2012/08/31
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Jim Meyering, 2012/08/31
- Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Stefano Lattarini, 2012/08/31
Re: [PATCH 00/22] Towards a non-recursive build system for coreutils?, Stefano Lattarini, 2012/08/30