Fixed pkgconfig and header issues

diff --git a/.kdev4/nobdy2.kdev4 b/.kdev4/nobdy2.kdev4
index 3ee9c66..d21efb0 100644 (file)
--- a/.kdev4/nobdy2.kdev4
+++ b/.kdev4/nobdy2.kdev4
@@ -5,7 +5,7 @@ BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x00)
 BuildDirs[$e]=$HOME/src/automotive-message-broker/build
 CMakeDir=/usr/share/cmake-2.8/Modules
 Current CMake Binary=file:///usr/bin/cmake
-CurrentBuildDir=file:///home/kev/src/automotive-message-broker/build
+CurrentBuildDir=file:///home/tripzero/src/automotive-message-broker/build
 CurrentBuildType=Release
 CurrentInstallDir=file:///usr/local
 Extra Arguments=

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 1c5fe11..c9becb8 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set(amb_sources steeringwheelangleproperty.cpp accelerationproperty.cpp enginecoolantproperty.cpp engineoilproperty.cpp fuelrangeproperty.cpp fuellevelproperty.cpp chime.cpp hornproperty.cpp interiorlightstatusproperty.cpp lightstatusproperty.cpp wheelbrakeproperty.cpp cruisecontrolstatus.cpp transmissiongearstatus.cpp tripmeterproperty.cpp fueleconomyproperty.cpp vehiclepowermodeproperty.cpp enginespeedproperty.cpp runningstatusinterface.cpp vehiclespeed.cpp abstractdbusinterface.cpp abstractproperty.cpp dbusinterfacemanager.cpp debugout.cpp)
-set(amb_headers_install abstractproperty.h vehiclespeed.h hornproperty.h interiorlightstatusproperty.h lightstatusproperty.h wheelbrakeproperty.h cruisecontrolstatus.h transmissiongearstatus.h tripmeterproperty.h fueleconomyproperty.h vehiclepowermodeproperty.h enginespeedproperty.h chime.h)
+set(amb_headers_install abstractdbusinterface.h abstractproperty.h vehiclespeed.h hornproperty.h interiorlightstatusproperty.h lightstatusproperty.h wheelbrakeproperty.h cruisecontrolstatus.h transmissiongearstatus.h tripmeterproperty.h fueleconomyproperty.h vehiclepowermodeproperty.h enginespeedproperty.h chime.h)
 include_directories( ${include_dirs} )
 add_library(amb SHARED ${amb_sources})
 

diff --git a/lib/abstractproperty.cpp b/lib/abstractproperty.cpp
index 4ec6ecc..111f2bd 100644 (file)
--- a/lib/abstractproperty.cpp
+++ b/lib/abstractproperty.cpp
@@ -18,9 +18,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 #include "abstractproperty.h"
+#include "abstractdbusinterface.h"
 
 AbstractProperty::AbstractProperty(string pn, string sig, Access access, AbstractDBusInterface* interface)
        : mPropertyName(pn), mSignature(sig), mAccess(access), mInterface(interface)
 {
        interface->addProperty(this);
 }
+
+void AbstractProperty::updateValue()
+{
+       mInterface->updateValue(this);
+}

diff --git a/lib/abstractproperty.h b/lib/abstractproperty.h
index 7a0d91e..bd3544e 100644 (file)
--- a/lib/abstractproperty.h
+++ b/lib/abstractproperty.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <boost/any.hpp>
 #include <glib.h>
 
-#include "abstractdbusinterface.h"
+class AbstractDBusInterface;
 
 using namespace std;
 
@@ -70,7 +70,7 @@ public:
        void setValue(T val)
        {
                mValue = val;
-               mInterface->updateValue(this);
+               updateValue();
        }
 
        template<typename T>
@@ -81,7 +81,7 @@ public:
        
 protected: ///methods:
 
-       
+       void updateValue();
        
 protected:
        

diff --git a/lib/automotive-message-broker.pc.in b/lib/automotive-message-broker.pc.in
index c7d0f5d..3c29429 100644 (file)
--- a/lib/automotive-message-broker.pc.in
+++ b/lib/automotive-message-broker.pc.in
@@ -1,11 +1,11 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@/amb
 
-Name: nobdy2
-Description: nobdy2 is awesome
-Version: 0.0.1
+Name: automotive-message-broker
+Description: 
+Version: @PROJECT_VERSION@
 Requires: gio-2.0 glib-2.0
-Libs: -L${libdir} -lnobdy
+Libs: -L${libdir} -lamb
 Cflags: -I${includedir}
\ No newline at end of file