From 39defaf848964fd8773d5162513dec4744a1d9f9 Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Mon, 29 Sep 2014 12:24:56 +0000
Subject: navit: Use navit from a submodule

---
 .gitmodules                     | 3 +++
 src/navigation/.gitignore       | 1 -
 src/navigation/navit            | 1 +
 src/navigation/script/1navit.mk | 3 +--
 4 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 src/navigation/.gitignore
 create mode 160000 src/navigation/navit

diff --git a/.gitmodules b/.gitmodules
index 2e6c21f..9800f81 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src/positioning"]
 	path = src/positioning
 	url = http://git.projects.genivi.org/lbs/positioning.git
+[submodule "src/navigation/navit"]
+	path = src/navigation/navit
+	url = http://git.navit-project.org/navit.git
diff --git a/src/navigation/.gitignore b/src/navigation/.gitignore
deleted file mode 100644
index 26d5a0b..0000000
--- a/src/navigation/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-navit
diff --git a/src/navigation/navit b/src/navigation/navit
new file mode 160000
index 0000000..8396f6f
--- /dev/null
+++ b/src/navigation/navit
@@ -0,0 +1 @@
+Subproject commit 8396f6f94ef9a16db679e9de353242899966a735
diff --git a/src/navigation/script/1navit.mk b/src/navigation/script/1navit.mk
index aeceb6c..8d1f0a0 100644
--- a/src/navigation/script/1navit.mk
+++ b/src/navigation/script/1navit.mk
@@ -53,8 +53,7 @@ $(navit_BIN)/Makefile: $(navit_SRC2)/CMakeLists.txt
 	cd $(navit_BIN) && cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 $(navit_SRC2)
 
 $(navit_SRC2)/CMakeLists.txt:
-	cd $(navit_SRC)/.. && git clone $(navit_URL)
-	cd $(navit_SRC) && git checkout $(navit_VERSION)
+	true
 
 navit_map: $(navit_BIN)/navit/maps/switzerland.xml
 
-- 
cgit v1.2.1