kill: need not build kill.c when ash's job control is off

ash kill builtin depends on the job control config option.

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/procps/Kbuild.src b/procps/Kbuild.src
index 82f37f0df873e1e7f734e783deb8505700340de9..dedef8881f5d49a7fdaa46ea307a69049be3b8d3 100644 (file)
--- a/procps/Kbuild.src
+++ b/procps/Kbuild.src
@@ -8,8 +8,5 @@ lib-y:=
 
 INSERT
 
-lib-$(CONFIG_ASH) += kill.o  # used for built-in kill by ash
-lib-$(CONFIG_SH_IS_ASH) += kill.o  # used for built-in kill by ash
-lib-$(CONFIG_BASH_IS_ASH) += kill.o  # used for built-in kill by ash
-
+lib-$(CONFIG_ASH_JOB_CONTROL) += kill.o  # used for built-in kill by ash
 lib-$(CONFIG_HUSH_KILL) += kill.o  # used for built-in kill by hush

diff --git a/procps/kill.c b/procps/kill.c
index 579c8e53ca796094bfee9a91e9b197473bd4ab6e..7c0822542c64a7004618272486c2016812ad7c48 100644 (file)
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -285,8 +285,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
 
        /* Looks like they want to do a kill. Do that */
        while (arg) {
-#if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH \
- || ENABLE_HUSH_KILL
+#if ENABLE_ASH_JOB_CONTROL || ENABLE_HUSH_KILL
                /*
                 * We need to support shell's "hack formats" of
                 * " -PRGP_ID" (yes, with a leading space)