diff options
| author | <philippe colliot> | 2014-06-06 17:28:30 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2014-06-06 17:28:30 +0200 |
| commit | f6e21a6683c5d6e7acf1e2f8613d5d02e2c636a5 (patch) | |
| tree | b364a0b44b68ca586ddfd848331b859002277bc1 | |
| parent | ffed413d3c4eeb276788e467bd95e1734d65f0dd (diff) | |
| download | poi-service-f6e21a6683c5d6e7acf1e2f8613d5d02e2c636a5.tar.gz | |
add some dependencies into the makefiles
| -rw-r--r-- | src/poi-service/script/Makefile | 1 | ||||
| -rw-r--r-- | src/poi-service/script/generate-api.mk | 2 | ||||
| -rw-r--r-- | src/poi-service/script/poi-server.mk | 2 | ||||
| -rw-r--r-- | test/poi-service/script/Makefile | 1 | ||||
| -rw-r--r-- | test/poi-service/script/generate-api.mk | 2 | ||||
| -rwxr-xr-x | test/poi-service/script/kill-all | 2 |
6 files changed, 8 insertions, 2 deletions
diff --git a/src/poi-service/script/Makefile b/src/poi-service/script/Makefile index 3ecf142..44a8e30 100644 --- a/src/poi-service/script/Makefile +++ b/src/poi-service/script/Makefile @@ -42,6 +42,7 @@ help:: @echo "all: Build $(ALL)" @echo "clean: Clean up build dir" @echo "src-clean: Clean up all checked out sources" + @echo "all2: Get $(DEPS) and build $(ALL)" #Clone the positioning repository for getting the API, generate the proxies and adaptors for the DBus APIs firstly include get-positioning.mk diff --git a/src/poi-service/script/generate-api.mk b/src/poi-service/script/generate-api.mk index 5176acd..85eadab 100644 --- a/src/poi-service/script/generate-api.mk +++ b/src/poi-service/script/generate-api.mk @@ -25,9 +25,11 @@ # @licence end@ COMMON_DIR=$(ROOT_DIR)/poi-common TARGET_GENERATED_API_DIR=$(COMMON_DIR) +GENERATE_API_DEPS=libdbus-c++-dev xsltproc ALL+=generate-api CLEAN+=clean-generate-api +DEPS+=$(GENERATE_API_DEPS) help:: @echo "generate-api: Generate the proxies and adaptors" diff --git a/src/poi-service/script/poi-server.mk b/src/poi-service/script/poi-server.mk index 8d8103c..02db469 100644 --- a/src/poi-service/script/poi-server.mk +++ b/src/poi-service/script/poi-server.mk @@ -25,7 +25,7 @@ # @licence end@ POI_SERVER_SRC_DIR=$(ROOT_DIR)/poi-server POI_SERVER_BIN_DIR=$(BIN_DIR)/poi-server-bin -POI_SERVER_DEPS=libsqlite3-dev sqlite3 +POI_SERVER_DEPS=libsqlite3-dev sqlite3 libdbus-c++-dev POI_SERVER_INCPATH=-I$(COMMON_DIR) -I$(POI_SERVER_SRC_DIR) -I/usr/include/glibmm-2.4 -I/usr/lib/i386-linux-gnu/glibmm-2.4/include -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/dbus-c++-1 -I/usr/include/dbus-1.0 -I/usr/lib/i386-linux-gnu/dbus-1.0/include POI_SERVER_LIBS=-lglibmm-2.4 -lglib-2.0 -lgobject-2.0 -lsqlite3 -ldbus-c++-glib-1 -ldbus-c++-1 -ldbus-1 POI_SERVER_LINK=g++ diff --git a/test/poi-service/script/Makefile b/test/poi-service/script/Makefile index b716e4c..dfa3a67 100644 --- a/test/poi-service/script/Makefile +++ b/test/poi-service/script/Makefile @@ -43,6 +43,7 @@ help:: @echo "all: Build $(ALL)" @echo "clean: Clean up build dir" @echo "src-clean: Clean up all checked out sources" + @echo "all2: Get $(DEPS) and build $(ALL)" #Clone the positioning repository for getting the API, generate the proxies and adaptors for the DBus APIs firstly include get-positioning.mk diff --git a/test/poi-service/script/generate-api.mk b/test/poi-service/script/generate-api.mk index 5176acd..8b60942 100644 --- a/test/poi-service/script/generate-api.mk +++ b/test/poi-service/script/generate-api.mk @@ -25,6 +25,8 @@ # @licence end@ COMMON_DIR=$(ROOT_DIR)/poi-common TARGET_GENERATED_API_DIR=$(COMMON_DIR) +GENERATE_API_DEPS=libdbus-c++-dev xsltproc +DEPS+=$(GENERATE_API_DEPS) ALL+=generate-api CLEAN+=clean-generate-api diff --git a/test/poi-service/script/kill-all b/test/poi-service/script/kill-all index 510d023..75032ad 100755 --- a/test/poi-service/script/kill-all +++ b/test/poi-service/script/kill-all @@ -1,4 +1,4 @@ #!/bin/sh echo 'kill all remaining process' -kill -9 `ps -ef | grep poi- | grep -v grep | awk '{print $2}'` +kill -9 `ps -ef | egrep poi- | grep -v grep | awk '{print $2}'` |