fix bit rot in scripts/Makefile.IMA #2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/applets/Kbuild.src b/applets/Kbuild.src
index 9b9808f..b612399 100644 (file)
--- a/applets/Kbuild.src
+++ b/applets/Kbuild.src
@@ -42,3 +42,6 @@ quiet_cmd_gen_applet_tables = GEN     include/applet_tables.h
 
 include/applet_tables.h: applets/applet_tables
        $(call cmd,gen_applet_tables)
+
+include/NUM_APPLETS.h: applets/applet_tables
+       $(call cmd,gen_applet_tables)

diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA
index fcb8e50..0eced29 100644 (file)
--- a/scripts/Makefile.IMA
+++ b/scripts/Makefile.IMA
@@ -174,7 +174,7 @@ lib-all-y += $(patsubst %,libbb/%,$(sort $(lib-y)))
 lib-y:=
 
 comma:=,
-busybox_unstripped.o: $(usage_stuff) include/applet_tables.h include/autoconf.h
+busybox_unstripped.o: $(usage_stuff) include/applet_tables.h include/NUM_APPLETS.h include/autoconf.h
        $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) \
                $(patsubst %,-Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS)) \
                -DGCC_COMBINE=1 \
@@ -200,14 +200,9 @@ busybox: busybox_unstripped.o
 include/autoconf.h: .config
        $(MAKE) -f $(srctree)/Makefile silentoldconfig
 
+# Override rules for host compile
 applets/usage: include/autoconf.h
-       $(HOSTCC) -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I$(srctree)/include -o applets/usage applets/usage.c
+       $(HOSTCC) -Wall -O2 -I$(srctree)/include -o applets/usage applets/usage.c
 
 applets/applet_tables: include/autoconf.h
-       $(HOSTCC) -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I$(srctree)/include -o applets/applet_tables applets/applet_tables.c
-
-include/usage_compressed.h: include/usage.h applets/usage
-       $(srctree)/applets/usage_compressed include/usage_compressed.h applets
-
-include/applet_tables.h: include/applets.h
-       applets/applet_tables include/applet_tables.h
+       $(HOSTCC) -Wall -O2 -I$(srctree)/include -o applets/applet_tables applets/applet_tables.c