aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2016-03-23 03:25:37 -0500
committerRob Landley <rob@landley.net>2016-03-23 03:25:37 -0500
commita8d0d13376251e1ff35a557dddea1d2e3c81a149 (patch)
tree91ac62baa71572bbd900222ad99338778557e167 /Makefile
parentc23186d3ee6001b78c843fc3609575306c687ba2 (diff)
downloadtoybox-a8d0d13376251e1ff35a557dddea1d2e3c81a149.tar.gz
Redo build stuff in response to Andy Chu's suggestions.
Toybox single binaries are now made directly with the new name instead of stomping toybox and getting renamed. Unstripped files now live in generated/unstripped. Target to run all tests is now "make tests" to avoid conflict with "make test". .singleconfig now has .PHONY: entries for all test_$NAME targets. Default install location changed to /usr/toybox, code.html now says how to change it (set $PREFIX). scripts/install.sh --uninstall works now. (And you get to keep the pieces!)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 8 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 40e95b1b..c7237405 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,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
@@ -53,13 +53,11 @@ 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* .singlemake
-test: tests
-
tests:
scripts/test.sh
@@ -71,7 +69,7 @@ help::
@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.'