diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-03 14:28:35 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-03 14:28:35 +0200 |
commit | 5c296de390b1329a6243d12a86ef9c4726ace22a (patch) | |
tree | 2dfcd3242a26e9631c391e6ad1b26e068cfe3e66 | |
parent | 922f6f51dba8ba710cac0679635ed811b2139a53 (diff) | |
download | busybox-w32-5c296de390b1329a6243d12a86ef9c4726ace22a.tar.gz busybox-w32-5c296de390b1329a6243d12a86ef9c4726ace22a.tar.bz2 busybox-w32-5c296de390b1329a6243d12a86ef9c4726ace22a.zip |
fix compile breakage with "make -j"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | libbb/Kbuild.src | 2 | ||||
-rw-r--r-- | libbb/appletlib.c | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -512,6 +512,8 @@ include $(srctree)/Makefile.flags | |||
512 | include/autoconf.h: .kconfig.d .config $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) | gen_build_files | 512 | include/autoconf.h: .kconfig.d .config $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) | gen_build_files |
513 | $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig | 513 | $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig |
514 | 514 | ||
515 | include/usage.h: gen_build_files | ||
516 | |||
515 | else | 517 | else |
516 | # Dummy target needed, because used as prerequisite | 518 | # Dummy target needed, because used as prerequisite |
517 | include/autoconf.h: ; | 519 | include/autoconf.h: ; |
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index 29c136ccb..cb1f8e954 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
@@ -4,6 +4,8 @@ | |||
4 | # | 4 | # |
5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. | 5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. |
6 | 6 | ||
7 | libbb/appletlib.o: include/usage_compressed.h | ||
8 | |||
7 | lib-y:= | 9 | lib-y:= |
8 | 10 | ||
9 | INSERT | 11 | INSERT |
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 58f1a9490..6f058bcc8 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
@@ -65,7 +65,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE; | |||
65 | 65 | ||
66 | #if ENABLE_FEATURE_COMPRESS_USAGE | 66 | #if ENABLE_FEATURE_COMPRESS_USAGE |
67 | 67 | ||
68 | static const char packed_usage[] = { PACKED_USAGE }; | 68 | static const char packed_usage[] ALIGN1 = { PACKED_USAGE }; |
69 | # include "unarchive.h" | 69 | # include "unarchive.h" |
70 | static const char *unpack_usage_messages(void) | 70 | static const char *unpack_usage_messages(void) |
71 | { | 71 | { |