Build system fixes, building from top level doesn't recursively configure slv2, but slv2 is still independently packageable/buildable.

Think I've finally figured out how to do recursive autohell without resorting to suicide...


git-svn-id: http://svn.drobilla.net/lad/ingen@650 a436a847-0d15-0410-975c-d299462d15a1

14 files changed, 14 insertions, 15 deletions

diff --git a/src/libs/engine/Engine.cpp b/src/libs/engine/Engine.cpp
index c7e2ed8d..438d5540 100644
--- a/src/libs/engine/Engine.cpp
+++ b/src/libs/engine/Engine.cpp
@@ -22,7 +22,7 @@
 #include <raul/Deletable.hpp>
 #include <raul/Maid.hpp>
 #include "Engine.hpp"	
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 #include "tuning.hpp"
 #include "Event.hpp"
 #include "JackAudioDriver.hpp"
diff --git a/src/libs/engine/Engine.hpp b/src/libs/engine/Engine.hpp
index fc64e024..7570e61f 100644
--- a/src/libs/engine/Engine.hpp
+++ b/src/libs/engine/Engine.hpp
@@ -18,7 +18,7 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include "../../../config/config.h"
+#include CONFIG_H_PATH
 #include "module/module.h"
 
 #include <cassert>
diff --git a/src/libs/engine/JackAudioDriver.cpp b/src/libs/engine/JackAudioDriver.cpp
index 25f8305d..a402bfe6 100644
--- a/src/libs/engine/JackAudioDriver.cpp
+++ b/src/libs/engine/JackAudioDriver.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "JackAudioDriver.hpp"
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 #include "tuning.hpp"
 #include <iostream>
 #include <cstdlib>
diff --git a/src/libs/engine/JackMidiDriver.hpp b/src/libs/engine/JackMidiDriver.hpp
index 631f0d28..c546fbec 100644
--- a/src/libs/engine/JackMidiDriver.hpp
+++ b/src/libs/engine/JackMidiDriver.hpp
@@ -21,7 +21,7 @@
 #include <jack/jack.h>
 #include <jack/midiport.h>
 #include <raul/List.hpp>
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 #include "MidiDriver.hpp"
 
 namespace Ingen {
diff --git a/src/libs/engine/LashDriver.cpp b/src/libs/engine/LashDriver.cpp
index f4f37abb..641599ff 100644
--- a/src/libs/engine/LashDriver.cpp
+++ b/src/libs/engine/LashDriver.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>
 #include <cassert>
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 #include "LashDriver.hpp"
 #include "App.hpp"
 
diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am
index d5bbede4..72cea433 100644
--- a/src/libs/engine/Makefile.am
+++ b/src/libs/engine/Makefile.am
@@ -6,8 +6,7 @@ moduledir = $(libdir)/ingen
 
 module_LTLIBRARIES = libingen_engine.la
 libingen_engine_la_CXXFLAGS = \
-	-I$(top_srcdir)/slv2 \
-	-I$(top_srcdir)/raul \
+	@SLV2_CFLAGS@ @RAUL_CFLAGS@ \
 	-I$(top_srcdir)/ingen/src/common \
 	-I$(top_srcdir)/ingen/src/libs \
 	-I$(top_srcdir)/ingen/src/libs/engine/events \
diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp
index eab6336d..2c71d66d 100644
--- a/src/libs/engine/NodeFactory.cpp
+++ b/src/libs/engine/NodeFactory.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "NodeFactory.hpp"
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 #include <cstdlib>
 #include <pthread.h>
 #include <dirent.h>
diff --git a/src/libs/engine/NodeFactory.hpp b/src/libs/engine/NodeFactory.hpp
index e3f947f0..2c0b2bb6 100644
--- a/src/libs/engine/NodeFactory.hpp
+++ b/src/libs/engine/NodeFactory.hpp
@@ -18,7 +18,7 @@
 #ifndef NODEFACTORY_H
 #define NODEFACTORY_H
 
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 #include "module/module.h"
 
 #include <list>
diff --git a/src/libs/engine/OSCEngineReceiver.hpp b/src/libs/engine/OSCEngineReceiver.hpp
index 478af249..a9e76ece 100644
--- a/src/libs/engine/OSCEngineReceiver.hpp
+++ b/src/libs/engine/OSCEngineReceiver.hpp
@@ -18,7 +18,7 @@
 #ifndef OSCENGINERECEIVER_H
 #define OSCENGINERECEIVER_H
 
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 #include <string>
 #include <stdint.h>
 #include <lo/lo.h>
diff --git a/src/libs/engine/Plugin.hpp b/src/libs/engine/Plugin.hpp
index 21730797..aa51d725 100644
--- a/src/libs/engine/Plugin.hpp
+++ b/src/libs/engine/Plugin.hpp
@@ -18,7 +18,7 @@
 #ifndef PLUGIN_H
 #define PLUGIN_H
 
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 
 #include <cstdlib>
 #include <glibmm/module.h>
diff --git a/src/libs/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp
index 68115d79..6055d8bd 100644
--- a/src/libs/engine/QueuedEngineInterface.cpp
+++ b/src/libs/engine/QueuedEngineInterface.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "QueuedEngineInterface.hpp"
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 #include "QueuedEventSource.hpp"
 #include "events.hpp"
 #include "Engine.hpp"
diff --git a/src/libs/engine/engine.cpp b/src/libs/engine/engine.cpp
index 53db86f8..17607fa1 100644
--- a/src/libs/engine/engine.cpp
+++ b/src/libs/engine/engine.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 
 #include <raul/Process.hpp>
 #include "engine.hpp"
diff --git a/src/libs/engine/events.hpp b/src/libs/engine/events.hpp
index 0cfbbc86..84bde550 100644
--- a/src/libs/engine/events.hpp
+++ b/src/libs/engine/events.hpp
@@ -18,7 +18,7 @@
 #ifndef EVENTS_H
 #define EVENTS_H
 
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 
 #include "DeactivateEvent.hpp"
 #include "EnablePatchEvent.hpp"
diff --git a/src/libs/engine/tests/Makefile.am b/src/libs/engine/tests/Makefile.am
index 64fdd419..bb5e8a56 100644
--- a/src/libs/engine/tests/Makefile.am
+++ b/src/libs/engine/tests/Makefile.am
@@ -1,6 +1,6 @@
 if BUILD_UNIT_TESTS
 
-AM_CXXFLAGS = @JACK_CFLAGS@ @LIBLO_CFLAGS@ @ALSA_CFLAGS@ -I$(top_srcdir)/raul -I../../common
+AM_CXXFLAGS = @JACK_CFLAGS@ @LIBLO_CFLAGS@ @ALSA_CFLAGS@ @RAUL_CFLAGS@ -I../../common
 common_ldadd = @JACK_LIBS@ @RAUL_LIBS@ @LIBLO_LIBS@ @ALSA_LIBS@ -lrt
 node_tree_test_LDADD = $(common_ldadd)