From a930bd333270166fd80a919deb36bfb40eb97f8c Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 16 Dec 2005 06:12:46 +0000 Subject: [PATCH] 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 --- Makefile | 2 +- applets/busybox.mkll | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6e0b7a322..cc4cc274c 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 5b6677d03..b30ac8d92 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/{ -- 2.25.1