From a854ac939a20b12932384c3074c9ce85df0b39bd Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 22 Dec 2009 16:34:14 +0000
Subject: Fix compilation. Consistent naming of module source files.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2315 a436a847-0d15-0410-975c-d299462d15a1
---
 src/gui/App.cpp       |  1 -
 src/gui/gui.cpp       | 41 -----------------------------------------
 src/gui/ingen_gui.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
 src/gui/wscript       |  2 +-
 4 files changed, 42 insertions(+), 43 deletions(-)
 delete mode 100644 src/gui/gui.cpp
 create mode 100644 src/gui/ingen_gui.cpp

(limited to 'src/gui')

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index f42ddcb4..0f34de2f 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -26,7 +26,6 @@
 #include <sys/time.h>
 #include "raul/Path.hpp"
 #include "flowcanvas/Connection.hpp"
-#include "module/Module.hpp"
 #include "module/World.hpp"
 #include "engine/Engine.hpp"
 #include "interface/EngineInterface.hpp"
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
deleted file mode 100644
index d1ad6c99..00000000
--- a/src/gui/gui.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file is part of Ingen.
- * Copyright (C) 2007-2009 Dave Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "module/Module.hpp"
-#include "App.hpp"
-
-struct IngenGUIModule : public Ingen::Shared::Module {
-	void load(Ingen::Shared::World* world) {
-		Ingen::GUI::App::init(world);
-		Ingen::GUI::App::run();
-	}
-};
-
-static IngenGUIModule* module = NULL;
-
-extern "C" {
-
-Ingen::Shared::Module*
-ingen_module_load() {
-	if (!module)
-		module = new IngenGUIModule();
-
-	return module;
-}
-
-} // extern "C"
-
diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp
new file mode 100644
index 00000000..d1ad6c99
--- /dev/null
+++ b/src/gui/ingen_gui.cpp
@@ -0,0 +1,41 @@
+/* This file is part of Ingen.
+ * Copyright (C) 2007-2009 Dave Robillard <http://drobilla.net>
+ *
+ * Ingen is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "module/Module.hpp"
+#include "App.hpp"
+
+struct IngenGUIModule : public Ingen::Shared::Module {
+	void load(Ingen::Shared::World* world) {
+		Ingen::GUI::App::init(world);
+		Ingen::GUI::App::run();
+	}
+};
+
+static IngenGUIModule* module = NULL;
+
+extern "C" {
+
+Ingen::Shared::Module*
+ingen_module_load() {
+	if (!module)
+		module = new IngenGUIModule();
+
+	return module;
+}
+
+} // extern "C"
+
diff --git a/src/gui/wscript b/src/gui/wscript
index 93084654..7d7e61fc 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -40,7 +40,7 @@ def build(bld):
 		ThreadedLoader.cpp
 		Window.cpp
 		WindowFactory.cpp
-		gui.cpp
+		ingen_gui.cpp
 	'''
 
 	if bld.env['HAVE_CURL'] != 0:
-- 
cgit v1.2.1