diff options
author | Rob Landley <rob@landley.net> | 2005-12-16 06:12:46 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2005-12-16 06:12:46 +0000 |
commit | a930bd333270166fd80a919deb36bfb40eb97f8c (patch) | |
tree | 1a656a20ff1b490000dcd935f0d1dde26ab30085 | |
parent | ddc280ec437d61a6d0a906e414e475e05e877606 (diff) | |
download | busybox-w32-a930bd333270166fd80a919deb36bfb40eb97f8c.tar.gz busybox-w32-a930bd333270166fd80a919deb36bfb40eb97f8c.tar.bz2 busybox-w32-a930bd333270166fd80a919deb36bfb40eb97f8c.zip |
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
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | applets/busybox.mkll | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -215,7 +215,7 @@ busybox: .depend $(libraries-y) | |||
215 | $(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group | 215 | $(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group |
216 | $(STRIPCMD) $@ | 216 | $(STRIPCMD) $@ |
217 | 217 | ||
218 | busybox.links: $(top_srcdir)/applets/busybox.mkll include/config.h $(top_srcdir)/include/applets.h | 218 | busybox.links: $(top_srcdir)/applets/busybox.mkll include/bb_config.h $(top_srcdir)/include/applets.h |
219 | - $(SHELL) $^ >$@ | 219 | - $(SHELL) $^ >$@ |
220 | 220 | ||
221 | install: $(top_srcdir)/applets/install.sh busybox busybox.links | 221 | install: $(top_srcdir)/applets/install.sh busybox busybox.links |
diff --git a/applets/busybox.mkll b/applets/busybox.mkll index 5b6677d03..b30ac8d92 100755 --- a/applets/busybox.mkll +++ b/applets/busybox.mkll | |||
@@ -10,7 +10,7 @@ | |||
10 | export LC_ALL=POSIX | 10 | export LC_ALL=POSIX |
11 | export LC_CTYPE=POSIX | 11 | export LC_CTYPE=POSIX |
12 | 12 | ||
13 | CONFIG_H=${1:-include/config.h} | 13 | CONFIG_H=${1:-include/bb_config.h} |
14 | APPLETS_H=${2:-include/applets.h} | 14 | APPLETS_H=${2:-include/applets.h} |
15 | gcc -E -DMAKE_LINKS -include $CONFIG_H $APPLETS_H | | 15 | gcc -E -DMAKE_LINKS -include $CONFIG_H $APPLETS_H | |
16 | awk '/^[ \t]*LINK/{ | 16 | awk '/^[ \t]*LINK/{ |