From 063f33ee87cc4e13c83567ee4860ed08f8f0ee43 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 18 Jan 2012 01:55:56 +0000 Subject: Use consistent *_config.h rather than *-config.h. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3963 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/PluginModel.cpp | 2 +- src/client/ingen_client.cpp | 2 +- src/gui/ConnectWindow.cpp | 2 +- src/gui/LoadPluginWindow.cpp | 2 +- src/gui/LoadPluginWindow.hpp | 2 +- src/gui/PatchWindow.cpp | 2 +- src/gui/WindowFactory.cpp | 2 +- src/ingen/main.cpp | 2 +- src/osc/OSCClientReceiver.cpp | 2 +- src/osc/OSCEngineReceiver.cpp | 2 +- src/osc/OSCEngineReceiver.hpp | 2 +- src/osc/OSCSender.cpp | 2 +- src/server/EventBuffer.cpp | 2 +- src/server/JackDriver.cpp | 2 +- src/server/JackDriver.hpp | 2 +- src/server/ObjectBuffer.cpp | 2 +- src/server/internals/Note.cpp | 2 +- src/server/internals/Trigger.cpp | 2 +- src/server/util.hpp | 2 +- src/shared/runtime_paths.cpp | 2 +- wscript | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index 6f3c3ff8..3bb37e03 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -28,7 +28,7 @@ #include "ingen/client/PluginModel.hpp" #include "ingen/client/PluginUI.hpp" -#include "ingen-config.h" +#include "ingen_config.h" using namespace std; using namespace Raul; diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp index 2e3e2c74..cd021766 100644 --- a/src/client/ingen_client.cpp +++ b/src/client/ingen_client.cpp @@ -19,7 +19,7 @@ #include "ingen/shared/World.hpp" #include "raul/SharedPtr.hpp" -#include "ingen-config.h" +#include "ingen_config.h" using namespace Ingen; diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 6c5402f5..e7a0aba1 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -21,7 +21,7 @@ #include "raul/Process.hpp" #include "raul/log.hpp" -#include "ingen-config.h" +#include "ingen_config.h" #include "ingen/EngineBase.hpp" #include "ingen/ServerInterface.hpp" #include "ingen/client/ClientStore.hpp" diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index 238cf7cb..4869fff2 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -31,7 +31,7 @@ #include "PatchView.hpp" #include "PatchWindow.hpp" -#include "ingen-config.h" +#include "ingen_config.h" using namespace std; using namespace Raul; diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index 7029bdc3..7d5a56d5 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -25,7 +25,7 @@ #include "raul/SharedPtr.hpp" #include "raul/Table.hpp" -#include "ingen-config.h" +#include "ingen_config.h" #include "ingen/GraphObject.hpp" #include "ingen/client/ClientStore.hpp" diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp index e4f737cb..da0fe769 100644 --- a/src/gui/PatchWindow.cpp +++ b/src/gui/PatchWindow.cpp @@ -44,7 +44,7 @@ #include "PatchWindow.hpp" #include "ThreadedLoader.hpp" #include "WindowFactory.hpp" -#include "ingen-config.h" +#include "ingen_config.h" #ifdef HAVE_WEBKIT #include diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index 9f433ded..c60d493f 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -16,7 +16,7 @@ */ #include -#include "ingen-config.h" +#include "ingen_config.h" #include "ingen/client/PatchModel.hpp" #include "App.hpp" #include "WidgetFactory.hpp" diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index 4e7ba923..433a77bc 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -37,7 +37,7 @@ #include "serd/serd.h" #include "sord/sordmm.hpp" -#include "ingen-config.h" +#include "ingen_config.h" #include "ingen/EngineBase.hpp" #include "ingen/ServerInterface.hpp" diff --git a/src/osc/OSCClientReceiver.cpp b/src/osc/OSCClientReceiver.cpp index 4fef1d1c..249cf2a4 100644 --- a/src/osc/OSCClientReceiver.cpp +++ b/src/osc/OSCClientReceiver.cpp @@ -23,7 +23,7 @@ #include "raul/AtomLiblo.hpp" #include "raul/Path.hpp" -#include "ingen-config.h" +#include "ingen_config.h" #include "OSCClientReceiver.hpp" #define LOG(s) s << "[OSCClientReceiver] " diff --git a/src/osc/OSCEngineReceiver.cpp b/src/osc/OSCEngineReceiver.cpp index 254cc850..0f9ab151 100644 --- a/src/osc/OSCEngineReceiver.cpp +++ b/src/osc/OSCEngineReceiver.cpp @@ -27,7 +27,7 @@ #include "raul/SharedPtr.hpp" #include "raul/log.hpp" -#include "ingen-config.h" +#include "ingen_config.h" #include "ingen/ClientInterface.hpp" #include "ingen/ServerInterface.hpp" diff --git a/src/osc/OSCEngineReceiver.hpp b/src/osc/OSCEngineReceiver.hpp index 72388bc2..e0132626 100644 --- a/src/osc/OSCEngineReceiver.hpp +++ b/src/osc/OSCEngineReceiver.hpp @@ -27,7 +27,7 @@ #include "ingen/Resource.hpp" -#include "ingen-config.h" +#include "ingen_config.h" #include "macros.h" namespace Ingen { diff --git a/src/osc/OSCSender.cpp b/src/osc/OSCSender.cpp index 6c07551b..4528e721 100644 --- a/src/osc/OSCSender.cpp +++ b/src/osc/OSCSender.cpp @@ -22,7 +22,7 @@ #include "raul/log.hpp" #include "OSCSender.hpp" -#include "ingen-config.h" +#include "ingen_config.h" using namespace std; using namespace Raul; diff --git a/src/server/EventBuffer.cpp b/src/server/EventBuffer.cpp index 419f84ea..7f3c2b37 100644 --- a/src/server/EventBuffer.cpp +++ b/src/server/EventBuffer.cpp @@ -20,7 +20,7 @@ #include "raul/log.hpp" #include "lv2/lv2plug.in/ns/ext/event/event.h" #include "lv2/lv2plug.in/ns/ext/event/event-helpers.h" -#include "ingen-config.h" +#include "ingen_config.h" #include "EventBuffer.hpp" #include "ProcessContext.hpp" diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index 0f77a2c7..2979a449 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "ingen-config.h" +#include "ingen_config.h" #include #include diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp index 32fb4f3e..b810a76d 100644 --- a/src/server/JackDriver.hpp +++ b/src/server/JackDriver.hpp @@ -18,7 +18,7 @@ #ifndef INGEN_ENGINE_JACKAUDIODRIVER_HPP #define INGEN_ENGINE_JACKAUDIODRIVER_HPP -#include "ingen-config.h" +#include "ingen_config.h" #include #include diff --git a/src/server/ObjectBuffer.cpp b/src/server/ObjectBuffer.cpp index ca3a442f..b3b74079 100644 --- a/src/server/ObjectBuffer.cpp +++ b/src/server/ObjectBuffer.cpp @@ -21,7 +21,7 @@ #include #include "raul/log.hpp" #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h" -#include "ingen-config.h" +#include "ingen_config.h" #include "ingen/shared/LV2Features.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ObjectBuffer.hpp" diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index 57ea0db9..6942cb02 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -31,7 +31,7 @@ #include "PatchImpl.hpp" #include "ProcessContext.hpp" #include "util.hpp" -#include "ingen-config.h" +#include "ingen_config.h" #define LOG(s) s << "[NoteNode] " diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index 13a75bbc..0f2e03ab 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -27,7 +27,7 @@ #include "OutputPort.hpp" #include "ProcessContext.hpp" #include "util.hpp" -#include "ingen-config.h" +#include "ingen_config.h" #define LOG(s) s << "[TriggerNode] " diff --git a/src/server/util.hpp b/src/server/util.hpp index 9aab55ac..2107addc 100644 --- a/src/server/util.hpp +++ b/src/server/util.hpp @@ -24,7 +24,7 @@ #include "raul/log.hpp" #include "raul/Path.hpp" -#include "ingen-config.h" +#include "ingen_config.h" #include #ifdef __SSE__ diff --git a/src/shared/runtime_paths.cpp b/src/shared/runtime_paths.cpp index cf37d07b..c2bacf96 100644 --- a/src/shared/runtime_paths.cpp +++ b/src/shared/runtime_paths.cpp @@ -27,7 +27,7 @@ #include "ingen/shared/runtime_paths.hpp" -#include "ingen-config.h" +#include "ingen_config.h" using namespace std; diff --git a/wscript b/wscript index 5455fc93..7649afe9 100644 --- a/wscript +++ b/wscript @@ -117,7 +117,7 @@ def configure(conf): if Options.options.liblo_bundles: autowaf.define(conf, 'LIBLO_BUNDLES', 1) - conf.write_config_header('ingen-config.h', remove=False) + conf.write_config_header('ingen_config.h', remove=False) autowaf.display_msg(conf, "Jack", conf.is_defined('HAVE_JACK')) autowaf.display_msg(conf, "Jack session support", -- cgit v1.2.1