X-Git-Url: http://git.maemo.org/git/?p=vicar;a=blobdiff_plain;f=src%2Fvicar-daemon%2Fvicar-daemon.pro;h=9ac1d4a1393f6ecf56a921cf871876b4b29e28f6;hp=f4c6e7807008aefad190cb7362fbf85962ecd35d;hb=2beca638f4ba146e25320c9c07cc1f29d0b2bba2;hpb=40b1207a3eb33b54e8ac780cabd4a68f7931f248

diff --git a/src/vicar-daemon/vicar-daemon.pro b/src/vicar-daemon/vicar-daemon.pro
old mode 100644
new mode 100755
index f4c6e78..9ac1d4a
--- a/src/vicar-daemon/vicar-daemon.pro
+++ b/src/vicar-daemon/vicar-daemon.pro
@@ -1,31 +1,42 @@
-INCLUDEPATH += /usr/include/gconf/2 \
-    /usr/include/glib-2.0 \
-    /usr/lib/glib-2.0/include
-INCLUDEPATH += ../vicar-lib/src
+contains(MEEGO_EDITION,harmattan){
+   DEFINES += Q_WS_MAEMO_6
+}
+
+INCLUDEPATH += ../vicar-lib/cpp
+
+CONFIG += link_pkgconfig
+PKGCONFIG += glib-2.0 gconf-2.0
 
-LIBS += /usr/lib/libgconf-2.so
 LIBS += ../lib/libvicar.a
 
-CONFIG += qt debug
-QT += dbus
+CONFIG += qt debug console
+CONFIG -= app_bundle
+
+QT += dbus sql
 QT -= gui
 TEMPLATE = app
 TARGET = vicar-daemon
+<<<<<<< HEAD
+
+VPATH += cpp
+MOC_DIR = cpp/.mocs
+OBJECTS_DIR = cpp/.objs
+
+=======
 CONFIG += console
 CONFIG -= app_bundle
 
-VPATH += src
-MOC_DIR = mocs
-OBJECTS_DIR = objs
+VPATH += cpp
+MOC_DIR = cpp/.mocs
+OBJECTS_DIR = cpp/.objs
 
-SOURCES += src/main.cpp \
-    src/callrouter.cpp
-HEADERS += src/callrouter.h
-
-#MAKE INSTALL
-INSTALLDIR = /../../debian/vicar
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
+SOURCES += cpp/main.cpp \
+    cpp/callrouter.cpp \
+    cpp/vicardbusadaptor.cpp
+HEADERS += cpp/callrouter.h \
+           cpp/vicardbusadaptor.h
 
 INSTALLS += target
-
-target.path =$$INSTALLDIR/opt/vicar
+target.path =/opt/vicar/bin