move usage_compressed.h generation into applets/

diff --git a/applets/Kbuild b/applets/Kbuild
index 9bb4b629217c417db1a88ccb63419bd706225736..c95c09d972f40bfe9b830ae61196fbe2c66c9f22 100644 (file)
--- a/applets/Kbuild
+++ b/applets/Kbuild
@@ -12,7 +12,10 @@ obj-y        += busybox.o
 
 applets/applets.o: include/usage_compressed.h
 
-include/usage_compressed.h: $(srctree)/include/usage.h
-       @$(MAKE) $(build)=scripts
+hostprogs-y += usage
+always := $(hostprogs-y)
+HOSTCFLAGS_usage.o = -I$(srctree)/include
+
+include/usage_compressed.h: $(srctree)/include/usage.h applets/usage
        @echo '  GEN     include/usage_compressed.h'
-       @$(srctree)/scripts/usage_compressed include/usage_compressed.h scripts
+       @$(srctree)/applets/usage_compressed include/usage_compressed.h applets

diff --git a/applets/usage.c b/applets/usage.c
new file mode 100644 (file)
index 0000000..d888fa9
--- /dev/null
+++ b/applets/usage.c
@@ -0,0 +1,17 @@
+/* vi: set sw=4 ts=4: */
+#include <unistd.h>
+
+#include "../include/autoconf.h"
+#include "../include/busybox.h"
+
+static const char usage_messages[] =
+#define MAKE_USAGE
+#include "usage.h"
+#include "applets.h"
+;
+
+int main(void)
+{
+       write(1, usage_messages, sizeof(usage_messages));
+       return 0;
+}

diff --git a/applets/usage_compressed b/applets/usage_compressed
new file mode 100755 (executable)
index 0000000..ab164aa
--- /dev/null
+++ b/applets/usage_compressed
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+target="$1"
+loc="$2"
+
+test "$target" || exit 1
+test "$loc" || loc=.
+test -x "$loc/usage" || exit 1
+test "$SED" || SED=sed
+
+sz=`"$loc/usage" | wc -c` || exit 1
+
+exec >"$target"
+
+echo 'static const char packed_usage[] = '
+"$loc/usage" | bzip2 -1 | od -v -t x1 \
+| $SED -e 's/^[^ ]*//' -e 's/ \(..\)/\\x\1/g' -e 's/^\(.*\)$/"\1"/'
+echo ';'
+echo '#define SIZEOF_usage_messages' `expr 0 + $sz`

diff --git a/scripts/Kbuild b/scripts/Kbuild
index 80836cfb5885ebfa706b4dc81dc7d1e199516177..83b423253e3ec03ee371ee9d997a2946a1fa9269 100644 (file)
--- a/scripts/Kbuild
+++ b/scripts/Kbuild
@@ -3,11 +3,5 @@
 # the kernel for the build process.
 # ---------------------------------------------------------------------------
 
-hostprogs-y += usage
-
-always := $(hostprogs-y)
-
 # Let clean descend into subdirs
 subdir- += basic kconfig
-
-HOSTCFLAGS_usage.o = -I$(srctree)/include

diff --git a/scripts/usage.c b/scripts/usage.c
deleted file mode 100644 (file)
index d888fa9..0000000
--- a/scripts/usage.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* vi: set sw=4 ts=4: */
-#include <unistd.h>
-
-#include "../include/autoconf.h"
-#include "../include/busybox.h"
-
-static const char usage_messages[] =
-#define MAKE_USAGE
-#include "usage.h"
-#include "applets.h"
-;
-
-int main(void)
-{
-       write(1, usage_messages, sizeof(usage_messages));
-       return 0;
-}

diff --git a/scripts/usage_compressed b/scripts/usage_compressed
deleted file mode 100755 (executable)
index ab164aa..0000000
--- a/scripts/usage_compressed
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-target="$1"
-loc="$2"
-
-test "$target" || exit 1
-test "$loc" || loc=.
-test -x "$loc/usage" || exit 1
-test "$SED" || SED=sed
-
-sz=`"$loc/usage" | wc -c` || exit 1
-
-exec >"$target"
-
-echo 'static const char packed_usage[] = '
-"$loc/usage" | bzip2 -1 | od -v -t x1 \
-| $SED -e 's/^[^ ]*//' -e 's/ \(..\)/\\x\1/g' -e 's/^\(.*\)$/"\1"/'
-echo ';'
-echo '#define SIZEOF_usage_messages' `expr 0 + $sz`