diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | scripts/genconfig.sh | 8 |
2 files changed, 7 insertions, 6 deletions
@@ -20,7 +20,7 @@ toybox toybox_unstripped: toybox_stuff .PHONY: clean distclean baseline bloatcheck install install_flat \ uinstall uninstall_flat test tests help toybox_stuff change \ - working pending + list list_working list_pending include kconfig/Makefile -include .singlemake @@ -66,8 +66,7 @@ tests: help:: @echo ' toybox - Build toybox.' @echo ' COMMANDNAME - Build individual toybox command as a standalone binary.' - @echo ' working - List working COMMANDNAMEs.' - @echo ' pending - List pending (unfinished) COMMANDNAMEs.' + @echo ' list - List COMMANDNAMEs (also list_working and list_pending)." @echo ' change - Build each command standalone under change/.' @echo ' baseline - Create toybox_old for use by bloatcheck.' @echo ' bloatcheck - Report size differences between old and current versions' diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh index e53d3607..c0ac56d2 100755 --- a/scripts/genconfig.sh +++ b/scripts/genconfig.sh @@ -123,7 +123,7 @@ genconfig > generated/Config.in || rm generated/Config.in # Find names of commands that can be built standalone in these C files toys() { - grep 'TOY(.*)' "$@" | grep -v TOYFLAG_NOFORK | \ + grep 'TOY(.*)' "$@" | grep -v TOYFLAG_NOFORK | grep -v "0))" | \ sed -rn 's/([^:]*):.*(OLD|NEW)TOY\( *([a-zA-Z][^,]*) *,.*/\1:\3/p' } @@ -140,8 +140,10 @@ do WORKING="$WORKING $NAME" done > .singlemake && echo -e "clean::\n\trm -f $WORKING $PENDING" >> .singlemake && -echo -e "working:\n\t@echo $(echo $WORKING | tr ' ' '\n' | sort | xargs)" \ +echo -e "list:\n\t@echo $(echo $WORKING $PENDING | tr ' ' '\n' | sort | xargs)"\ >> .singlemake && -echo -e "pending:\n\t@echo $(echo $PENDING | tr ' ' '\n' | sort | xargs)" \ +echo -e "list_working:\n\t@echo $(echo $WORKING | tr ' ' '\n' | sort | xargs)" \ + >> .singlemake && +echo -e "list_pending:\n\t@echo $(echo $PENDING | tr ' ' '\n' | sort | xargs)" \ >> .singlemake ) |