Make the build system nicerbaserock/genivi-demo-platform

6 files changed, 15 insertions, 24 deletions

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..6cfde1a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "src/navigation-service"]
+	path = src/navigation-service
+	url = git://git.baserock.org/delta/genivi/poi-service
+[submodule "src/automotive-message-broker"]
+	path = src/automotive-message-broker
+	url = git://github.com/otcshare/automotive-message-broker.git
diff --git a/src/automotive-message-broker b/src/automotive-message-broker
new file mode 160000
+Subproject ac3fe53327a13afc571efe079a31a0472ea285a
diff --git a/src/navigation-service b/src/navigation-service
new file mode 160000
+Subproject 39defaf848964fd8773d5162513dec4744a1d9f
diff --git a/src/script/0positioning.mk b/src/script/0positioning.mk
index ccad822..e5d5a11 100644
--- a/src/script/0positioning.mk
+++ b/src/script/0positioning.mk
@@ -32,19 +32,14 @@ enhanced-position-service_BIN=$(positioning_BIN)/enhanced-position-service
 
 positioning_URL=http://git.projects.genivi.org/lbs/positioning.git
 positioning_VERSION=09698f63ea27a24c533b4c015155ee9ebd7a3026
-positioning_SRC=$(SRC_DIR)/positioning_$(positioning_VERSION)
+positioning_SRC=$(SRC_DIR)/navigation-service/src/positioning
 positioning_API=$(positioning_SRC)/enhanced-position-service/api
 
 ALL+=positioning
 
-SRC_CLEAN+=clean-positioning_SRC
-
 help::
 	@echo "positioning: Build positioning"
 
-clean-positioning_SRC::
-	rm -rf $(SRC_DIR)/positioning_*
-
 positioning: $(positioning_BIN)/enhanced-position-service
 
 $(positioning_BIN)/enhanced-position-service: $(positioning_BIN)/Makefile
@@ -60,5 +55,4 @@ $(positioning_BIN)/Makefile: $(positioning_SRC)/enhanced-position-service/CMakeL
 	cd $(enhanced-position-service_BIN) && cmake -DWITH_GPSD=OFF -DWITH_DLT=OFF -DWITH_REPLAYER=ON -DWITH_TESTS=OFF $(positioning_SRC)/enhanced-position-service
 
 $(positioning_SRC)/enhanced-position-service/CMakeLists.txt:
-	cd $(positioning_SRC)/.. && git clone $(positioning_URL) $(positioning_SRC)
-	cd $(positioning_SRC) && git checkout $(positioning_VERSION)
+	true
diff --git a/src/script/automotive-message-broker.mk b/src/script/automotive-message-broker.mk
index 5e1655c..530f1fa 100644
--- a/src/script/automotive-message-broker.mk
+++ b/src/script/automotive-message-broker.mk
@@ -26,7 +26,7 @@
 # @licence end@
 automotive-message-broker_URL="https://github.com/otcshare/automotive-message-broker.git"
 automotive-message-broker_VERSION=ac3fe53327a13afc571efe079a31a0472ea285a3
-automotive-message-broker_SRC=$(SRC_DIR)/automotive-message-broker_$(automotive-message-broker_VERSION)
+automotive-message-broker_SRC=$(SRC_DIR)/automotive-message-broker
 automotive-message-broker_BIN=$(BIN_DIR)/automotive-message-broker
 automotive-message-broker_DEPS+=cmake libboost-dev libjson0-dev libtool uuid-dev
 
@@ -37,13 +37,8 @@ SRC_CLEAN+=clean-automotive-message-broker_SRC
 help::
 	@echo "automotive-message-broker: Build automotive-message-broker"
 
-clean-automotive-message-broker_SRC::
-	rm -rf $(SRC_DIR)/automotive-message-broker_*
-
-
 $(automotive-message-broker_SRC)/CMakeLists.txt:
-	cd $(automotive-message-broker_SRC)/.. && git clone $(automotive-message-broker_URL) $(automotive-message-broker_SRC)
-	cd $(automotive-message-broker_SRC) && git checkout $(automotive-message-broker_VERSION)
+	true
 
 automotive-message-broker-checkout: $(automotive-message-broker_SRC)/CMakeLists.txt
 
diff --git a/src/script/navigation-service.mk b/src/script/navigation-service.mk
index 446226b..b3698f1 100644
--- a/src/script/navigation-service.mk
+++ b/src/script/navigation-service.mk
@@ -23,9 +23,9 @@
 # 4/6/2014, Philippe Colliot, complete src-clean option
 #
 # @licence end@
-navigation-service_URL="http://git.projects.genivi.org/lbs/navigation.git"
-navigation-service_VERSION=50e6d0a351b7c79ff3d4905c446cd95f11482781
-navigation-service_SRC=$(SRC_DIR)/navigation-service_$(navigation-service_VERSION)
+navigation-service_URL="file:///root/poi-service"
+navigation-service_VERSION=b68cd83a50439aa5ef28d068e767641cf5420bfc
+navigation-service_SRC=$(SRC_DIR)/navigation-service
 navigation-service_API=$(navigation-service_SRC)/api
 navigation-service_BIN=$(BIN_DIR)/navigation-service
 navigation-service_DEPS=libsqlite3-dev libglibmm-2.4-dev sqlite3 xsltproc libdbus-c++-dev libdbus-1-dev
@@ -39,7 +39,7 @@ poi-common_BIN=$(BIN_DIR)/poi-common
 DEPS+=$(navigation-service_DEPS)
 deps:: $(poi-service_SRC)/poi-server/poi-server.pro
 
-ALL+=poi-service navit-plugins
+ALL+=navit poi-service navit-plugins
 SRC_CLEAN+=clean-navigation-service_SRC
 
 navigation-service_CONSTANTS+=$(navigation-service_SRC)/api/map-viewer/genivi-mapviewer-constants.xml
@@ -48,10 +48,6 @@ navigation-service_CONSTANTS+=$(navigation-service_SRC)/api/poi-service/genivi-p
 CONSTANTS_SRC+=$(navigation-service_CONSTANTS)
 CONSTANTS_SRC+=$(positioning_API)/genivi-positioning-constants.xml
 
-
-clean-navigation-service_SRC::
-	rm -rf $(SRC_DIR)/navigation-service_*
-
 help::
 	@echo "poi-service: Build poi-service"
 	@echo "navit-plugins: Build navit-plugins"
@@ -80,5 +76,5 @@ $(poi-service_BIN)/empty.db:
 
 poi-service: $(poi-service_BIN)/poi-server $(poi-service_BIN)/empty.db
 
-navit-plugins mapviewer navigationcore deps::
+navit navit-plugins mapviewer navigationcore deps::
 	$(MAKE) BIN_DIR=$(BIN_DIR) poi-service_API=$(poi-service_API) layer_management_INST=$(layer_management_INST) positioning_SRC=$(positioning_SRC) -C $(navigation-service_SRC)/src/navigation/script $@