summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-03-06 22:48:24 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-03-06 22:48:24 (GMT)
commitbff5f3f2b4c568aa516ee3ec9201c887c0f1eca4 (patch)
treec6579a634d029811024282e305ac5b4b9d5dd91d
parent726ebbaa9f1cae426b5f2a4bddbe0a88c81d754e (diff)
downloadbusybox-bff5f3f2b4c568aa516ee3ec9201c887c0f1eca4.tar.gz
busybox-bff5f3f2b4c568aa516ee3ec9201c887c0f1eca4.tar.bz2
fix bit rot in scripts/Makefile.IMA #2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--applets/Kbuild.src3
-rw-r--r--scripts/Makefile.IMA13
2 files changed, 7 insertions, 9 deletions
diff --git a/applets/Kbuild.src b/applets/Kbuild.src
index 9b9808f..b612399 100644
--- 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
--- 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