From 48b699db73a98b5472ef2db9d04b205262750278 Mon Sep 17 00:00:00 2001
From: Kevron Rees <kevron.m.rees@intel.com>
Date: Mon, 14 Oct 2013 16:29:54 -0700
Subject: [PATCH] changes to make plugin work with latest amb

Change-Id: I80a73d7636012da4292805a3aec4e49fd2fd9df6
---
 CMakeLists.txt                    | 4 ++--
 packaging/ico-vic-amb-plugin.spec | 3 ++-
 src/ambinterface.cc               | 2 +-
 src/ambinterface.h                | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a7efd2..1329d96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,8 @@ pkg_check_modules(ambd REQUIRED automotive-message-broker)
 
 add_definitions(-std=c++0x)
 
-set(include_dirs ${libtool_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${json_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/lib /usr/include/amb)
-set(link_libraries -lamb ${libtool_LIBRARY} ${json_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib)
+set(include_dirs ${libtool_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${json_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/lib ${ambd_INCLUDE_DIRS})
+set(link_libraries ${ambd_LIBRARIES} ${libtool_LIBRARY} ${json_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib)
 
 set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION})
 add_custom_target(dist COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
diff --git a/packaging/ico-vic-amb-plugin.spec b/packaging/ico-vic-amb-plugin.spec
index 8e5b106..02f62eb 100644
--- a/packaging/ico-vic-amb-plugin.spec
+++ b/packaging/ico-vic-amb-plugin.spec
@@ -13,8 +13,9 @@ Requires:  ico-uxf-utilities
 BuildRequires:  cmake
 BuildRequires:  boost-devel
 BuildRequires:  libjson-devel
-BuildRequires:  automotive-message-broker-devel >= 0.6.9
+BuildRequires:  automotive-message-broker-devel >= 0.10.0
 BuildRequires:  ico-uxf-utilities-devel
+BuildRequires:  ico-uxf-utilities
 
 %description 
 Collection of plugins for automotive-message-broker
diff --git a/src/ambinterface.cc b/src/ambinterface.cc
index 50c9d20..80e8e6a 100644
--- a/src/ambinterface.cc
+++ b/src/ambinterface.cc
@@ -141,7 +141,7 @@ AMBIF::supportedOperations()
     return Get | Set;
 }
 
-string
+const string
 AMBIF::uuid()
 {
     return "f68f8b9a-fafb-4284-8ced-b45b5d720185";
diff --git a/src/ambinterface.h b/src/ambinterface.h
index 883a055..4ee41e9 100644
--- a/src/ambinterface.h
+++ b/src/ambinterface.h
@@ -96,7 +96,7 @@ public:
      *
      * @return UUID
      */
-    string
+    const string
     uuid();
     /**
      * AMBIF class is received the vehicle information that other plugin updated.
-- 
2.7.4