summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/GladeFile.hpp2
-rw-r--r--src/JackDbusDriver.cpp2
-rw-r--r--src/JackDriver.cpp2
-rw-r--r--src/Patchage.cpp2
-rw-r--r--src/Patchage.hpp2
-rw-r--r--src/PatchageCanvas.cpp2
-rw-r--r--src/PatchageCanvas.hpp2
-rw-r--r--src/PatchageEvent.cpp2
-rw-r--r--src/PatchageEvent.hpp2
-rw-r--r--src/PatchageModule.hpp2
-rw-r--r--src/PatchagePort.hpp2
-rw-r--r--src/PortID.hpp2
-rw-r--r--wscript4
13 files changed, 14 insertions, 14 deletions
diff --git a/src/GladeFile.hpp b/src/GladeFile.hpp
index 159f568..5a0d812 100644
--- a/src/GladeFile.hpp
+++ b/src/GladeFile.hpp
@@ -23,7 +23,7 @@
#include <sstream>
#include <stdexcept>
#include <libglademm/xml.h>
-#include "wafconfig.h"
+#include "patchage-config.h"
#include "binary_location.h"
class GladeFile {
diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp
index a5f2ddc..0d0cf11 100644
--- a/src/JackDbusDriver.cpp
+++ b/src/JackDbusDriver.cpp
@@ -22,7 +22,7 @@
#include <set>
#include <iostream>
-#include "wafconfig.h"
+#include "patchage-config.h"
#include <glib.h>
#include <dbus/dbus.h>
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index 3af7740..a0f1616 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -20,7 +20,7 @@
#include <string>
#include <set>
#include <iostream>
-#include "wafconfig.h"
+#include "patchage-config.h"
#include <jack/jack.h>
#include <jack/statistics.h>
#include <jack/thread.h>
diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index 42895dd..fc7c6b4 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -24,7 +24,7 @@
#include <gtk/gtkwindow.h>
#include "raul/SharedPtr.hpp"
-#include "wafconfig.h"
+#include "patchage-config.h"
#include "GladeFile.hpp"
#if defined(HAVE_JACK_DBUS)
#include "JackDbusDriver.hpp"
diff --git a/src/Patchage.hpp b/src/Patchage.hpp
index 429249a..9aeedd0 100644
--- a/src/Patchage.hpp
+++ b/src/Patchage.hpp
@@ -22,7 +22,7 @@
#include <boost/shared_ptr.hpp>
#include <libgnomecanvasmm.h>
#include <libglademm/xml.h>
-#include "wafconfig.h"
+#include "patchage-config.h"
#include "Widget.hpp"
class PatchageCanvas;
diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp
index 84bb5c1..10fe33e 100644
--- a/src/PatchageCanvas.cpp
+++ b/src/PatchageCanvas.cpp
@@ -16,7 +16,7 @@
*/
#include "raul/SharedPtr.hpp"
-#include "wafconfig.h"
+#include "patchage-config.h"
#include "PatchageCanvas.hpp"
#include "Patchage.hpp"
#if defined(HAVE_JACK_DBUS)
diff --git a/src/PatchageCanvas.hpp b/src/PatchageCanvas.hpp
index 19b83f3..0687bac 100644
--- a/src/PatchageCanvas.hpp
+++ b/src/PatchageCanvas.hpp
@@ -18,7 +18,7 @@
#ifndef PATCHAGE_PATCHAGECANVAS_HPP
#define PATCHAGE_PATCHAGECANVAS_HPP
-#include "wafconfig.h"
+#include "patchage-config.h"
#include <string>
#ifdef HAVE_ALSA
#include <alsa/asoundlib.h>
diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp
index 9cb7963..63fa029 100644
--- a/src/PatchageEvent.cpp
+++ b/src/PatchageEvent.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "wafconfig.h"
+#include "patchage-config.h"
#include "raul/SharedPtr.hpp"
#include "Patchage.hpp"
#include "PatchageCanvas.hpp"
diff --git a/src/PatchageEvent.hpp b/src/PatchageEvent.hpp
index d26d57c..c567a9c 100644
--- a/src/PatchageEvent.hpp
+++ b/src/PatchageEvent.hpp
@@ -18,7 +18,7 @@
#ifndef PATCHAGE_PATCHAGEEVENT_HPP
#define PATCHAGE_PATCHAGEEVENT_HPP
-#include "wafconfig.h"
+#include "patchage-config.h"
#include <cstring>
#ifdef USE_LIBJACK
#include <jack/jack.h>
diff --git a/src/PatchageModule.hpp b/src/PatchageModule.hpp
index ce41d9c..e21f67d 100644
--- a/src/PatchageModule.hpp
+++ b/src/PatchageModule.hpp
@@ -18,7 +18,7 @@
#ifndef PATCHAGE_PATCHAGEMODULE_HPP
#define PATCHAGE_PATCHAGEMODULE_HPP
-#include "wafconfig.h"
+#include "patchage-config.h"
#include <string>
#include <libgnomecanvasmm.h>
#ifdef HAVE_ALSA
diff --git a/src/PatchagePort.hpp b/src/PatchagePort.hpp
index f798329..caabfb8 100644
--- a/src/PatchagePort.hpp
+++ b/src/PatchagePort.hpp
@@ -18,7 +18,7 @@
#ifndef PATCHAGE_PATCHAGEPORT_HPP
#define PATCHAGE_PATCHAGEPORT_HPP
-#include "wafconfig.h"
+#include "patchage-config.h"
#include <string>
#include <boost/shared_ptr.hpp>
#include "flowcanvas/Port.hpp"
diff --git a/src/PortID.hpp b/src/PortID.hpp
index e2e4802..5d3f636 100644
--- a/src/PortID.hpp
+++ b/src/PortID.hpp
@@ -18,7 +18,7 @@
#ifndef PATCHAGE_PORTID_HPP
#define PATCHAGE_PORTID_HPP
-#include "wafconfig.h"
+#include "patchage-config.h"
#include <cstring>
#ifdef USE_LIBJACK
diff --git a/wscript b/wscript
index 6d6ddac..891da6f 100644
--- a/wscript
+++ b/wscript
@@ -87,7 +87,7 @@ def configure(conf):
conf.define('PATCHAGE_DATA_DIR', os.path.join(
conf.env['DATADIR'], conf.env['APP_INSTALL_NAME']))
- conf.write_config_header('wafconfig.h')
+ conf.write_config_header('patchage-config.h')
autowaf.print_summary(conf)
autowaf.display_header('Patchage Configuration')
@@ -102,7 +102,7 @@ def configure(conf):
def build(bld):
# Program
prog = bld.new_task_gen('cxx', 'program')
- prog.includes = 'src' # make waf dependency tracking work
+ prog.includes = ['.', 'src']
prog.target = bld.env['APP_INSTALL_NAME']
prog.install_path = '${BINDIR}'
autowaf.use_lib(bld, prog, 'DBUS FLOWCANVAS GLADEMM DBUS_GLIB GNOMECANVASMM GTHREAD RAUL')