7 files changed, 10 insertions, 130 deletions
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 9da0b41..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo 'Generating necessary files...'
-libtoolize --copy --force
-aclocal
-autoheader
-automake --gnu --add-missing
-autoconf
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 48f24a0..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,113 +0,0 @@
-# configure.in for machina
-
-AC_INIT(machina, 0.0.1, dave@drobilla.net)
-AC_CONFIG_SRCDIR([src/main.cpp])
-AC_CONFIG_SRCDIR([src/engine/Machine.cpp])
-AC_CONFIG_SRCDIR([src/engine/machina/Machine.hpp])
-AC_CONFIG_SRCDIR([src/gui/main.cpp])
-AC_CONFIG_HEADER([src/config.h])
-AM_INIT_AUTOMAKE
-
-AC_LANG([C++])
-
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-
-AC_TYPE_SIZE_T
-
-PKG_CHECK_MODULES(RAUL, raul >= 0.0.0)
-PKG_CHECK_MODULES(GLIBMM, glibmm-2.4)
-
-# Check for debugging flag
-debug="no"
-AC_ARG_ENABLE(debug,
-	[AS_HELP_STRING(--enable-debug, [Enable debugging (no)])],
-	[debug="$enableval"])
-if test "$debug" = "yes"; then
-  # Useless POS gnomecanvasmm doesn't build w/ -pedantic
-  CFLAGS="-O0 -g -DDEBUG"
-  CXXFLAGS="$CFLAGS"
-else
-  CFLAGS="$CFLAGS -DNDEBUG"
-  CXXFLAGS="$CFLAGS -DNDEBUG"
-fi
-
-# Check for strict flag
-strict="no"
-AC_ARG_ENABLE(strict,
-	[AS_HELP_STRING(--enable-strict, [Enable strict compiler warnings or errors (no)])],
-	[strict="$enableval"])
-if test "$strict" = "yes"; then
-  # Useless POS gnomecanvasmm doesn't build w/ -pedantic
-  CFLAGS="$CFLAGS -ansi -Wall -Wextra -Wno-unused-parameter -Wconversion -Winit-self"
-  CXXFLAGS="$CXXFLAGS -ansi -Wall -Wextra -Wno-unused-parameter -Wconversion -Winit-self -Woverloaded-virtual -Wsign-promo"
-fi
-
-# Boost shared_ptr debugging
-pointer_debug="no"
-AC_ARG_ENABLE(pointer_debug,
-	[AS_HELP_STRING(--enable-pointer-debug, [Enable smart pointer debugging (no)])],
-	[pointer_debug="$enableval"])
-if test "$pointer_debug" = "yes"; then
-  CFLAGS+=" -DBOOST_SP_ENABLE_DEBUG_HOOKS"
-  CXXFLAGS+=" -DBOOST_SP_ENABLE_DEBUG_HOOKS"
-fi
-
-
-# Jack support
-with_jack="yes"
-AC_ARG_ENABLE(jack,
-	[AS_HELP_STRING(--enable-jack, [Enable Jack realtime processing (yes)])],
-	[ if test x$enable_jack = xno ; then with_jack=no ; fi ])
-if test "$with_jack" = "yes"; then
-  PKG_CHECK_MODULES(JACK, jack >= 0.102.20, with_jack="yes", with_jack="no")
-  if test "$with_jack" = "yes"; then
-    AC_DEFINE(WITH_JACK, 1, [Has JACK])
-  fi
-fi
-AM_CONDITIONAL(WITH_JACK, [test "$with_jack" = "yes"])
-if test "$with_jack" = "yes"; then
-	AC_DEFINE(HAVE_JACK_MIDI, 1, [Has Jack MIDI])
-	AC_JACK_MIDI_NFRAMES_CHECK()  	   	
-	if test "$jackmidi_nframes" = "yes"; then
-		AC_DEFINE([JACK_MIDI_NEEDS_NFRAMES], 1, [Defined if we JACK MIDI functions need nframes parameter.]) 	  	
-	fi
-fi
-
-
-# Build GUI?
-build_gui="yes"
-AC_ARG_ENABLE(gui,
-	[AS_HELP_STRING(--enable-gui, [Build GUI (yes)])],
-	[build_gui="$enableval"])
-if test "$build_gui" = "yes"; then
-	PKG_CHECK_MODULES(GTKMM, gtkmm-2.4)
-	PKG_CHECK_MODULES(GNOMECANVASMM, libgnomecanvasmm-2.6)
-	PKG_CHECK_MODULES(LIBGLADEMM, libglademm-2.4)
-	PKG_CHECK_MODULES(FLOWCANVAS, flowcanvas >= 0.1.0)
-fi
-AM_CONDITIONAL(WITH_GUI, [test "x$build_gui" = "xyes"])
-
-# Bolt on a few specific flags to CXXFLAGS that should always be used
-CXXFLAGS="$CXXFLAGS -pipe -Wall -fmessage-length=139 -fdiagnostics-show-location=every-line"
-CFLAGS="$CFLAGS -pipe -Wall -fmessage-length=139 -fdiagnostics-show-location=every-line"
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([src/Makefile])
-AC_CONFIG_FILES([src/engine/Makefile])
-AC_CONFIG_FILES([src/engine/machina/Makefile])
-AC_CONFIG_FILES([src/gui/Makefile])
-AC_CONFIG_FILES([util/Makefile])
-AC_CONFIG_FILES([machina.desktop])
-
-AC_OUTPUT
-
-AC_MSG_RESULT([])
-AC_MSG_RESULT([**********************************************************************])
-AC_MSG_RESULT([Machina build configuration:])
-AC_MSG_RESULT([])
-AC_MSG_RESULT([JACK support: $with_jack])
-AC_MSG_RESULT([GUI:         $build_gui])
-AC_MSG_RESULT([**********************************************************************])
-AC_MSG_RESULT([])
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 1d4e85f..5e8cb83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ endif
 
 machina_SOURCES = machina.cpp
 
-AM_CXXFLAGS = @RAUL_CFLAGS@ @JACK_CFLAGS@ @GLIBMM_CFLAGS@ -I$(top_srcdir)/src/engine
-LDADD    = @RAUL_LIBS@   @JACK_LIBS@   @GLIBMM_LIBS@ engine/libmachina.la
+AM_CXXFLAGS = -I$(top_srcdir)/raul -I$(top_srcdir)/machine/src/engine @JACK_CFLAGS@ @GLIBMM_CFLAGS@
+LDADD = @RAUL_LIBS@ @JACK_LIBS@ @GLIBMM_LIBS@ engine/libmachina.la
 
 midi2machina_SOURCES = midi2machina.cpp
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index f45ccc6..f181508 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/engine/JackDriver.cpp
@@ -19,7 +19,7 @@
 #include <iomanip>
 #include "machina/JackDriver.hpp"
 #include "machina/MidiAction.hpp"
-#include "../config.h"
+#include "../config/config.h"
 #include "jack_compat.h"
 
 using namespace Raul;
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 6e2dafb..dad7425 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -2,8 +2,8 @@ SUBDIRS = machina
 
 lib_LTLIBRARIES = libmachina.la
 
-libmachina_la_CXXFLAGS = @RAUL_CFLAGS@ @JACK_CFLAGS@ @GLIBMM_CFLAGS@
-libmachina_la_LIBADD   = @RAUL_LIBS@   @JACK_LIBS@   @GLIBMM_LIBS@
+libmachina_la_CXXFLAGS = -I$(top_srcdir)/raul @JACK_CFLAGS@ @GLIBMM_CFLAGS@
+libmachina_la_LIBADD   = @RAUL_LIBS@          @JACK_LIBS@   @GLIBMM_LIBS@
 
 libmachina_la_SOURCES = \
 	Node.cpp \
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index fb74a41..0dc1326 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @JACK_CFLAGS@ @FLOWCANVAS_CFLAGS@ @RAUL_CFLAGS@  -I$(top_srcdir)/src/engine
+AM_CXXFLAGS = -I$(top_srcdir)/flowcanvas -I$(top_srcdir)/raul -I$(top_srcdir)/machina/src/engine -DPKGDATADIR=\"$(pkgdatadir)\" @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @JACK_CFLAGS@
 
 EXTRA_DIST = machina.gladep
 
@@ -22,9 +22,9 @@ machina_gui_SOURCES = \
 	NodePropertiesWindow.hpp \
 	NodePropertiesWindow.cpp
 
-if WITH_GUI
+if WITH_MACHINA_GUI
 
-machina_gui_LDADD = @FLOWCANVAS_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@ @RAUL_CFLAGS@ ../engine/libmachina.la
+machina_gui_LDADD = ../engine/libmachina.la @RAUL_LIBS@ @FLOWCANVAS_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@
 
 bin_PROGRAMS = machina_gui
 
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 791aa2d..104e0a6 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -20,7 +20,8 @@
 #include <string>
 #include <libgnomecanvasmm.h>
 #include <raul/RDFWorld.h>
-#include "../config.h"
+#include "../config/config.h"
+#include "machina/Machine.hpp"
 #include "machina/Loader.hpp"
 #include "machina/SMFDriver.hpp"
 #include "MachinaGUI.hpp"