Fix it so usage is _always_ in sync with applets.c. Previously,

broken depends allowed these to get out of sync.

diff --git a/Makefile b/Makefile
index 99c1ced0932f33e2fa3d1d090d93d3cab3d2c53b..7a8337003f7c7e6030e99d270f8c0aeed075067a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -141,7 +141,6 @@ scripts/split-include: scripts/split-include.c
                `find . -name \*.c -print` >> .depend;
        scripts/mkdep -I include -- \
                `find . -name \*.h -print` >> .hdepend;
-       $(MAKE) $(patsubst %,_sfdep_%,$(DIRS)) _FASTDEP_ALL_SUB_DIRS="$(DIRS)" ;
 
 depend dep: include/config.h .depend
 

diff --git a/Rules.mak b/Rules.mak
index 5e0a5e672208acdedd4da3c5f87b47ee6e2b66e1..4a1a1bd88c3ea3bb9fbb5a5130668cf8622fca24 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -192,17 +192,6 @@ CFLAGS += $(CFLAGS_EXTRA)
 %.o: %.c
        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 
-ifdef _FASTDEP_ALL_SUB_DIRS
-fastdep: dummy
-       $(TOPDIR)scripts/mkdep $(CFLAGS) $(EXTRA_CFLAGS_nostdinc) -- $(wildcard *.[chS]) > .depend
-ifdef ALL_SUB_DIRS
-       $(MAKE) $(patsubst %,_sfdep_%,$(ALL_SUB_DIRS)) _FASTDEP_ALL_SUB_DIRS="$(ALL_SUB_DIRS)"
-endif
-
-$(patsubst %,_sfdep_%,$(_FASTDEP_ALL_SUB_DIRS)):
-       $(MAKE) -C $(patsubst _sfdep_%,%,$@) fastdep
-endif
-
 .PHONY: dummy
 
 

diff --git a/applets/Makefile.in b/applets/Makefile.in
index 79582e0697390f9cda6d12a7625c4f4b17c7c394..afd5cbeb9dc9901be5495035bbb14e2e68ed7e83 100644 (file)
--- 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 7d8adfb659cd0c20b1c786a46415f67d03d58973..d370e6a0065b33dc699261ff10d8ef83480a13e7 100644 (file)
--- 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 (file)
index dfea1f9..0000000
--- 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"
-
-;