aboutsummaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2004-04-06 14:28:35 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2004-04-06 14:28:35 +0000
commit674b08a6b8ce0b3b1c26d9f326fb2e59bd8dc1e8 (patch)
tree033bb02dd76c0128a2fe839126ed692515d133ab /applets
parent7e496a71cfe54f192508427f9c8ea5be764952bd (diff)
downloadbusybox-674b08a6b8ce0b3b1c26d9f326fb2e59bd8dc1e8.tar.gz
busybox-674b08a6b8ce0b3b1c26d9f326fb2e59bd8dc1e8.tar.bz2
Fix it so usage is _always_ in sync with applets.c. Previously,
broken depends allowed these to get out of sync.
Diffstat (limited to 'applets')
-rw-r--r--applets/Makefile.in2
-rw-r--r--applets/applets.c11
-rw-r--r--applets/usage.c10
3 files changed, 12 insertions, 11 deletions
diff --git a/applets/Makefile.in b/applets/Makefile.in
index 79582e069..afd5cbeb9 100644
--- a/applets/Makefile.in
+++ b/applets/Makefile.in
@@ -22,7 +22,7 @@ ifndef $(APPLETS_DIR)
APPLETS_DIR:=$(TOPDIR)applets/
endif
-APPLET_SRC:=applets.c busybox.c usage.c
+APPLET_SRC:=applets.c busybox.c
APPLET_OBJ:= $(patsubst %.c,$(APPLETS_DIR)%.o, $(APPLET_SRC))
diff --git a/applets/applets.c b/applets/applets.c
index 7d8adfb65..d370e6a00 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -32,11 +32,22 @@
#include <assert.h>
#include "busybox.h"
+const char usage_messages[] =
+
+#define MAKE_USAGE
+#include "usage.h"
+
+#include "applets.h"
+
+;
+
+#undef MAKE_USAGE
#undef APPLET
#undef APPLET_NOUSAGE
#undef PROTOTYPES
#include "applets.h"
+
static struct BB_applet *applet_using;
/* The -1 arises because of the {0,NULL,0,-1} entry above. */
diff --git a/applets/usage.c b/applets/usage.c
deleted file mode 100644
index dfea1f96b..000000000
--- a/applets/usage.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "busybox.h"
-
-const char usage_messages[] =
-
-#define MAKE_USAGE
-#include "usage.h"
-
-#include "applets.h"
-
-;