Cleaning up sub modules

.gitmodules

@@ -1,3 +1,6 @@
-[submodule "mavlink/include/mavlink/v1.0"]
+[submodule "mavlink"]
 	path = mavlink/include/mavlink/v1.0
 	url = https://github.com/mavlink/c_library.git
+[submodule "mavlink/include/mavlink/v1.0"]
+	path = mavlink/include/mavlink/v1.0
+	url = git://github.com/mavlink/c_library.git

Makefile

@@ -104,7 +104,7 @@ DESIRED_FIRMWARES 	 = $(foreach config,$(CONFIGS),$(IMAGE_DIR)$(config).px4)
 STAGED_FIRMWARES	 = $(foreach config,$(KNOWN_CONFIGS),$(IMAGE_DIR)$(config).px4)
 FIRMWARES		 = $(foreach config,$(KNOWN_CONFIGS),$(BUILD_DIR)$(config).build/firmware.px4)
 
-all:			$(DESIRED_FIRMWARES)
+all:			checksubmodules $(DESIRED_FIRMWARES)
 
 #
 # Copy FIRMWARES into the image directory.
@@ -210,9 +210,11 @@ menuconfig:
 endif
 
 $(NUTTX_SRC):
-	@$(ECHO) ""
+	$(Q) if [ -d $(NUTTX_SRC) ]; then ./Tools/check_submodules.sh; else echo ""; echo ""; echo "NuttX submodule missing, doing auto checkout"; git submodule init; git submodule update; fi
-	@$(ECHO) "NuttX sources missing - clone https://github.com/PX4/NuttX.git and try again."
+
-	@$(ECHO) ""
+.PHONY: checksubmodules
+checksubmodules:
+	$(Q) if [ -d $(MAVLINK_SRC) ]; then ./Tools/check_submodules.sh; else echo ""; echo ""; echo "MAVLink submodule missing, doing auto checkout"; git submodule init; git submodule update; fi
 
 #
 # Testing targets

Tools/check_submodules.sh

@@ -7,4 +7,12 @@ else
 	exit 1
 fi
 
+STATUSRETVAL=$(git status --porcelain | grep -i "M NuttX")
+if [ "$STATUSRETVAL" == "" ]; then
+	echo "checked NuttX submodule, correct version found"
+else
+	echo "NuttX sub repo not at correct version. Try 'git submodule update'"
+	exit 1
+fi
+
 exit 0

makefiles/setup.mk

@@ -46,6 +46,7 @@ export PX4_MODULE_SRC	 = $(abspath $(PX4_BASE)/src)/
 export PX4_LIB_DIR	 = $(abspath $(PX4_BASE)/src/lib)/
 export PX4_MK_DIR	 = $(abspath $(PX4_BASE)/makefiles)/
 export NUTTX_SRC	 = $(abspath $(PX4_BASE)/NuttX/nuttx)/
+export MAVLINK_SRC	 = $(abspath $(PX4_BASE)/mavlink/include/mavlink/v1.0)/
 export NUTTX_APP_SRC	 = $(abspath $(PX4_BASE)/NuttX/apps)/
 export MAVLINK_SRC	 = $(abspath $(PX4_BASE)/mavlink)/
 export ROMFS_SRC	 = $(abspath $(PX4_BASE)/ROMFS)/

mavlink/include/mavlink/v1.0

@@ -0,0 +1 @@
+Subproject commit 45a71d6564bc5c47ed97d620089e17ca48bab73f