diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-02-03 17:27:14 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-02-03 17:27:14 +0000 |
| commit | c7ba8b9d6c926231c1c191136b1ea0bc14b87771 (patch) | |
| tree | e769e525c40a77516dfbd90d320412fa1e73459f | |
| parent | 6a1829d90c04e9fa6f5a836d043105bd34b60ecf (diff) | |
| download | busybox-c7ba8b9d6c926231c1c191136b1ea0bc14b87771.tar.gz | |
do not put all <applet>_main() declarations
in busybox.h - this produces false dependencies
| -rw-r--r-- | applets/Kbuild | 2 | ||||
| -rw-r--r-- | applets/applets.c | 7 | ||||
| -rw-r--r-- | include/busybox.h | 14 |
3 files changed, 9 insertions, 14 deletions
diff --git a/applets/Kbuild b/applets/Kbuild index 2c6bee999..8999ff097 100644 --- 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 8a17cbf0b..557e9e5d8 100644 --- 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 a1139b5aa..76ff7b76a 100644 --- 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_ */ |