Makefile: update help output

Makefile

@@ -814,10 +814,10 @@ help:
 	@$(ECHO) "   Here is a summary of the available targets:"
 	@$(ECHO)
 	@$(ECHO) "   [Tool Installers]"
-	@$(ECHO) "     qt_sdk_install       - Install the QT v4.7.3 tools"
+	@$(ECHO) "     qt_sdk_install       - Install the QT development tools"
 	@$(ECHO) "     arm_sdk_install      - Install the GNU ARM gcc toolchain"
 	@$(ECHO) "     openocd_install      - Install the OpenOCD JTAG daemon"
-	@$(ECHO) "     stm32flash_install   - Install the stm32flash tool for unbricking boards"
+	@$(ECHO) "     stm32flash_install   - Install the stm32flash tool for unbricking F1-based boards"
 	@$(ECHO) "     dfuutil_install      - Install the dfu-util tool for unbricking F4-based boards"
 	@$(ECHO) "     android_sdk_install  - Install the Android SDK tools"
 	@$(ECHO)
@@ -855,6 +855,12 @@ help:
 	@$(ECHO) "     bl_<board>_clean     - Remove bootloader for <board>"
 	@$(ECHO) "     bl_<board>_program   - Use OpenOCD + JTAG to write bootloader to <board>"
 	@$(ECHO)
+	@$(ECHO) "   [Entire Flash]"
+	@$(ECHO) "     ef_<board>           - Build entire flash image for <board>"
+	@$(ECHO) "                            supported boards are ($(EF_BOARDS))"
+	@$(ECHO) "     ef_<board>_clean     - Remove entire flash image for <board>"
+	@$(ECHO) "     ef_<board>_program   - Use OpenOCD + JTAG to write entire flash image to <board>"
+	@$(ECHO)
 	@$(ECHO) "   [Bootloader Updater]"
 	@$(ECHO) "     bu_<board>           - Build bootloader updater for <board>"
 	@$(ECHO) "                            supported boards are ($(BU_BOARDS))"
@@ -865,8 +871,8 @@ help:
 	@$(ECHO) "                            supported boards are ($(BL_BOARDS))"
 	@$(ECHO) "   [Unittests]"
 	@$(ECHO) "     ut_<test>            - Build unit test <test>"
-	@$(ECHO) "     ut_<test>_tap        - Run test and capture TAP output into a file"
+	@$(ECHO) "     ut_<test>_xml        - Run test and capture XML output into a file"
-	@$(ECHO) "     ut_<test>_run        - Run test and dump TAP output to console"
+	@$(ECHO) "     ut_<test>_run        - Run test and dump output to console"
 	@$(ECHO)
 	@$(ECHO) "   [Simulation]"
 	@$(ECHO) "     sim_osx              - Build OpenPilot simulation firmware for OSX"
@@ -877,16 +883,28 @@ help:
 	@$(ECHO)
 	@$(ECHO) "   [GCS]"
 	@$(ECHO) "     gcs                  - Build the Ground Control System (GCS) application"
+	@$(ECHO) "                            with optional GCS_BUILD_CONF=debug|release (default is $(GCS_BUILD_CONF))"
 	@$(ECHO) "     gcs_clean            - Remove the Ground Control System (GCS) application"
 	@$(ECHO)
+	@$(ECHO) "   [AndroidGCS]"
+	@$(ECHO) "     androidgcs           - Build the Android Ground Control System (GCS) application"
+	@$(ECHO) "     androidgcs_install   - Use ADB to install the Android GCS application"
+	@$(ECHO) "     androidgcs_run       - Run the Android GCS application"
+	@$(ECHO) "     androidgcs_clean     - Remove the Android GCS application"
+	@$(ECHO)
 	@$(ECHO) "   [UAVObjects]"
 	@$(ECHO) "     uavobjects           - Generate source files from the UAVObject definition XML files"
 	@$(ECHO) "     uavobjects_test      - parse xml-files - check for valid, duplicate ObjId's, ... "
 	@$(ECHO) "     uavobjects_<group>   - Generate source files from a subset of the UAVObject definition XML files"
 	@$(ECHO) "                            supported groups are ($(UAVOBJ_TARGETS))"
 	@$(ECHO)
+	@$(ECHO) "   [Packaging]"
+	@$(ECHO) "     package              - Build and package the OpenPilot platform-dependent package"
+	@$(ECHO) "                            with optional CLEAN_BUILD=YES|NO (default is YES)"
+	@$(ECHO)
 	@$(ECHO) "   Hint: Add V=1 to your command line to see verbose build output."
 	@$(ECHO)
 	@$(ECHO) "   Note: All tools will be installed into $(TOOLS_DIR)"
 	@$(ECHO) "         All build output will be placed in $(BUILD_DIR)"
+	@$(ECHO) "         Package will be placed into $(BUILD_DIR)"
 	@$(ECHO)

package/Makefile

@@ -40,23 +40,7 @@ BL_TARGETS        := $(addprefix bl_, $(ALL_BOARDS))
 BU_TARGETS        := $(addprefix bu_, $(ALL_BOARDS_BU))
 
 help:
-	@echo
+	$(V1) $(MAKE) -C $(ROOT_DIR) $@
-	@echo "   This Makefile is known to work on Linux and Mac in a standard shell environment."
-	@echo "   It also works on Windows by following the instructions in ../make/winx86/README.txt."
-	@echo
-	@echo "   Here is a summary of the available targets:"
-	@echo
-	@echo "   [Packaging]"
-	@echo "     package        - Build and package the OpenPilot distributable"
-	@echo "     package_flight - Build and package the OpenPilot flight firmware only"
-	@echo
-	@echo "   Notes:"
-	@echo "     - package will be placed in $(PACKAGE_DIR)"
-	@echo
-	@echo "     - the build directory will be removed first on every run unless"
-	@echo "       CLEAN_BUILD=NO is defined. It means no clean before build."
-	@echo "       This usually is safe."
-	@echo
 
 # Clean and build uavobjects since all parts depend on them
 uavobjects: all_clean