X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Makefile;h=711d624729ab109557e468e79a7df86f1d4491e7;hb=a0637cef8f3e5c6a99a14982ee33d31e5927bc57;hp=004293c0f945b4e5eecdee2d64926e466d8c843d;hpb=f42356f850c64fb3b2cd23595789fb4daf03f35b;p=android-x86%2Fexternal-toybox.git

diff --git a/Makefile b/Makefile
index 004293c0..711d6247 100644
--- a/Makefile
+++ b/Makefile
@@ -15,13 +15,15 @@ KCONFIG_CONFIG ?= .config
 
 toybox_stuff: $(KCONFIG_CONFIG) *.[ch] lib/*.[ch] toys/*.h toys/*/*.c scripts/*.sh
 
-toybox toybox_unstripped: toybox_stuff
+toybox generated/unstripped/toybox: toybox_stuff
 	scripts/make.sh
 
 .PHONY: clean distclean baseline bloatcheck install install_flat \
-	uinstall uninstall_flat test tests help toybox_stuff change
+	uinstall uninstall_flat tests help toybox_stuff change \
+	list list_working list_pending
 
 include kconfig/Makefile
+-include .singlemake
 
 $(KCONFIG_CONFIG): $(KCONFIG_TOP)
 $(KCONFIG_TOP): generated/Config.in
@@ -29,11 +31,11 @@ generated/Config.in: toys/*/*.c scripts/genconfig.sh
 	scripts/genconfig.sh
 
 # Development targets
-baseline: toybox_unstripped
-	@cp toybox_unstripped toybox_old
+baseline: generated/unstripped/toybox
+	@cp generated/unstripped/toybox generated/unstripped/toybox_old
 
-bloatcheck: toybox_old toybox_unstripped
-	@scripts/bloatcheck toybox_old toybox_unstripped
+bloatcheck: toybox_old generated/unstripped/toybox
+	@scripts/bloatcheck generated/unstripped/toybox_old generated/unstripped/toybox
 
 install_flat:
 	scripts/install.sh --symlink --force
@@ -41,7 +43,7 @@ install_flat:
 install:
 	scripts/install.sh --long --symlink --force
 
-uninstall_flat: generated/instlist
+uninstall_flat:
 	scripts/install.sh --uninstall
 
 uninstall:
@@ -51,22 +53,26 @@ change:
 	scripts/change.sh
 
 clean::
-	rm -rf toybox toybox_unstripped generated change .singleconfig*
+	rm -rf toybox generated change .singleconfig*
 
 distclean: clean
-	rm -f toybox_old .config*
-
-test: tests
+	rm -f toybox_old .config* .singlemake
 
 tests:
 	scripts/test.sh
 
 help::
 	@echo  '  toybox          - Build toybox.'
+	@echo  '  COMMANDNAME     - Build individual toybox command as a standalone binary.'
+	@echo  '  list            - List COMMANDNAMEs you can build standalone.'
+	@echo  '  list_pending    - List unfinished COMMANDNAMEs out of toys/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'
-	@echo  '  test            - Run test suite against compiled commands.'
+	@echo  '  test_COMMAND    - Run tests for COMMAND (test_ps, test_cat, etc.)'
+	@echo  '  tests           - Run test suite against all compiled commands.'
+	@echo  '                    export TEST_HOST=1 to test host command, VERBOSE=1'
+	@echo  '                    to show diff, VERBOSE=fail to stop after first failure.'
 	@echo  '  clean           - Delete temporary files.'
 	@echo  "  distclean       - Delete everything that isn't shipped."
 	@echo  '  install_flat    - Install toybox into $$PREFIX directory.'