summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley2005-12-16 06:12:46 +0000
committerRob Landley2005-12-16 06:12:46 +0000
commita930bd333270166fd80a919deb36bfb40eb97f8c (patch)
tree1a656a20ff1b490000dcd935f0d1dde26ab30085
parentddc280ec437d61a6d0a906e414e475e05e877606 (diff)
downloadbusybox-a930bd333270166fd80a919deb36bfb40eb97f8c.zip
busybox-a930bd333270166fd80a919deb36bfb40eb97f8c.tar.gz
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--Makefile2
-rwxr-xr-xapplets/busybox.mkll2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6e0b7a3..cc4cc27 100644
--- 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 5b6677d..b30ac8d 100755
--- 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/{