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

diff --git a/Makefile b/Makefile
index 0ed833cb..c36d1cd2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,64 +1,90 @@
 # Makefile for toybox.
 # Copyright 2006 Rob Landley <rob@landley.net>
 
+# If people set these on the make command line, use 'em
+# Note that CC defaults to "cc" so the one in configure doesn't get
+# used when scripts/make.sh and care called through "make".
+
+HOSTCC?=cc
+
+export CROSS_COMPILE CFLAGS OPTIMIZE LDOPTIMIZE CC HOSTCC V
+
 all: toybox
 
-toybox toybox_unstripped: .config *.[ch] lib/*.[ch] toys/*.[ch] scripts/*
+KCONFIG_CONFIG ?= .config
+
+toybox_stuff: $(KCONFIG_CONFIG) *.[ch] lib/*.[ch] toys/*.h toys/*/*.c scripts/*.sh
+
+toybox generated/unstripped/toybox: toybox_stuff
 	scripts/make.sh
 
 .PHONY: clean distclean baseline bloatcheck install install_flat \
-	uinstall uninstall_flat test tests help scripts/test
+	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
-generated/Config.in:
+generated/Config.in: toys/*/*.c scripts/genconfig.sh
 	scripts/genconfig.sh
 
-HOSTCC:=cc
-
 # Development targets
-baseline: toybox_unstripped
-	@cp toybox_unstripped toybox_old
-
-bloatcheck: toybox_old toybox_unstripped
-	@scripts/bloat-o-meter toybox_old toybox_unstripped
+baseline: generated/unstripped/toybox
+	@cp generated/unstripped/toybox generated/unstripped/toybox_old
 
-instlist: toybox
-	$(HOSTCC) $(CCFLAGS) -I . scripts/install.c -o instlist
+bloatcheck: toybox_old generated/unstripped/toybox
+	@scripts/bloatcheck generated/unstripped/toybox_old generated/unstripped/toybox
 
-install_flat: instlist
+install_flat:
 	scripts/install.sh --symlink --force
 
+install_airlock:
+	scripts/install.sh --symlink --force --airlock
+
 install:
 	scripts/install.sh --long --symlink --force
 
-uninstall_flat: instlist
+uninstall_flat:
 	scripts/install.sh --uninstall
 
 uninstall:
 	scripts/install.sh --long --uninstall
 
+change:
+	scripts/change.sh
+
 clean::
-	rm -rf toybox toybox_unstripped generated/config.h generated/Config.in \
-		generated/newtoys.h generated/globals.h instlist testdir
+	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* generated/help.h
-
-test: tests
+	rm -f toybox_old .config* .singlemake
 
 tests:
 	scripts/test.sh
 
 help::
 	@echo  '  toybox          - Build toybox.'
-	@echo  '  baseline        - Create busybox_old for use by bloatcheck.'
+	@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.'
-	@echo  '  install         - Install toybox into subdirectories of $PREFIX.'
-	@echo  '  uninstall_flat  - Remove toybox from $PREFIX directory."
-	@echo  '  uninstall       - Remove toybox from subdirectories of $PREFIX."
+	@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.'
+	@echo  '  uninstall       - Remove toybox from subdirectories of $$PREFIX.'
+	@echo  ''
+	@echo  'example: CFLAGS="--static" CROSS_COMPILE=armv5l- make defconfig toybox install'
+	@echo  ''