Stephane Billiart said:

the attached patch makes applet list in busybox.links
correctly include tr and watchdog.
Currently, they don't appear because they are prefixed
with ENABLE_ in include/applets.h

diff --git a/Makefile b/Makefile
index 6e0b7a322656b5e0e47755194ac079aa8c5335da..cc4cc274c57041a870416f126734b6d0ebf01494 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -215,7 +215,7 @@ busybox: .depend $(libraries-y)
        $(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group
        $(STRIPCMD) $@
 
-busybox.links: $(top_srcdir)/applets/busybox.mkll include/config.h $(top_srcdir)/include/applets.h
+busybox.links: $(top_srcdir)/applets/busybox.mkll include/bb_config.h $(top_srcdir)/include/applets.h
        - $(SHELL) $^ >$@
 
 install: $(top_srcdir)/applets/install.sh busybox busybox.links

diff --git a/applets/busybox.mkll b/applets/busybox.mkll
index 5b6677d03bdc921cdd038026dea28bc9cd503db0..b30ac8d92f6236ae2c3c700fca53e0c7285065a8 100755 (executable)
--- a/applets/busybox.mkll
+++ b/applets/busybox.mkll
@@ -10,7 +10,7 @@
 export LC_ALL=POSIX
 export LC_CTYPE=POSIX
 
-CONFIG_H=${1:-include/config.h}
+CONFIG_H=${1:-include/bb_config.h}
 APPLETS_H=${2:-include/applets.h}
 gcc -E -DMAKE_LINKS -include $CONFIG_H $APPLETS_H |
   awk '/^[ \t]*LINK/{