From 16751f0c2a7348ce9d060d5ba8c1e25098191a5e Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 24 Jul 2007 06:48:02 +0000
Subject: Removed recursive autohell, except for SLv2. Always build against
 local copies, hopefully fixing broken compilation against outdated system
 versions.

git-svn-id: http://svn.drobilla.net/lad/machina@610 a436a847-0d15-0410-975c-d299462d15a1
---
 src/Makefile.am           | 4 ++--
 src/engine/JackDriver.cpp | 2 +-
 src/engine/Makefile.am    | 4 ++--
 src/gui/Makefile.am       | 6 +++---
 src/gui/main.cpp          | 3 ++-
 5 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

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"
-- 
cgit v1.2.1