summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2004-04-09 08:24:22 +0000
committerJim Meyering <jim@meyering.net>2004-04-09 08:24:22 +0000
commitaf03f88c2ddf93bf73b05f67bd6cc174c0a849c1 (patch)
treea1a57475901b8e22d053d327fbcd0fede643feae
parent8a9c17bd26b32d66f58719e8021c341dd6cfcad4 (diff)
downloadcoreutils-af03f88c2ddf93bf73b05f67bd6cc174c0a849c1.tar.xz
(header_regexp): Add file-type.h.
(sc_system_h_headers): Don't look for sys2.h anymore.
-rw-r--r--Makefile.maint9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.maint b/Makefile.maint
index 44a93f9a7..198584c48 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -154,7 +154,7 @@ sc_changelog:
# with the strings from the two affected variables.
dd_c = $(srcdir)/src/dd.c
sc_dd_max_sym_length:
- len=$$( (sed -n '/conversions\[\] =$$/,/^};/p' $(dd_c); \
+ @len=$$( (sed -n '/conversions\[\] =$$/,/^};/p' $(dd_c);\
sed -n '/flags\[\] =$$/,/^};/p' $(dd_c) ) \
|sed -n '/"/s/^[^"]*"\([^"]*\)".*/\1/p' \
| wc --max-line-length); \
@@ -173,6 +173,7 @@ header_regexp = \
|errno\
|exitfail\
|fcntl\
+ |file-type\
|inttypes\
|limits\
|locale\
@@ -190,12 +191,12 @@ h_re := $(shell echo '$(header_regexp)'|tr -d ' ')
# Files in src/ should not include directly any of
# the headers already included via system.h.
# Get list of candidates with this:
-# grep -h include src/sys*.h|sed 's/.*include //'|sort -
+# grep -h include src/system.h|sed 's/.*include //'|sort -
sc_system_h_headers:
- @if test -f $(srcdir)/src/sys2.h; then \
+ @if test -f $(srcdir)/src/system.h; then \
( cvsu --list ) > /dev/null 2>&1 || : && \
grep -E '^# *include ["<]($(h_re))\.h[">]' \
- $$(cvsu --list src | grep -Ev 'sys(2|tem)\.h$$') \
+ $$(cvsu --list src | grep -Ev 'system\.h$$') \
&& { echo '$(ME): the above are already included via system.h'\
1>&2; exit 1; } || :; \
fi