From 932dc364870c4d29b06bdfc8c7725b2409967c12 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 21 Dec 2008 17:04:40 +0000 Subject: Change configuration header name to something less likely to conflict. git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@1887 a436a847-0d15-0410-975c-d299462d15a1 --- src/GladeFile.hpp | 2 +- src/JackDbusDriver.cpp | 2 +- src/JackDriver.cpp | 2 +- src/Patchage.cpp | 2 +- src/Patchage.hpp | 2 +- src/PatchageCanvas.cpp | 2 +- src/PatchageCanvas.hpp | 2 +- src/PatchageEvent.cpp | 2 +- src/PatchageEvent.hpp | 2 +- src/PatchageModule.hpp | 2 +- src/PatchagePort.hpp | 2 +- src/PortID.hpp | 2 +- wscript | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/GladeFile.hpp b/src/GladeFile.hpp index 2d868ed..159f568 100644 --- a/src/GladeFile.hpp +++ b/src/GladeFile.hpp @@ -23,7 +23,7 @@ #include #include #include -#include "config.h" +#include "wafconfig.h" #include "binary_location.h" class GladeFile { diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp index df66cce..a5f2ddc 100644 --- a/src/JackDbusDriver.cpp +++ b/src/JackDbusDriver.cpp @@ -22,7 +22,7 @@ #include #include -#include "config.h" +#include "wafconfig.h" #include #include diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp index 8e9b78f..3af7740 100644 --- a/src/JackDriver.cpp +++ b/src/JackDriver.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "config.h" +#include "wafconfig.h" #include #include #include diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 463e4e1..42895dd 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -24,7 +24,7 @@ #include #include "raul/SharedPtr.hpp" -#include "config.h" +#include "wafconfig.h" #include "GladeFile.hpp" #if defined(HAVE_JACK_DBUS) #include "JackDbusDriver.hpp" diff --git a/src/Patchage.hpp b/src/Patchage.hpp index 199fb45..429249a 100644 --- a/src/Patchage.hpp +++ b/src/Patchage.hpp @@ -22,7 +22,7 @@ #include #include #include -#include "config.h" +#include "wafconfig.h" #include "Widget.hpp" class PatchageCanvas; diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp index 31f35f4..84bb5c1 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -16,7 +16,7 @@ */ #include "raul/SharedPtr.hpp" -#include "config.h" +#include "wafconfig.h" #include "PatchageCanvas.hpp" #include "Patchage.hpp" #if defined(HAVE_JACK_DBUS) diff --git a/src/PatchageCanvas.hpp b/src/PatchageCanvas.hpp index 4d2b903..19b83f3 100644 --- a/src/PatchageCanvas.hpp +++ b/src/PatchageCanvas.hpp @@ -18,7 +18,7 @@ #ifndef PATCHAGE_PATCHAGECANVAS_HPP #define PATCHAGE_PATCHAGECANVAS_HPP -#include "config.h" +#include "wafconfig.h" #include #ifdef HAVE_ALSA #include diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp index 6b14fd0..9cb7963 100644 --- a/src/PatchageEvent.cpp +++ b/src/PatchageEvent.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include "wafconfig.h" #include "raul/SharedPtr.hpp" #include "Patchage.hpp" #include "PatchageCanvas.hpp" diff --git a/src/PatchageEvent.hpp b/src/PatchageEvent.hpp index d1e59a6..d26d57c 100644 --- a/src/PatchageEvent.hpp +++ b/src/PatchageEvent.hpp @@ -18,7 +18,7 @@ #ifndef PATCHAGE_PATCHAGEEVENT_HPP #define PATCHAGE_PATCHAGEEVENT_HPP -#include "config.h" +#include "wafconfig.h" #include #ifdef USE_LIBJACK #include diff --git a/src/PatchageModule.hpp b/src/PatchageModule.hpp index c2789fa..ce41d9c 100644 --- a/src/PatchageModule.hpp +++ b/src/PatchageModule.hpp @@ -18,7 +18,7 @@ #ifndef PATCHAGE_PATCHAGEMODULE_HPP #define PATCHAGE_PATCHAGEMODULE_HPP -#include "config.h" +#include "wafconfig.h" #include #include #ifdef HAVE_ALSA diff --git a/src/PatchagePort.hpp b/src/PatchagePort.hpp index 2b4843e..f798329 100644 --- a/src/PatchagePort.hpp +++ b/src/PatchagePort.hpp @@ -18,7 +18,7 @@ #ifndef PATCHAGE_PATCHAGEPORT_HPP #define PATCHAGE_PATCHAGEPORT_HPP -#include "config.h" +#include "wafconfig.h" #include #include #include "flowcanvas/Port.hpp" diff --git a/src/PortID.hpp b/src/PortID.hpp index 7d76d7a..e2e4802 100644 --- a/src/PortID.hpp +++ b/src/PortID.hpp @@ -18,7 +18,7 @@ #ifndef PATCHAGE_PORTID_HPP #define PATCHAGE_PORTID_HPP -#include "config.h" +#include "wafconfig.h" #include #ifdef USE_LIBJACK diff --git a/wscript b/wscript index 4c3b266..c14ca21 100644 --- a/wscript +++ b/wscript @@ -87,7 +87,7 @@ def configure(conf): conf.define('PATCHAGE_DATA_DIR', os.path.normpath( conf.env['DATADIR'] + conf.env['APP_INSTALL_NAME'])) - conf.write_config_header('config.h') + conf.write_config_header('wafconfig.h') autowaf.print_summary(conf) autowaf.display_header('Patchage Configuration') -- cgit v1.2.1