diff options
| author | <philippe colliot> | 2014-07-28 18:39:17 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2014-07-28 18:39:17 +0200 |
| commit | 0771a9a245c74f500ae9eb8492242036c32acf50 (patch) | |
| tree | 4ca08fd3509a5ae2d06815f13f8fb76716351acc /src/script | |
| parent | 0debf42c9f88eeae22ff8b4068d1aa7245f8dab6 (diff) | |
| download | navigation-0771a9a245c74f500ae9eb8492242036c32acf50.tar.gz | |
version alignment on positioning
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/0positioning.mk | 27 | ||||
| -rw-r--r-- | src/script/navigation-service.mk | 2 |
2 files changed, 16 insertions, 13 deletions
diff --git a/src/script/0positioning.mk b/src/script/0positioning.mk index c0ffe85..cf89d45 100644 --- a/src/script/0positioning.mk +++ b/src/script/0positioning.mk @@ -25,10 +25,13 @@ # # @licence end@ positioning_BIN=$(BIN_DIR)/positioning -gnss-service_BIN=$(BIN_DIR)/gnss-service -sensors-service_BIN=$(BIN_DIR)/sensors-service + +gnss-service_BIN=$(positioning_BIN)/gnss-service +sensors-service_BIN=$(positioning_BIN)/sensors-service +enhanced-position-service_BIN=$(positioning_BIN)/enhanced-position-service + positioning_URL=http://git.projects.genivi.org/lbs/positioning.git -positioning_VERSION=40c43fd3ae2210a2cfc634cf6628e97fbcd41d93 +positioning_VERSION=09698f63ea27a24c533b4c015155ee9ebd7a3026 positioning_SRC=$(SRC_DIR)/positioning_$(positioning_VERSION) positioning_API=$(positioning_SRC)/enhanced-position-service/api @@ -42,19 +45,19 @@ help:: clean-positioning_SRC:: rm -rf $(positioning_SRC) -positioning: $(positioning_BIN)/enhanced-position-service/src/server/position-daemon +positioning: $(positioning_BIN)/enhanced-position-service + +$(positioning_BIN)/enhanced-position-service: $(positioning_BIN)/Makefile + cd $(gnss-service_BIN) && make + cd $(sensors-service_BIN) && make + cd $(enhanced-position-service_BIN) && make + $(positioning_BIN)/Makefile: $(positioning_SRC)/enhanced-position-service/CMakeLists.txt - mkdir -p $(positioning_BIN) $(gnss-service_BIN) $(sensors-service_BIN) + mkdir -p $(positioning_BIN) $(gnss-service_BIN) $(sensors-service_BIN) $(enhanced-position-service_BIN) cd $(gnss-service_BIN) && cmake $(positioning_SRC)/gnss-service cd $(sensors-service_BIN) && cmake $(positioning_SRC)/sensors-service - cd $(positioning_BIN) && cmake -DWITH_GPSD=OFF -DWITH_DLT=OFF -DWITH_REPLAYER=ON -DWITH_TESTS=OFF $(positioning_SRC)/enhanced-position-service - - -$(positioning_BIN)/enhanced-position-service/src/server/position-daemon: $(positioning_BIN)/Makefile - cd $(gnss-service_BIN) && make - cd $(sensors-service_BIN) && make - cd $(positioning_BIN) && make + 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) diff --git a/src/script/navigation-service.mk b/src/script/navigation-service.mk index 754f38b..2fd6ecb 100644 --- a/src/script/navigation-service.mk +++ b/src/script/navigation-service.mk @@ -24,7 +24,7 @@ # # @licence end@ navigation-service_URL="http://git.projects.genivi.org/lbs/navigation.git" -navigation-service_VERSION=f9bcf41cc68ac189781239c15ffc0fb52d086fdc +navigation-service_VERSION=2402a071b38292226b8b4029e3f87d4374967d0a navigation-service_SRC=$(SRC_DIR)/navigation-service_$(navigation-service_VERSION) navigation-service_API=$(navigation-service_SRC)/api navigation-service_BIN=$(BIN_DIR)/navigation-service |