OTHER: Remove some cruft and clean up build system

src/SkinChooser.cpp

@@ -26,6 +26,8 @@
 
 #include <QtDebug>
 
+#include "promoe_config.h"
+
 SkinChooser::SkinChooser (QWidget *parent) : QDialog (parent)
 {
 
@@ -75,7 +77,7 @@ SkinList::SkinList (QWidget *parent) : QListWidget (parent)
 		settings.setValue ("skin/searchpath", searchpath);
 	}
 	// This should not be saved in the searchpath config value.
-	searchpath.append (DATADIR "/skins");
+	searchpath.append (PROMOE_SKINDIR);
 
 	QDir d;
 	d.setFilter (QDir::AllDirs|QDir::NoDotAndDotDot|QDir::Files);

src/mainwindow/textscroller.cpp

@@ -28,6 +28,8 @@
 
 #include <application.h>
 
+#include "promoe_config.h"
+
 TextScroller::TextScroller (QWidget *parent, uint w,
                             uint h, const QString &name) : QWidget (parent)
 {

src/playlist/playlistshade.cpp

@@ -26,6 +26,8 @@
 #include <QPainter>
 #include <QPoint>
 
+#include "promoe_config.h"
+
 PlaylistShade::PlaylistShade (PlaylistWindow *parent) : QWidget (parent)
 {
 	QSettings s;

src/wscript

@@ -93,13 +93,14 @@ def build(bld):
 
     sources.append("../data/Almond-blue.qrc")
 
-    obj = bld.new_task_gen('qt4', 'program', 'cxx')
-    obj.target = 'promoe'
-    obj.includes = bld_subdirs
-    obj.includes.append('.')
-#    obj.includes.append('../lib')
-    obj.source= sources
-    obj.uselib_local = 'lib_promoe'
-    obj.uselib = 'QTCORE QTGUI AVAHI-CLIENT AVAHI-QT4'
+    incdirs = bld_subdirs
+    incdirs.append('.')
+
+    obj              = bld.new_task_gen('qt4', 'program', 'cxx')
+    obj.target       = 'promoe'
+    obj.includes     = incdirs
+    obj.source       = sources
+    obj.uselib_local = 'promoe_lib promoe_data'
+    obj.uselib       = 'QTCORE QTGUI AVAHI-CLIENT AVAHI-QT4'
     pass