summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-07-03 12:28:35 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-07-03 12:28:35 (GMT)
commit5c296de390b1329a6243d12a86ef9c4726ace22a (patch)
tree2dfcd3242a26e9631c391e6ad1b26e068cfe3e66
parent922f6f51dba8ba710cac0679635ed811b2139a53 (diff)
downloadbusybox-5c296de390b1329a6243d12a86ef9c4726ace22a.tar.gz
busybox-5c296de390b1329a6243d12a86ef9c4726ace22a.tar.bz2
fix compile breakage with "make -j"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--Makefile2
-rw-r--r--libbb/Kbuild.src2
-rw-r--r--libbb/appletlib.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9a82776..ef7c532 100644
--- a/Makefile
+++ b/Makefile
@@ -512,6 +512,8 @@ include $(srctree)/Makefile.flags
include/autoconf.h: .kconfig.d .config $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) | gen_build_files
$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
+include/usage.h: gen_build_files
+
else
# Dummy target needed, because used as prerequisite
include/autoconf.h: ;
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 29c136c..cb1f8e9 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -4,6 +4,8 @@
#
# Licensed under the GPL v2, see the file LICENSE in this tarball.
+libbb/appletlib.o: include/usage_compressed.h
+
lib-y:=
INSERT
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 58f1a94..6f058bc 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -65,7 +65,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
#if ENABLE_FEATURE_COMPRESS_USAGE
-static const char packed_usage[] = { PACKED_USAGE };
+static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
# include "unarchive.h"
static const char *unpack_usage_messages(void)
{