Version 0.7-0

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

diff --git a/src/vicar-config/vicar-config.pro b/src/vicar-config/vicar-config.pro
index 640b2a3..8d9af24 100755 (executable)
--- a/src/vicar-config/vicar-config.pro
+++ b/src/vicar-config/vicar-config.pro
@@ -1,31 +1,28 @@
-INCLUDEPATH += .
-INCLUDEPATH += /usr/include/gconf/2 \
-    /usr/include/glib-2.0 \
-    /usr/lib/glib-2.0/include
-INCLUDEPATH += ../vicar-lib/src
-LIBS += /usr/lib/libgconf-2.so
+#INCLUDEPATH += .
+INCLUDEPATH += ../vicar-lib/cpp
+
+CONFIG += link_pkgconfig
+PKGCONFIG += glib-2.0 gconf-2.0
+
 LIBS += ../lib/libvicar.a
-CONFIG += qt \
-    debug
+CONFIG += qt
 QT += dbus sql
 TEMPLATE = app
 TARGET = vicar-config
-VPATH += src \
+VPATH += cpp \
     uis
 UI_DIR = uis
-MOC_DIR = mocs
-OBJECTS_DIR = objs
+MOC_DIR = cpp/.mocs
+OBJECTS_DIR = cpp/.objs
 
 # Input
-HEADERS += profileswindow.h \
-    profilesettingsdialog.h
-FORMS += profileswindow.ui \
-    profilesettingsdialog.ui
-SOURCES += main.cpp \
-    profileswindow.cpp \
-    profilesettingsdialog.cpp
+HEADERS += cpp/profileswindow.h \
+    cpp/profilesettingsdialog.h
+FORMS += uis/profileswindow.ui \
+    uis/profilesettingsdialog.ui
+SOURCES += cpp/main.cpp \
+    cpp/profileswindow.cpp \
+    cpp/profilesettingsdialog.cpp
 
-# MAKE INSTALL
-INSTALLDIR = /../../debian/vicar
 INSTALLS += target
-target.path = $$INSTALLDIR/opt/vicar
+target.path = /opt/vicar/bin