svn commit: trunk/busybox: applets include

[vda at busybox.net]

Author: vda
Date: 2007-02-03 09:27:14 -0800 (Sat, 03 Feb 2007)
New Revision: 17739

Log:
do not put all <applet>_main() declarations
in busybox.h - this produces false dependencies


Modified:
   trunk/busybox/applets/Kbuild
   trunk/busybox/applets/applets.c
   trunk/busybox/include/busybox.h


Changeset:
Modified: trunk/busybox/applets/Kbuild
===================================================================
--- trunk/busybox/applets/Kbuild	2007-02-03 12:52:25 UTC (rev 17738)
+++ trunk/busybox/applets/Kbuild	2007-02-03 17:27:14 UTC (rev 17739)
@@ -10,7 +10,7 @@
 
 # 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)

Modified: trunk/busybox/applets/applets.c
===================================================================
--- trunk/busybox/applets/applets.c	2007-02-03 12:52:25 UTC (rev 17738)
+++ trunk/busybox/applets/applets.c	2007-02-03 17:27:14 UTC (rev 17739)
@@ -12,9 +12,14 @@
  * Licensed under GPLv2 or later, see file License in this tarball for details.
  */
 
+#include <assert.h>
 #include "busybox.h"
-#include <assert.h>
 
+#define PROTOTYPES
+#include "applets.h"
+#undef PROTOTYPES
+
+
 /* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
 #if ENABLE_STATIC && defined(__GLIBC__) && !defined(__UCLIBC__)
 #warning Static linking against glibc produces buggy executables

Modified: trunk/busybox/include/busybox.h
===================================================================
--- trunk/busybox/include/busybox.h	2007-02-03 12:52:25 UTC (rev 17738)
+++ trunk/busybox/include/busybox.h	2007-02-03 17:27:14 UTC (rev 17739)
@@ -31,19 +31,9 @@
 	__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_ */