diff options
Diffstat (limited to 'applets')
-rw-r--r-- | applets/Makefile.in | 2 | ||||
-rw-r--r-- | applets/applets.c | 11 | ||||
-rw-r--r-- | applets/usage.c | 10 |
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) | |||
22 | APPLETS_DIR:=$(TOPDIR)applets/ | 22 | APPLETS_DIR:=$(TOPDIR)applets/ |
23 | endif | 23 | endif |
24 | 24 | ||
25 | APPLET_SRC:=applets.c busybox.c usage.c | 25 | APPLET_SRC:=applets.c busybox.c |
26 | APPLET_OBJ:= $(patsubst %.c,$(APPLETS_DIR)%.o, $(APPLET_SRC)) | 26 | APPLET_OBJ:= $(patsubst %.c,$(APPLETS_DIR)%.o, $(APPLET_SRC)) |
27 | 27 | ||
28 | 28 | ||
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 @@ | |||
32 | #include <assert.h> | 32 | #include <assert.h> |
33 | #include "busybox.h" | 33 | #include "busybox.h" |
34 | 34 | ||
35 | const char usage_messages[] = | ||
36 | |||
37 | #define MAKE_USAGE | ||
38 | #include "usage.h" | ||
39 | |||
40 | #include "applets.h" | ||
41 | |||
42 | ; | ||
43 | |||
44 | #undef MAKE_USAGE | ||
35 | #undef APPLET | 45 | #undef APPLET |
36 | #undef APPLET_NOUSAGE | 46 | #undef APPLET_NOUSAGE |
37 | #undef PROTOTYPES | 47 | #undef PROTOTYPES |
38 | #include "applets.h" | 48 | #include "applets.h" |
39 | 49 | ||
50 | |||
40 | static struct BB_applet *applet_using; | 51 | static struct BB_applet *applet_using; |
41 | 52 | ||
42 | /* The -1 arises because of the {0,NULL,0,-1} entry above. */ | 53 | /* 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 @@ | |||
1 | #include "busybox.h" | ||
2 | |||
3 | const char usage_messages[] = | ||
4 | |||
5 | #define MAKE_USAGE | ||
6 | #include "usage.h" | ||
7 | |||
8 | #include "applets.h" | ||
9 | |||
10 | ; | ||