diff options
| author | <philippe colliot> | 2014-06-17 11:41:32 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2014-06-17 11:41:32 +0200 |
| commit | 13e7dfd151202598a3d700c2f6e113ce31885122 (patch) | |
| tree | 0d66c5510dc5f2ab8c32c879ef555e5f0d9bdb76 | |
| parent | c45ea6f984b11bdd398d413f04f1d48cdad2242c (diff) | |
| download | poi-service-13e7dfd151202598a3d700c2f6e113ce31885122.tar.gz | |
update makefiles
| -rw-r--r-- | src/navigation/script/Makefile | 3 | ||||
| -rw-r--r-- | src/poi-service/script/Makefile | 3 | ||||
| -rw-r--r-- | test/poi-service/script/Makefile | 3 | ||||
| -rw-r--r-- | test/poi-service/script/poi-client.mk | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/navigation/script/Makefile b/src/navigation/script/Makefile index 13e7fa7..bb0bb4a 100644 --- a/src/navigation/script/Makefile +++ b/src/navigation/script/Makefile @@ -32,6 +32,7 @@ MAP_DIR=$(CURDIR)/../../map CONSTANTS_BIN=$(BIN_DIR)/constants QMAKE=qmake +APT_GET=apt-get default: help @@ -50,7 +51,7 @@ all: $(ALL) src-clean: $(SRC_CLEAN) deps:: - sudo apt-get install $(DEPS) + sudo $(APT_GET) install $(DEPS) # See https://bugs.launchpad.net/ubuntu/+source/freetype/+bug/1319642 why this is necessary [ -e /usr/include/freetype2/freetype ] || sudo ln -s . /usr/include/freetype2/freetype diff --git a/src/poi-service/script/Makefile b/src/poi-service/script/Makefile index 44a8e30..1a0b041 100644 --- a/src/poi-service/script/Makefile +++ b/src/poi-service/script/Makefile @@ -34,6 +34,7 @@ CXX=g++ CXXFLAGS=-pipe -O2 -Wall CHK_DIR_EXISTS=test -d MKDIR=mkdir -p +APT_GET=apt-get default: help @@ -55,7 +56,7 @@ all: $(ALL) src-clean: $(SRC_CLEAN) deps:: - sudo apt-get install $(DEPS) + sudo $(APT_GET) install $(DEPS) all2: deps all diff --git a/test/poi-service/script/Makefile b/test/poi-service/script/Makefile index dfa3a67..8818aa4 100644 --- a/test/poi-service/script/Makefile +++ b/test/poi-service/script/Makefile @@ -35,6 +35,7 @@ CXX=g++ CXXFLAGS=-pipe -O2 -Wall CHK_DIR_EXISTS=test -d MKDIR=mkdir -p +APT_GET=apt-get default: help @@ -56,7 +57,7 @@ include poi-contentaccess-module.mk all: $(ALL) deps:: - sudo apt-get install $(DEPS) + sudo $(APT_GET) install $(DEPS) all2: deps all diff --git a/test/poi-service/script/poi-client.mk b/test/poi-service/script/poi-client.mk index 9eab839..ed3e580 100644 --- a/test/poi-service/script/poi-client.mk +++ b/test/poi-service/script/poi-client.mk @@ -24,7 +24,7 @@ # # @licence end@ POI_CLIENT_SRC_DIR=$(ROOT_DIR)/poi-client -POI_CLIENT_DEPS=qt4-qmlviewer libqt5widgets5 libqt5dbus5 libqt5core5a libqt5gui5 qtbase5-dev-tools +POI_CLIENT_DEPS=qt4-qmlviewer libqt5widgets5 libqt5dbus5 libqt5core5a libqt5gui5 qtbase5-dev-tools qttools5-dev-tools POI_CLIENT_BIN_DIR=$(BIN_DIR)/poi-client-bin DEPS+=$(POI_CLIENT_DEPS) |