diff options
Diffstat (limited to 'src/navigation/map-viewer')
7 files changed, 53 insertions, 54 deletions
diff --git a/src/navigation/map-viewer/CMakeLists.txt b/src/navigation/map-viewer/CMakeLists.txt index fdf39ef..1c6611e 100644 --- a/src/navigation/map-viewer/CMakeLists.txt +++ b/src/navigation/map-viewer/CMakeLists.txt @@ -32,9 +32,8 @@ include_directories(${DBUS_CPP_GLIB_INCLUDE_DIRS}) include(${PRELOAD_CACHE_FOR_PLUGINS}) -include_directories(${INCLUDE_DIRECTORIES}) +include_directories(${NAVIT_DIR}) include_directories(.) -include_directories(${navit_SOURCE_DIR}/navit) include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${NAVIT_CONFIG_H_DIR}) # this one contains config.h that is generated diff --git a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx index 9a426db..88bca33 100644 --- a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx +++ b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx @@ -31,11 +31,11 @@ #include <stdlib.h> #include "genivi-mapviewer-constants.h" #include "genivi-mapviewer-configuration_adaptor.h" -#include "config.h" +#include <config.h> #define USE_PLUGINS 1 -#include "debug.h" -#include "plugin.h" -#include "event.h" +#include <navit/debug.h> +#include <navit/plugin.h> +#include <navit/event.h> #include "navigation-common-dbus.h" #if (!DEBUG_ENABLED) diff --git a/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx b/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx index 7665f13..fe12b18 100644 --- a/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx +++ b/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx @@ -28,11 +28,11 @@ */ #include <locale.h> #include <stdlib.h> -#include "config.h" +#include <config.h> #define USE_PLUGINS 1 -#include "debug.h" -#include "plugin.h" -#include "event.h" +#include <navit/debug.h> +#include <navit/plugin.h> +#include <navit/event.h> #include <CommonAPI/CommonAPI.hpp> #include <CommonTypes.hpp> diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx index 14f8cf0..c637c82 100644 --- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx +++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx @@ -44,25 +44,25 @@ #include "genivi-navigationcore-mapmatchedposition_proxy.h" #include "genivi-navigationcore-constants.h" #include "genivi-mapviewer-constants.h" -#include "config.h" +#include <config.h> #define USE_PLUGINS 1 -#include "debug.h" -#include "plugin.h" -#include "item.h" -#include "config_.h" -#include "navit.h" -#include "event.h" -#include "point.h" -#include "graphics.h" -#include "coord.h" -#include "transform.h" -#include "map.h" -#include "mapset.h" -#include "callback.h" -#include "vehicle.h" -#include "attr.h" -#include "xmlconfig.h" -#include "layout.h" +#include <navit/debug.h> +#include <navit/plugin.h> +#include <navit/item.h> +#include <navit/config_.h> +#include <navit/navit.h> +#include <navit/event.h> +#include <navit/point.h> +#include <navit/graphics.h> +#include <navit/coord.h> +#include <navit/transform.h> +#include <navit/map.h> +#include <navit/mapset.h> +#include <navit/callback.h> +#include <navit/vehicle.h> +#include <navit/attr.h> +#include <navit/xmlconfig.h> +#include <navit/layout.h> #include "navigation-common-dbus.h" diff --git a/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx index 4982206..e419331 100644 --- a/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx +++ b/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx @@ -37,25 +37,25 @@ #endif #endif -#include "config.h" +#include <config.h> #define USE_PLUGINS 1 -#include "debug.h" -#include "plugin.h" -#include "item.h" -#include "config_.h" -#include "navit.h" -#include "event.h" -#include "point.h" -#include "graphics.h" -#include "coord.h" -#include "transform.h" -#include "map.h" -#include "mapset.h" -#include "callback.h" -#include "vehicle.h" -#include "attr.h" -#include "xmlconfig.h" -#include "layout.h" +#include <navit/debug.h> +#include <navit/plugin.h> +#include <navit/item.h> +#include <navit/config_.h> +#include <navit/navit.h> +#include <navit/event.h> +#include <navit/point.h> +#include <navit/graphics.h> +#include <navit/coord.h> +#include <navit/transform.h> +#include <navit/map.h> +#include <navit/mapset.h> +#include <navit/callback.h> +#include <navit/vehicle.h> +#include <navit/attr.h> +#include <navit/xmlconfig.h> +#include <navit/layout.h> #include <CommonAPI/CommonAPI.hpp> #include <CommonTypes.hpp> diff --git a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx index 832bc72..678f288 100644 --- a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx +++ b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx @@ -28,11 +28,11 @@ #include <dbus-c++/glib-integration.h> #include "genivi-mapviewer-constants.h" #include "genivi-mapviewer-session_adaptor.h" -#include "config.h" +#include <config.h> #define USE_PLUGINS 1 -#include "debug.h" -#include "plugin.h" -#include "event.h" +#include <navit/debug.h> +#include <navit/plugin.h> +#include <navit/event.h> #include "navigation-common-dbus.h" diff --git a/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx b/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx index 993d457..670e677 100644 --- a/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx +++ b/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx @@ -26,11 +26,11 @@ * @licence end@ */ #include <dbus-c++/glib-integration.h> -#include "config.h" +#include <config.h> #define USE_PLUGINS 1 -#include "debug.h" -#include "plugin.h" -#include "event.h" +#include <navit/debug.h> +#include <navit/plugin.h> +#include <navit/event.h> #include <CommonAPI/CommonAPI.hpp> #include <CommonTypes.hpp> |