From 4c2cc65ca63141839ac4036cb8704b7ee7f27cb1 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Mon, 7 Jul 2014 17:18:54 +0200
Subject: Cleaning up sub modules

---
 .gitmodules                  |  5 ++++-
 Makefile                     | 10 ++++++----
 Tools/check_submodules.sh    |  8 ++++++++
 makefiles/setup.mk           |  1 +
 mavlink/include/mavlink/v1.0 |  1 +
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 160000 mavlink/include/mavlink/v1.0

diff --git a/.gitmodules b/.gitmodules
index c5116c1cb..e352e15f5 100644
--- a/.gitmodules
+++ b/.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
diff --git a/Makefile b/Makefile
index 0a8562251..7ea74eaae 100644
--- a/Makefile
+++ b/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) ""
-	@$(ECHO) "NuttX sources missing - clone https://github.com/PX4/NuttX.git and try again."
-	@$(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
+
+.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
diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh
index 52ea7a146..c431e8225 100755
--- a/Tools/check_submodules.sh
+++ b/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
diff --git a/makefiles/setup.mk b/makefiles/setup.mk
index 183b143d6..6a092ef6b 100644
--- a/makefiles/setup.mk
+++ b/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)/
diff --git a/mavlink/include/mavlink/v1.0 b/mavlink/include/mavlink/v1.0
new file mode 160000
index 000000000..45a71d656
--- /dev/null
+++ b/mavlink/include/mavlink/v1.0
@@ -0,0 +1 @@
+Subproject commit 45a71d6564bc5c47ed97d620089e17ca48bab73f
-- 
cgit v1.2.3