summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-12-21 17:04:40 +0000
committerDavid Robillard <d@drobilla.net>2008-12-21 17:04:40 +0000
commit62ad851a3614c64207961dcc26ddce052ae9f573 (patch)
tree108d2d3abbbcd8ccd54937c4f39b681a2339c636
parent119bbf863ba8ec16a38ed7eb9e4d2b5476793cb4 (diff)
downloadingen-62ad851a3614c64207961dcc26ddce052ae9f573.tar.gz
ingen-62ad851a3614c64207961dcc26ddce052ae9f573.tar.bz2
ingen-62ad851a3614c64207961dcc26ddce052ae9f573.zip
Change configuration header name to something less likely to conflict.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1887 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/client/NodeModel.cpp2
-rw-r--r--src/client/PluginModel.cpp2
-rw-r--r--src/client/PluginModel.hpp2
-rw-r--r--src/client/client.cpp2
-rw-r--r--src/engine/AudioBuffer.cpp2
-rw-r--r--src/engine/EventBuffer.cpp2
-rw-r--r--src/engine/InternalPlugin.hpp2
-rw-r--r--src/engine/JackAudioDriver.cpp2
-rw-r--r--src/engine/LV2Info.hpp2
-rw-r--r--src/engine/LV2Plugin.hpp2
-rw-r--r--src/engine/NodeFactory.cpp2
-rw-r--r--src/engine/NodeFactory.hpp2
-rw-r--r--src/engine/OSCEngineReceiver.cpp2
-rw-r--r--src/engine/PatchPlugin.hpp2
-rw-r--r--src/engine/events.hpp2
-rw-r--r--src/engine/util.hpp2
-rw-r--r--src/gui/App.cpp2
-rw-r--r--src/gui/ConnectWindow.cpp2
-rw-r--r--src/gui/ConnectWindow.hpp2
-rw-r--r--src/gui/GladeFactory.cpp2
-rw-r--r--src/gui/NodeModule.cpp2
-rw-r--r--src/gui/PatchCanvas.cpp2
-rw-r--r--src/gui/PatchCanvas.hpp2
-rw-r--r--src/gui/WindowFactory.cpp2
-rw-r--r--src/ingen/main.cpp2
-rw-r--r--src/module/Module.cpp2
-rw-r--r--src/module/World.hpp2
-rw-r--r--src/module/global.cpp2
-rw-r--r--src/shared/LV2Features.hpp2
-rw-r--r--src/shared/LV2URIMap.hpp2
-rw-r--r--src/shared/runtime_paths.cpp2
-rw-r--r--wscript2
32 files changed, 32 insertions, 32 deletions
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 5b1f6ce8..c23bac29 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include <cmath>
-#include "config.h"
+#include "wafconfig.h"
#include "interface/Port.hpp"
#include "NodeModel.hpp"
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index e5ec1d5c..3d6aaae9 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -16,7 +16,7 @@
*/
#include <sstream>
-#include "config.h"
+#include "wafconfig.h"
#include "raul/Path.hpp"
#include "raul/Atom.hpp"
#include "PluginModel.hpp"
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index c93f5fda..41ed0d93 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -18,7 +18,7 @@
#ifndef PLUGINMODEL_H
#define PLUGINMODEL_H
-#include "config.h"
+#include "wafconfig.h"
#include <string>
#include <iostream>
#include "raul/SharedPtr.hpp"
diff --git a/src/client/client.cpp b/src/client/client.cpp
index 88ff07aa..60e4f819 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
+#include "wafconfig.h"
#include <iostream>
#include "client.hpp"
diff --git a/src/engine/AudioBuffer.cpp b/src/engine/AudioBuffer.cpp
index 6456bb73..2fc1b234 100644
--- a/src/engine/AudioBuffer.cpp
+++ b/src/engine/AudioBuffer.cpp
@@ -18,7 +18,7 @@
#include <iostream>
#include <cassert>
#include <stdlib.h>
-#include "config.h"
+#include "wafconfig.h"
#include "AudioBuffer.hpp"
using namespace std;
diff --git a/src/engine/EventBuffer.cpp b/src/engine/EventBuffer.cpp
index 26ad38de..4c850c05 100644
--- a/src/engine/EventBuffer.cpp
+++ b/src/engine/EventBuffer.cpp
@@ -18,7 +18,7 @@
#define __STDC_LIMIT_MACROS 1
#include <stdint.h>
#include <iostream>
-#include "config.h"
+#include "wafconfig.h"
#include "EventBuffer.hpp"
#include "lv2ext/lv2_event.h"
#include "lv2ext/lv2_event_helpers.h"
diff --git a/src/engine/InternalPlugin.hpp b/src/engine/InternalPlugin.hpp
index 059f3699..9948a55e 100644
--- a/src/engine/InternalPlugin.hpp
+++ b/src/engine/InternalPlugin.hpp
@@ -18,7 +18,7 @@
#ifndef INTERNALPLUGIN_H
#define INTERNALPLUGIN_H
-#include "config.h"
+#include "wafconfig.h"
#ifndef HAVE_SLV2
#error "This file requires SLV2, but HAVE_SLV2 is not defined. Please report."
diff --git a/src/engine/JackAudioDriver.cpp b/src/engine/JackAudioDriver.cpp
index fddbcd94..eb459179 100644
--- a/src/engine/JackAudioDriver.cpp
+++ b/src/engine/JackAudioDriver.cpp
@@ -16,7 +16,7 @@
*/
#include "JackAudioDriver.hpp"
-#include "config.h"
+#include "wafconfig.h"
#include "tuning.hpp"
#include <iostream>
#include <cstdlib>
diff --git a/src/engine/LV2Info.hpp b/src/engine/LV2Info.hpp
index 0cb1b986..186fa006 100644
--- a/src/engine/LV2Info.hpp
+++ b/src/engine/LV2Info.hpp
@@ -18,7 +18,7 @@
#ifndef LV2INFO_H
#define LV2INFO_H
-#include "config.h"
+#include "wafconfig.h"
#ifndef HAVE_SLV2
#error "This file requires SLV2, but HAVE_SLV2 is not defined. Please report."
#endif
diff --git a/src/engine/LV2Plugin.hpp b/src/engine/LV2Plugin.hpp
index 694c3167..af1072fd 100644
--- a/src/engine/LV2Plugin.hpp
+++ b/src/engine/LV2Plugin.hpp
@@ -18,7 +18,7 @@
#ifndef LV2PLUGIN_H
#define LV2PLUGIN_H
-#include "config.h"
+#include "wafconfig.h"
#ifndef HAVE_SLV2
#error "This file requires SLV2, but HAVE_SLV2 is not defined. Please report."
diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp
index d7a8b887..a73811ec 100644
--- a/src/engine/NodeFactory.cpp
+++ b/src/engine/NodeFactory.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
+#include "wafconfig.h"
#include <cstdlib>
#include <pthread.h>
#include <dirent.h>
diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp
index 430c230b..a5b7702a 100644
--- a/src/engine/NodeFactory.hpp
+++ b/src/engine/NodeFactory.hpp
@@ -18,7 +18,7 @@
#ifndef NODEFACTORY_H
#define NODEFACTORY_H
-#include "config.h"
+#include "wafconfig.h"
#include "module/global.hpp"
#include <list>
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index e7a5daae..405e3abe 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -21,7 +21,7 @@
#include <cstdlib>
#include <string>
#include <lo/lo.h>
-#include "config.h"
+#include "wafconfig.h"
#include "raul/SharedPtr.hpp"
#include "raul/AtomLiblo.hpp"
#include "interface/ClientInterface.hpp"
diff --git a/src/engine/PatchPlugin.hpp b/src/engine/PatchPlugin.hpp
index 27fd93b5..33ac924c 100644
--- a/src/engine/PatchPlugin.hpp
+++ b/src/engine/PatchPlugin.hpp
@@ -18,7 +18,7 @@
#ifndef PATCHPLUGIN_H
#define PATCHPLUGIN_H
-#include "config.h"
+#include "wafconfig.h"
#include <string>
#include "PluginImpl.hpp"
diff --git a/src/engine/events.hpp b/src/engine/events.hpp
index a68e72f8..b050a2ad 100644
--- a/src/engine/events.hpp
+++ b/src/engine/events.hpp
@@ -18,7 +18,7 @@
#ifndef EVENTS_H
#define EVENTS_H
-#include "config.h"
+#include "wafconfig.h"
#include "events/AllNotesOffEvent.hpp"
#include "events/ClearPatchEvent.hpp"
diff --git a/src/engine/util.hpp b/src/engine/util.hpp
index 6e14a224..e48a6a1a 100644
--- a/src/engine/util.hpp
+++ b/src/engine/util.hpp
@@ -18,7 +18,7 @@
#ifndef UTIL_HPP
#define UTIL_HPP
-#include "config.h"
+#include "wafconfig.h"
#include <iostream>
#include <cstdlib>
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index c9ab363d..acccc9be 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
+#include "wafconfig.h"
#include "App.hpp"
#include <cassert>
#include <string>
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index ae0153c6..a7a5186a 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -22,7 +22,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include "raul/Process.hpp"
-#include "config.h"
+#include "wafconfig.h"
#include "interface/EngineInterface.hpp"
#include "module/World.hpp"
#include "engine/tuning.hpp"
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index d78bcd39..4b9de5f6 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -18,7 +18,7 @@
#ifndef CONNECT_WINDOW_H
#define CONNECT_WINDOW_H
-#include "config.h"
+#include "wafconfig.h"
#ifdef HAVE_SLV2
#include "slv2/slv2.h"
diff --git a/src/gui/GladeFactory.cpp b/src/gui/GladeFactory.cpp
index 792e67ac..92cb1714 100644
--- a/src/gui/GladeFactory.cpp
+++ b/src/gui/GladeFactory.cpp
@@ -18,7 +18,7 @@
#include "GladeFactory.hpp"
#include <iostream>
#include <fstream>
-#include "config.h"
+#include "wafconfig.h"
#include "shared/runtime_paths.hpp"
using namespace std;
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 846c5736..d253f3a0 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -16,7 +16,7 @@
*/
#include <cassert>
-#include "config.h"
+#include "wafconfig.h"
#include "raul/Atom.hpp"
#include "interface/EngineInterface.hpp"
#include "client/PatchModel.hpp"
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 0360d989..b8dd22fc 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
+#include "wafconfig.h"
#include "module/global.hpp"
#include "module/World.hpp"
diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp
index f435eadc..b3019854 100644
--- a/src/gui/PatchCanvas.hpp
+++ b/src/gui/PatchCanvas.hpp
@@ -21,7 +21,7 @@
#include <string>
#include <map>
#include <boost/shared_ptr.hpp>
-#include "config.h"
+#include "wafconfig.h"
#include "flowcanvas/Canvas.hpp"
#include "flowcanvas/Module.hpp"
#include "raul/SharedPtr.hpp"
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index 7709273b..b7c69810 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
+#include "wafconfig.h"
#include "client/PatchModel.hpp"
#include "App.hpp"
#include "GladeFactory.hpp"
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index e2490bbd..94f20aef 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
+#include "wafconfig.h"
#include <iostream>
#include <string>
#include <signal.h>
diff --git a/src/module/Module.cpp b/src/module/Module.cpp
index 100bb956..ef81996f 100644
--- a/src/module/Module.cpp
+++ b/src/module/Module.cpp
@@ -21,7 +21,7 @@
#include <glibmm/module.h>
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
-#include "config.h"
+#include "wafconfig.h"
#include "raul/SharedPtr.hpp"
#include "shared/runtime_paths.hpp"
diff --git a/src/module/World.hpp b/src/module/World.hpp
index d8935fa5..1d073cd2 100644
--- a/src/module/World.hpp
+++ b/src/module/World.hpp
@@ -18,7 +18,7 @@
#ifndef INGEN_WORLD_HPP
#define INGEN_WORLD_HPP
-#include "config.h"
+#include "wafconfig.h"
#include <string>
#include <glibmm/module.h>
diff --git a/src/module/global.cpp b/src/module/global.cpp
index 47894be4..9eff703a 100644
--- a/src/module/global.cpp
+++ b/src/module/global.cpp
@@ -20,7 +20,7 @@
#include "global.hpp"
#include "World.hpp"
-#include "config.h"
+#include "wafconfig.h"
#ifdef HAVE_SLV2
#include "slv2/slv2.h"
#endif
diff --git a/src/shared/LV2Features.hpp b/src/shared/LV2Features.hpp
index ef39c6b9..d4933d09 100644
--- a/src/shared/LV2Features.hpp
+++ b/src/shared/LV2Features.hpp
@@ -18,7 +18,7 @@
#ifndef LV2FEATURES_HPP
#define LV2FEATURES_HPP
-#include "config.h"
+#include "wafconfig.h"
#ifndef HAVE_SLV2
#error "This file requires SLV2, but HAVE_SLV2 is not defined. Please report."
#endif
diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp
index a6642c28..333d22e9 100644
--- a/src/shared/LV2URIMap.hpp
+++ b/src/shared/LV2URIMap.hpp
@@ -18,7 +18,7 @@
#ifndef LV2URIMAP_HPP
#define LV2URIMAP_HPP
-#include "config.h"
+#include "wafconfig.h"
#ifndef HAVE_SLV2
#error "This file requires SLV2, but HAVE_SLV2 is not defined. Please report."
#endif
diff --git a/src/shared/runtime_paths.cpp b/src/shared/runtime_paths.cpp
index 1e9c3663..e2641b9c 100644
--- a/src/shared/runtime_paths.cpp
+++ b/src/shared/runtime_paths.cpp
@@ -16,7 +16,7 @@
*/
#include <iostream>
-#include "config.h"
+#include "wafconfig.h"
#include "runtime_paths.hpp"
#include <glibmm/module.h>
diff --git a/wscript b/wscript
index ed0147f5..6ee5de4d 100644
--- a/wscript
+++ b/wscript
@@ -63,7 +63,7 @@ def configure(conf):
conf.define('INGEN_MODULE_DIR', os.path.normpath(
conf.env['LIBDIR'] + 'ingen'))
- conf.write_config_header('config.h')
+ conf.write_config_header('wafconfig.h')
autowaf.print_summary(conf)
autowaf.display_header('Ingen Configuration')