aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-01-18 01:55:56 +0000
committerDavid Robillard <d@drobilla.net>2012-01-18 01:55:56 +0000
commitc614d09725675f7595df57b02ffe906a70efddd3 (patch)
tree66355fb54a8d1b56b0257ca24d451a6689fd59db
parentccbf27cd5c0e12c5361ef8ca0162ceaeecdab832 (diff)
downloadmachina-c614d09725675f7595df57b02ffe906a70efddd3.tar.gz
machina-c614d09725675f7595df57b02ffe906a70efddd3.tar.bz2
machina-c614d09725675f7595df57b02ffe906a70efddd3.zip
Use consistent *_config.h rather than *-config.h.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@3963 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/engine/Engine.cpp2
-rw-r--r--src/engine/JackDriver.cpp2
-rw-r--r--src/engine/Loader.cpp2
-rw-r--r--src/engine/Problem.cpp2
-rw-r--r--src/engine/machina/Mutation.hpp2
-rw-r--r--src/gui/MachinaGUI.cpp2
-rw-r--r--src/gui/MachinaGUI.hpp2
-rw-r--r--src/gui/WidgetFactory.hpp2
-rw-r--r--src/gui/main.cpp2
-rw-r--r--src/machina.cpp2
-rw-r--r--wscript2
11 files changed, 11 insertions, 11 deletions
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index b218648..a53bb81 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -17,7 +17,7 @@
#include <glibmm/ustring.h>
-#include "machina-config.h"
+#include "machina_config.h"
#include "machina/Engine.hpp"
#include "machina/Loader.hpp"
#include "machina/Machine.hpp"
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index 45128ed..0d6b945 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/engine/JackDriver.cpp
@@ -18,7 +18,7 @@
#include <iostream>
#include <iomanip>
-#include "machina-config.h"
+#include "machina_config.h"
#include "machina/URIs.hpp"
#include "machina/Updates.hpp"
diff --git a/src/engine/Loader.cpp b/src/engine/Loader.cpp
index b2c56e5..7cee16b 100644
--- a/src/engine/Loader.cpp
+++ b/src/engine/Loader.cpp
@@ -24,7 +24,7 @@
#include "machina/Loader.hpp"
#include "machina/Machine.hpp"
-#include "machina-config.h"
+#include "machina_config.h"
#include "ActionFactory.hpp"
#include "Edge.hpp"
#include "Node.hpp"
diff --git a/src/engine/Problem.cpp b/src/engine/Problem.cpp
index 26e6c01..9e62016 100644
--- a/src/engine/Problem.cpp
+++ b/src/engine/Problem.cpp
@@ -30,7 +30,7 @@
#include "raul/SMFReader.hpp"
#include "raul/midi_events.h"
-#include "machina-config.h"
+#include "machina_config.h"
#include "ActionFactory.hpp"
#include "Problem.hpp"
diff --git a/src/engine/machina/Mutation.hpp b/src/engine/machina/Mutation.hpp
index a7fd94d..437165f 100644
--- a/src/engine/machina/Mutation.hpp
+++ b/src/engine/machina/Mutation.hpp
@@ -18,7 +18,7 @@
#ifndef MACHINA_MACHINE_MUTATION_HPP
#define MACHINA_MACHINE_MUTATION_HPP
-#include "machina-config.h"
+#include "machina_config.h"
#ifdef HAVE_EUGENE
#include "eugene/Mutation.hpp"
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index 2323f4a..80845f0 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -15,7 +15,7 @@
* along with Machina. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "machina-config.h"
+#include "machina_config.h"
#include <cmath>
#include <sstream>
diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp
index 1b7afa5..4fd6dfc 100644
--- a/src/gui/MachinaGUI.hpp
+++ b/src/gui/MachinaGUI.hpp
@@ -26,7 +26,7 @@
#include "raul/SharedPtr.hpp"
#include "raul/TimeStamp.hpp"
-#include "machina-config.h"
+#include "machina_config.h"
using namespace std;
diff --git a/src/gui/WidgetFactory.hpp b/src/gui/WidgetFactory.hpp
index 79d7412..6d706dd 100644
--- a/src/gui/WidgetFactory.hpp
+++ b/src/gui/WidgetFactory.hpp
@@ -21,7 +21,7 @@
#include <gtkmm.h>
-#include "machina-config.h"
+#include "machina_config.h"
class WidgetFactory
{
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 1e49c3b..6db973c 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -15,7 +15,7 @@
* along with Machina. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "machina-config.h"
+#include "machina_config.h"
#include <signal.h>
#include <iostream>
#include <string>
diff --git a/src/machina.cpp b/src/machina.cpp
index 78bcbfc..35ba7f1 100644
--- a/src/machina.cpp
+++ b/src/machina.cpp
@@ -15,7 +15,7 @@
* along with Machina. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "machina-config.h"
+#include "machina_config.h"
#include <iostream>
#include <signal.h>
diff --git a/wscript b/wscript
index 5f4b79a..af6fd18 100644
--- a/wscript
+++ b/wscript
@@ -54,7 +54,7 @@ def configure(conf):
autowaf.define(conf, 'MACHINA_DATA_DIR', os.path.join(
conf.env['DATADIR'], 'machina'))
- conf.write_config_header('machina-config.h', remove=False)
+ conf.write_config_header('machina_config.h', remove=False)
autowaf.display_msg(conf, "Jack", conf.is_defined('HAVE_JACK'))
autowaf.display_msg(conf, "GUI", conf.is_defined('MACHINA_BUILD_GUI'))