Follow symlinks to get actual device name, getmountlist() reverses order for us now...

[android-x86/external-toybox.git] / Makefile

diff --git a/Makefile b/Makefile
index 01f6a21..bbab258 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,37 +3,46 @@
 
 all: toybox
 
-toybox toybox_unstripped: .config *.[ch] lib/*.[ch] toys/*.[ch] scripts/*
+toybox toybox_unstripped: .config *.[ch] lib/*.[ch] toys/*.h toys/*/*.c scripts/*.sh
        scripts/make.sh
 
-.PHONY: clean distclean baseline bloatcheck install_flat test tests help
+.PHONY: clean distclean baseline bloatcheck install install_flat \
+       uinstall uninstall_flat test tests help scripts/test
 
 include kconfig/Makefile
 
 $(KCONFIG_TOP): generated/Config.in
-generated/Config.in:
+generated/Config.in: toys/*/*.c scripts/genconfig.sh
        scripts/genconfig.sh
 
-HOSTCC:=cc
+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
+       @scripts/bloatcheck toybox_old toybox_unstripped
 
 instlist: toybox
-       $(HOSTCC) $(CCFLAGS) -I . scripts/install.c -o instlist
+       $(HOSTCC) -I . scripts/install.c -o instlist
 
 install_flat: instlist
-       @mkdir -p $(PREFIX)/
-       @cp toybox $(PREFIX)/
-       @for i in `./instlist`; do ln -s toybox "$(PREFIX)/$$i"; done
+       scripts/install.sh --symlink --force
+
+install:
+       scripts/install.sh --long --symlink --force
+
+uninstall_flat: instlist
+       scripts/install.sh --uninstall
+
+uninstall:
+       scripts/install.sh --long --uninstall
 
 clean::
-       rm -f toybox toybox_unstripped generated/config.h generated/Config.in \
-               generated/newtoys.h generated/globals.h instlist
+       rm -rf toybox toybox_unstripped generated/config.h generated/Config.in \
+               generated/newtoys.h generated/globals.h instlist testdir \
+               generated/Config.probed
 
 distclean: clean
        rm -f toybox_old .config* generated/help.h
@@ -41,7 +50,7 @@ distclean: clean
 test: tests
 
 tests:
-       scripts/testall.sh
+       scripts/test.sh
 
 help::
        @echo  '  toybox          - Build toybox.'
@@ -49,5 +58,11 @@ help::
        @echo  '  bloatcheck      - Report size differences between old and current versions'
        @echo  '  test            - Run test suite against compiled commands.'
        @echo  '  clean           - Delete temporary files.'
-       @echo  '  distclean       - Delete everything that isn't shipped.'
-       @echo  '  install_flat    - Install toybox into $PREFIX directory.'
+       @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  ''
+       @echo  'example: CFLAGS="--static" CROSS_COMPILE=armv5l- make defconfig toybox install'
+       @echo  ''