aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2006-10-04 05:15:32 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:55:14 -0400
commit18e39913d41ca4d63e9e94a2ad25b5ea31caaa7f (patch)
tree7ebb8f57bc736172e92f573c26d1c933e5347d99
parent585b7747d63e3a5f65628d21c1745edd926d7897 (diff)
[PATCH] Fix spurious error on TAGS target when missing defconfig
Not all architectures have a file named 'defconfig' (e.g. powerpc). However the make TAGS and make tags targets search such files for tags, causing an error message when they don't exist. This patch addresses the problem by instructing xargs not to run the tags program if there are no matching files. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4c6c5e32ef96..adb2c748e105 100644
--- a/Makefile
+++ b/Makefile
@@ -1321,7 +1321,7 @@ define xtags
1321 --langdef=kconfig \ 1321 --langdef=kconfig \
1322 --language-force=kconfig \ 1322 --language-force=kconfig \
1323 --regex-kconfig='/^[[:blank:]]*config[[:blank:]]+([[:alnum:]_]+)/\1/'; \ 1323 --regex-kconfig='/^[[:blank:]]*config[[:blank:]]+([[:alnum:]_]+)/\1/'; \
1324 $(all-defconfigs) | xargs $1 -a \ 1324 $(all-defconfigs) | xargs -r $1 -a \
1325 --langdef=dotconfig \ 1325 --langdef=dotconfig \
1326 --language-force=dotconfig \ 1326 --language-force=dotconfig \
1327 --regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'; \ 1327 --regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'; \
@@ -1329,7 +1329,7 @@ define xtags
1329 $(all-sources) | xargs $1 -a; \ 1329 $(all-sources) | xargs $1 -a; \
1330 $(all-kconfigs) | xargs $1 -a \ 1330 $(all-kconfigs) | xargs $1 -a \
1331 --regex='/^[ \t]*config[ \t]+\([a-zA-Z0-9_]+\)/\1/'; \ 1331 --regex='/^[ \t]*config[ \t]+\([a-zA-Z0-9_]+\)/\1/'; \
1332 $(all-defconfigs) | xargs $1 -a \ 1332 $(all-defconfigs) | xargs -r $1 -a \
1333 --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \ 1333 --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
1334 else \ 1334 else \
1335 $(all-sources) | xargs $1 -a; \ 1335 $(all-sources) | xargs $1 -a; \