emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not put all <applet>_main() declarations

Browse Source 
in busybox.h - this produces false dependencies
This commit is contained in:
Denis Vlasenko 2007-02-03 17:27:14 +00:00
parent 6a1829d90c
commit c7ba8b9d6c
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applets/Kbuild
View File

@ -10,7 +10,7 @@ obj-y += busybox.o
# Generated file needs additional love # Generated file needs additional love
applets/applets.o: include/usage_compressed.h applets/applets.o: .config include/usage_compressed.h
hostprogs-y += usage hostprogs-y += usage
always := $(hostprogs-y) always := $(hostprogs-y)

7
applets/applets.c
View File

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

12
include/busybox.h
View File

@ -31,19 +31,9 @@ struct BB_applet {
__extension__ enum SUIDRoot need_suid:4; __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 int busybox_main(int argc, char **argv);
extern const struct BB_applet applets[]; extern const struct BB_applet applets[];
extern const unsigned short NUM_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_ */