Version 0.7-0

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

diff --git a/src/vicar-telepathy/vicar-telepathy.pro b/src/vicar-telepathy/vicar-telepathy.pro
index 2522ef7..08b0fef 100644 (file)
--- a/src/vicar-telepathy/vicar-telepathy.pro
+++ b/src/vicar-telepathy/vicar-telepathy.pro
@@ -1,56 +1,53 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2010-06-22T19:17:05
-#
-#-------------------------------------------------
-
 #INCLUDEPATH += /usr/include/telepathy-1.0
 #LIBS += /usr/lib/libtelepathy-qt4.so
 
+exists($$QMAKE_INCDIR_QT"/../qmsystem2/qmkeys.h"){
+   DEFINES += Q_WS_MAEMO_6
+}
+
 QT       += dbus core
 QT       -= gui
 
 TARGET = vicar-telepathy
-CONFIG   += qt debug console
+CONFIG   += qt console
 CONFIG   -= app_bundle
 
+INCLUDEPATH += ../vicar-lib/cpp
+LIBS += ../lib/libvicar.a
+
 TEMPLATE = app
-VPATH += src
-MOC_DIR = mocs
-OBJECTS_DIR = objs
-SOURCES += src/main.cpp \
-    src/connectiontypes.cpp \
-    src/connectionmanagertypes.cpp \
-    src/connectionmanageradaptor.cpp \
-    src/connectionmanager.cpp \
-    src/connectionadaptor.cpp \
-    src/connection.cpp \
-    src/connectioninterfacerequeststypes.cpp \
-    src/connectioninterfacerequestsadaptor.cpp \
-    src/vicarcallrouterproxy.cpp \
-    src/connectioninterfacecapabilitiestypes.cpp \
-    src/connectioninterfacecapabilitiesadaptor.cpp
+VPATH += cpp
+MOC_DIR = cpp/.mocs
+OBJECTS_DIR = cpp/.objs
+SOURCES += cpp/main.cpp \
+    cpp/connectiontypes.cpp \
+    cpp/connectionmanagertypes.cpp \
+    cpp/connectionmanageradaptor.cpp \
+    cpp/connectionmanager.cpp \
+    cpp/connectionadaptor.cpp \
+    cpp/connection.cpp \
+    cpp/connectioninterfacerequeststypes.cpp \
+    cpp/connectioninterfacerequestsadaptor.cpp \
+    cpp/vicarcallrouterproxy.cpp \
+    cpp/connectioninterfacecapabilitiestypes.cpp \
+    cpp/connectioninterfacecapabilitiesadaptor.cpp
 
 # On device application depends on libtelepathy-qt4-0 (Not required now)
 
 HEADERS += \
-    src/names.h \
-    src/connectiontypes.h \
-    src/connectionmanagertypes.h \
-    src/connectionmanageradaptor.h \
-    src/connectionmanager.h \
-    src/connectionadaptor.h \
-    src/connection.h \
-    src/basetypes.h \
-    src/connectioninterfacerequeststypes.h \
-    src/connectioninterfacerequestsadaptor.h \
-    src/vicarcallrouterproxy.h \
-    src/connectioninterfacecapabilitiestypes.h \
-    src/connectioninterfacecapabilitiesadaptor.h
-
-#MAKE INSTALL
-INSTALLDIR = /../../debian/vicar
+    cpp/names.h \
+    cpp/connectiontypes.h \
+    cpp/connectionmanagertypes.h \
+    cpp/connectionmanageradaptor.h \
+    cpp/connectionmanager.h \
+    cpp/connectionadaptor.h \
+    cpp/connection.h \
+    cpp/basetypes.h \
+    cpp/connectioninterfacerequeststypes.h \
+    cpp/connectioninterfacerequestsadaptor.h \
+    cpp/vicarcallrouterproxy.h \
+    cpp/connectioninterfacecapabilitiestypes.h \
+    cpp/connectioninterfacecapabilitiesadaptor.h
 
 INSTALLS += target
-
-target.path =$$INSTALLDIR/opt/vicar
+target.path =/opt/vicar/bin