4 files changed, 3 insertions, 141 deletions
diff --git a/src/poi-service/poi-server/CMakeLists.txt b/src/poi-service/poi-server/CMakeLists.txt
index e48d782..e536bd5 100644
--- a/src/poi-service/poi-server/CMakeLists.txt
+++ b/src/poi-service/poi-server/CMakeLists.txt
@@ -162,13 +162,13 @@ foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT_FROM_POSITIONING})
 	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h)
 		execute_process(
 			OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
-			COMMAND ${XSLTPROC} ${positioning_SRC_DIR}/enhanced-position-service/api/enum.xsl ${RAW_FILE}   
+			COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}   
 		)
 	else()
 		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h)
 			execute_process(
 				OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
-				COMMAND ${XSLTPROC} ${positioning_SRC_DIR}/enhanced-position-service/api/enum.xsl ${RAW_FILE}   
+				COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}   
 			)
 		endif()
 	endif()
diff --git a/src/poi-service/script/Makefile b/src/poi-service/script/Makefile
deleted file mode 100644
index 8e91761..0000000
--- a/src/poi-service/script/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# @licence app begin@
-# SPDX-License-Identifier: MPL-2.0
-#
-# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
-#
-# \file Makefile
-#
-# \brief This file is part of the Build System.
-#
-# \author Philippe Colliot <philippe.colliot@mpsa.com>
-#
-# \version 1.1
-#
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License (MPL), v. 2.0.
-# If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# For further information see http://www.genivi.org/.
-#
-# List of changes:
-# 
-# 4/6/2014, Philippe Colliot, complete src-clean option
-# 18/6/2014, Philippe Colliot, APT_GET option for Fedora
-#
-# @licence end@
-
-ROOT_DIR=$(CURDIR)/..
-API_DIR=$(CURDIR)/../../../api
-BIN_DIR=$(ROOT_DIR)/bin
-COMMON_DIR=$(ROOT_DIR)/poi-common
-EXE_DIR=$(BIN_DIR)
-QMAKE=qmake
-CXX=g++
-CXXFLAGS=-pipe -O2 -Wall
-CHK_DIR_EXISTS=test -d
-MKDIR=mkdir -p
-
-ifndef $(APT_GET) 
-	APT_GET=apt-get
-endif
-
-default: help
-
-help::
-	@echo "The following targets exist"
-	@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)"
-	@echo "make APT_GET=yum for Fedora, by default APT_GET is set to apt-get"
-
-#Clone the positioning repository for getting the API, generate the proxies and adaptors for the DBus APIs firstly
-include get-positioning.mk
-include generate-api.mk
-
-include poi-server.mk
-
-all: $(ALL)
-
-src-clean: $(SRC_CLEAN)
-
-deps::
-	sudo $(APT_GET) install $(DEPS)
-
-all2: deps all
-
-clean: $(CLEAN)
-
-
diff --git a/src/poi-service/script/build.sh b/src/poi-service/script/build.sh
index 0918fe7..8cce950 100755
--- a/src/poi-service/script/build.sh
+++ b/src/poi-service/script/build.sh
@@ -42,7 +42,7 @@ usage() {
 
 build() {
     echo ''
-    echo 'Building poi-server ->' $POI_SERVER_SRC_DIR
+    echo 'Building poi-server' 
     mkdir -p $POI_SERVER_BIN_DIR
     cd $POI_SERVER_BIN_DIR 
     cmake $POI_SERVER_SRC_DIR && make
diff --git a/src/poi-service/script/poi-server.mk b/src/poi-service/script/poi-server.mk
deleted file mode 100644
index 02db469..0000000
--- a/src/poi-service/script/poi-server.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# @licence app begin@
-# SPDX-License-Identifier: MPL-2.0
-#
-# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
-#
-# \file poi-server.mk
-#
-# \brief This file is part of the Build System.
-#
-# \author Philippe Colliot <philippe.colliot@mpsa.com>
-#
-# \version 1.0
-#
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License (MPL), v. 2.0.
-# If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# For further information see http://www.genivi.org/.
-#
-# List of changes:
-# 
-# <date>, <name>, <description of change>
-#
-# @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 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++
-POI_SERVER_LFLAGS=-Wl,-O1
-
-DEPS+=$(POI_SERVER_DEPS)
-ALL+=poi-server
-CLEAN+=clean-poi-server
-
-help::
-	@echo "poi-server: Build the poi server"
-
-clean-poi-server::
-	rm -rf $(POI_SERVER_BIN_DIR)
-	rm -rf $(BIN_DIR)/poi-server
-
-poi-server: $(POI_SERVER_BIN_DIR)/main.o $(POI_SERVER_BIN_DIR)/database.o
-	$(POI_SERVER_LINK) $(POI_SERVER_LFLAGS) $(POI_SERVER_BIN_DIR)/main.o $(POI_SERVER_BIN_DIR)/database.o $(POI_SERVER_LIBS) -o $(EXE_DIR)/poi-server
-	
-$(POI_SERVER_BIN_DIR)/main.o: $(POI_SERVER_SRC_DIR)/main.cpp $(POI_SERVER_SRC_DIR)/poi-server-class.h \
-		$(COMMON_DIR)/genivi-positioning-constants.h \
-		$(COMMON_DIR)/genivi-mapviewer-constants.h \
-		$(COMMON_DIR)/genivi-navigationcore-constants.h \
-		$(COMMON_DIR)/genivi-poiservice-constants.h \
-		$(COMMON_DIR)/genivi-poiservice-poisearch_adaptor.h \
-		$(COMMON_DIR)/genivi-poiservice-poicontentaccess_adaptor.h \
-		$(COMMON_DIR)/genivi-navigationcore-routing_proxy.h \
-		$(COMMON_DIR)/genivi-positioning-enhancedposition_proxy.h \
-		$(COMMON_DIR)/genivi-poiservice-contentaccessmodule_proxy.h \
-		$(COMMON_DIR)/common-data-model.h \
-		$(POI_SERVER_SRC_DIR)/poi-datamodel.h \
-		$(POI_SERVER_SRC_DIR)/database.h
-	@$(CHK_DIR_EXISTS) $(POI_SERVER_BIN_DIR) || $(MKDIR) $(POI_SERVER_BIN_DIR)
-	$(CXX) -c $(CXXFLAGS) $(POI_SERVER_INCPATH) -o $(POI_SERVER_BIN_DIR)/main.o $(POI_SERVER_SRC_DIR)/main.cpp
-
-$(POI_SERVER_BIN_DIR)/database.o: $(POI_SERVER_SRC_DIR)/database.cpp $(POI_SERVER_SRC_DIR)/database.h
-	@$(CHK_DIR_EXISTS) $(POI_SERVER_BIN_DIR) || $(MKDIR) $(POI_SERVER_BIN_DIR)
-	$(CXX) -c $(CXXFLAGS) $(POI_SERVER_INCPATH) -o $(POI_SERVER_BIN_DIR)/database.o $(POI_SERVER_SRC_DIR)/database.cpp
-
-