diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-03-06 23:48:24 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-03-06 23:48:24 +0100 |
commit | bff5f3f2b4c568aa516ee3ec9201c887c0f1eca4 (patch) | |
tree | c6579a634d029811024282e305ac5b4b9d5dd91d | |
parent | 726ebbaa9f1cae426b5f2a4bddbe0a88c81d754e (diff) | |
download | busybox-w32-bff5f3f2b4c568aa516ee3ec9201c887c0f1eca4.tar.gz busybox-w32-bff5f3f2b4c568aa516ee3ec9201c887c0f1eca4.tar.bz2 busybox-w32-bff5f3f2b4c568aa516ee3ec9201c887c0f1eca4.zip |
fix bit rot in scripts/Makefile.IMA #2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | applets/Kbuild.src | 3 | ||||
-rw-r--r-- | scripts/Makefile.IMA | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/applets/Kbuild.src b/applets/Kbuild.src index 9b9808f25..b61239948 100644 --- a/applets/Kbuild.src +++ b/applets/Kbuild.src | |||
@@ -42,3 +42,6 @@ quiet_cmd_gen_applet_tables = GEN include/applet_tables.h | |||
42 | 42 | ||
43 | include/applet_tables.h: applets/applet_tables | 43 | include/applet_tables.h: applets/applet_tables |
44 | $(call cmd,gen_applet_tables) | 44 | $(call cmd,gen_applet_tables) |
45 | |||
46 | include/NUM_APPLETS.h: applets/applet_tables | ||
47 | $(call cmd,gen_applet_tables) | ||
diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA index fcb8e5049..0eced2982 100644 --- a/scripts/Makefile.IMA +++ b/scripts/Makefile.IMA | |||
@@ -174,7 +174,7 @@ lib-all-y += $(patsubst %,libbb/%,$(sort $(lib-y))) | |||
174 | lib-y:= | 174 | lib-y:= |
175 | 175 | ||
176 | comma:=, | 176 | comma:=, |
177 | busybox_unstripped.o: $(usage_stuff) include/applet_tables.h include/autoconf.h | 177 | busybox_unstripped.o: $(usage_stuff) include/applet_tables.h include/NUM_APPLETS.h include/autoconf.h |
178 | $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) \ | 178 | $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) \ |
179 | $(patsubst %,-Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS)) \ | 179 | $(patsubst %,-Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS)) \ |
180 | -DGCC_COMBINE=1 \ | 180 | -DGCC_COMBINE=1 \ |
@@ -200,14 +200,9 @@ busybox: busybox_unstripped.o | |||
200 | include/autoconf.h: .config | 200 | include/autoconf.h: .config |
201 | $(MAKE) -f $(srctree)/Makefile silentoldconfig | 201 | $(MAKE) -f $(srctree)/Makefile silentoldconfig |
202 | 202 | ||
203 | # Override rules for host compile | ||
203 | applets/usage: include/autoconf.h | 204 | applets/usage: include/autoconf.h |
204 | $(HOSTCC) -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I$(srctree)/include -o applets/usage applets/usage.c | 205 | $(HOSTCC) -Wall -O2 -I$(srctree)/include -o applets/usage applets/usage.c |
205 | 206 | ||
206 | applets/applet_tables: include/autoconf.h | 207 | applets/applet_tables: include/autoconf.h |
207 | $(HOSTCC) -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I$(srctree)/include -o applets/applet_tables applets/applet_tables.c | 208 | $(HOSTCC) -Wall -O2 -I$(srctree)/include -o applets/applet_tables applets/applet_tables.c |
208 | |||
209 | include/usage_compressed.h: include/usage.h applets/usage | ||
210 | $(srctree)/applets/usage_compressed include/usage_compressed.h applets | ||
211 | |||
212 | include/applet_tables.h: include/applets.h | ||
213 | applets/applet_tables include/applet_tables.h | ||