do not put all <applet>_main() declarations

in busybox.h - this produces false dependencies

diff --git a/applets/Kbuild b/applets/Kbuild
index 2c6bee999a32b7850b8a37b20ed0ebf6527f3c9b..8999ff09701e32ae74f917a5f10c6eadeb0550e4 100644 (file)
--- a/applets/Kbuild
+++ b/applets/Kbuild
@@ -10,7 +10,7 @@ obj-y += busybox.o
 
 # Generated file needs additional love
 
-applets/applets.o: include/usage_compressed.h
+applets/applets.o: .config include/usage_compressed.h
 
 hostprogs-y += usage
 always := $(hostprogs-y)

diff --git a/applets/applets.c b/applets/applets.c
index 8a17cbf0b86c5060125e4b4e1d714097e1de10e4..557e9e5d81516252cea8b44e1744149de868ba9c 100644 (file)
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -12,8 +12,13 @@
  * Licensed under GPLv2 or later, see file License in this tarball for details.
  */
 
-#include "busybox.h"
 #include <assert.h>
+#include "busybox.h"
+
+#define PROTOTYPES
+#include "applets.h"
+#undef PROTOTYPES
+
 
 /* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
 #if ENABLE_STATIC && defined(__GLIBC__) && !defined(__UCLIBC__)

diff --git a/include/busybox.h b/include/busybox.h
index a1139b5aa8f0e57933615df38fc57be66a64e42d..76ff7b76aaf505270c7144e1857ea9970951d7cc 100644 (file)
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -31,19 +31,9 @@ struct BB_applet {
        __extension__ enum SUIDRoot need_suid:4;
 };
 
-/* From busybox.c and applet.c */
+/* Defined in busybox.c and applet.c */
 extern int busybox_main(int argc, char **argv);
 extern const struct BB_applet applets[];
 extern const unsigned short NUM_APPLETS;
 
-/* Automagically pull in all the applet function prototypes and
- * applet usage strings.  These are all of the form:
- *             extern int foo_main(int argc, char **argv);
- *             extern const char foo_usage[];
- * These are all autogenerated from the set of currently defined applets.
- */
-#define PROTOTYPES
-#include "applets.h"
-#undef PROTOTYPES
-
-#endif                                                 /* _BB_INTERNAL_H_ */
+#endif /* _BB_INTERNAL_H_ */