X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Makefile;h=c36d1cd2649e847255827383f740356ab111ef21;hb=724542f80a7d08537089c2a90989cfd9be5dcdce;hp=40e95b1be638c6e192c6286660c8e44a2d0e4d5c;hpb=b79e4c397423ab1bdaff9c85091b45e5143fd424;p=android-x86%2Fexternal-toybox.git

diff --git a/Makefile b/Makefile
index 40e95b1b..c36d1cd2 100644
--- a/Makefile
+++ b/Makefile
@@ -15,11 +15,11 @@ 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
@@ -31,15 +31,18 @@ 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
 
+install_airlock:
+	scripts/install.sh --symlink --force --airlock
+
 install:
 	scripts/install.sh --long --symlink --force
 
@@ -53,29 +56,31 @@ change:
 	scripts/change.sh
 
 clean::
-	rm -rf toybox toybox_unstripped generated change .singleconfig*
+	rm -rf toybox generated change .singleconfig*
 
+# If singlemake was in generated/ "make clean; make test_ls" wouldn't work.
 distclean: clean
 	rm -f toybox_old .config* .singlemake
 
-test: tests
-
 tests:
 	scripts/test.sh
 
 help::
 	@echo  '  toybox          - Build toybox.'
 	@echo  '  COMMANDNAME     - Build individual toybox command as a standalone binary.'
-	@echo  '  list            - List COMMANDNAMEs (also list_working and list_pending).'
+	@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_COMMAND    - Run tests for COMMAND (test_ps, test_cat, etc.)'
-	@echo  '  test            - Run test suite against all compiled commands.'
+	@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_airlock - Install toybox and host toolchain into $$PREFIX directory'
+	@echo  '                    (providing $$PATH for hermetic builds).'
 	@echo  '  install_flat    - Install toybox into $$PREFIX directory.'
 	@echo  '  install         - Install toybox into subdirectories of $$PREFIX.'
 	@echo  '  uninstall_flat  - Remove toybox from $$PREFIX directory.'