Fixed Merge issues

[vicar] / src / vicar-daemon / vicar-daemon.pro

diff --git a/src/vicar-daemon/vicar-daemon.pro b/src/vicar-daemon/vicar-daemon.pro
index 0984e63..f7134d9 100755 (executable)
--- a/src/vicar-daemon/vicar-daemon.pro
+++ b/src/vicar-daemon/vicar-daemon.pro
@@ -1,33 +1,32 @@
-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
+CONFIG += qt debug console
+CONFIG -= app_bundle
+
 QT += dbus sql
 QT -= gui
 TEMPLATE = app
 TARGET = vicar-daemon
-CONFIG += console
-CONFIG -= app_bundle
-
-VPATH += src
-MOC_DIR = mocs
-OBJECTS_DIR = objs
 
-SOURCES += src/main.cpp \
-    src/callrouter.cpp \
-    src/vicardbusadaptor.cpp
-HEADERS += src/callrouter.h \
-           src/vicardbusadaptor.h
+VPATH += cpp
+MOC_DIR = cpp/.mocs
+OBJECTS_DIR = cpp/.objs
 
-#MAKE INSTALL
-INSTALLDIR = /../../debian/vicar
+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