X-Git-Url: http://git.maemo.org/git/?p=vicar;a=blobdiff_plain;f=src%2Fvicar-lib%2Fvicar-lib.pro;fp=src%2Fvicar-lib%2Fvicar-lib.pro;h=725dd40e7eb3d25db1daa3320c3a3805364dcafc;hp=543e1e168a8917f2a54d913fad4fd438b23ee09a;hb=38440679f13b8dc528a9aff93cbf4935011fdb22;hpb=89f0017e6a73945ea83247472a6fa07d6ee536b5

diff --git a/src/vicar-lib/vicar-lib.pro b/src/vicar-lib/vicar-lib.pro
index 543e1e1..725dd40 100755
--- a/src/vicar-lib/vicar-lib.pro
+++ b/src/vicar-lib/vicar-lib.pro
@@ -1,42 +1,46 @@
-INCLUDEPATH += /usr/include/gconf/2 \
-    /usr/include/glib-2.0 \
-    /usr/lib/glib-2.0/include
-#QMAKE_LIBDIR=./
-LIBS += /usr/lib/libgconf-2.so
-CONFIG += qt debug staticlib
+CONFIG += link_pkgconfig
+PKGCONFIG += glib-2.0 gconf-2.0
+
+contains(MEEGO_EDITION,harmattan){
+   DEFINES += Q_WS_MAEMO_6
+   PKGCONFIG += accounts-qt
+}
+
+CONFIG += qt debug staticlib core xml
 CONFIG -= gui
 QT += dbus sql
 QT -= gui
+
 TARGET = vicar
 TEMPLATE = lib
-VPATH += src
-MOC_DIR = mocs
-OBJECTS_DIR = objs
+VPATH += cpp
+MOC_DIR = cpp/.mocs
+OBJECTS_DIR = cpp/.objs
 DESTDIR = ../lib
 
-SOURCES += src/dbusutility.cpp \
-    src/gconfutility.cpp \
-    src/telepathyutility.cpp \
-    src/accountmanagerproxy.cpp \
-    src/accountproxy.cpp \
-    src/accountcompatproxy.cpp \
-    src/connifacereqproxy.cpp \
-    src/connectioninterfacerequeststypes.cpp \
-    src/databaseutility.cpp
-HEADERS += src/dbusutility.h \
-    src/gconfutility.h \
-    src/telepathyutility.h \
-    src/accountmanagerproxy.h \
-    src/accountproxy.h \
-    src/accountcompatproxy.h \
-    src/connifacereqproxy.h \
-    src/connectioninterfacerequeststypes.h \
-    src/databaseutility.h \
-    src/vicarprofiletypes.h
-
-#MAKE INSTALL
-INSTALLDIR = /../../debian/vicar
+SOURCES += cpp/dbusutility.cpp \
+    cpp/gconfutility.cpp \
+    cpp/telepathyutility.cpp \
+    cpp/accountmanagerproxy.cpp \
+    cpp/accountproxy.cpp \
+    cpp/accountcompatproxy.cpp \
+    cpp/connifacereqproxy.cpp \
+    cpp/connectioninterfacerequeststypes.cpp \
+    cpp/databaseutility.cpp \
+    cpp/harmattanaccountutility.cpp
+HEADERS += cpp/dbusutility.h \
+    cpp/gconfutility.h \
+    cpp/telepathyutility.h \
+    cpp/accountmanagerproxy.h \
+    cpp/accountproxy.h \
+    cpp/accountcompatproxy.h \
+    cpp/connifacereqproxy.h \
+    cpp/connectioninterfacerequeststypes.h \
+    cpp/databaseutility.h \
+    cpp/vicarprofiletypes.h \
+    cpp/logutility.h \
+    cpp/harmattanaccountutility.h
 
 INSTALLS += target
+target.path =/opt/vicar/lib
 
-target.path =$$INSTALLDIR/opt/lib