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

9 files changed, 9 insertions, 11 deletions

diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp
index 7b1204d2..b0ec48af 100644
--- a/src/libs/gui/App.cpp
+++ b/src/libs/gui/App.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../../../config/config.h"
+#include CONFIG_H_PATH
 #include "module/module.h"
 #include "App.hpp"
 #include <cassert>
diff --git a/src/libs/gui/ConnectWindow.cpp b/src/libs/gui/ConnectWindow.cpp
index cd1bb976..703d784e 100644
--- a/src/libs/gui/ConnectWindow.cpp
+++ b/src/libs/gui/ConnectWindow.cpp
@@ -22,7 +22,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <raul/Process.hpp>
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 #include "interface/EngineInterface.hpp"
 #include "engine/tuning.hpp"
 #include "engine/Engine.hpp"
diff --git a/src/libs/gui/ConnectWindow.hpp b/src/libs/gui/ConnectWindow.hpp
index fe26d549..2ea86f0a 100644
--- a/src/libs/gui/ConnectWindow.hpp
+++ b/src/libs/gui/ConnectWindow.hpp
@@ -18,7 +18,7 @@
 #ifndef CONNECT_WINDOW_H
 #define CONNECT_WINDOW_H
 
-#include "../../../config/config.h"
+#include CONFIG_H_PATH
 
 #ifdef HAVE_SLV2
 #include <slv2/slv2.h>
diff --git a/src/libs/gui/ControlGroups.cpp b/src/libs/gui/ControlGroups.cpp
index d82fca13..2e31ed3f 100644
--- a/src/libs/gui/ControlGroups.cpp
+++ b/src/libs/gui/ControlGroups.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../../../config/config.h"
+#include CONFIG_H_PATH
 
 #include <cmath>
 #include <iostream>
diff --git a/src/libs/gui/LashController.cpp b/src/libs/gui/LashController.cpp
index 8f288766..3a654100 100644
--- a/src/libs/gui/LashController.cpp
+++ b/src/libs/gui/LashController.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include CONFIG_H_PATH
 #include "LashController.hpp"
-#include "../../../../config/config.hpp"
 #include <iostream>
 #include <string>
 #include <cassert>
diff --git a/src/libs/gui/Makefile.am b/src/libs/gui/Makefile.am
index 3664e151..f3b2e3ae 100644
--- a/src/libs/gui/Makefile.am
+++ b/src/libs/gui/Makefile.am
@@ -12,9 +12,7 @@ moduledir = $(libdir)/ingen
 module_LTLIBRARIES = libingen_gui.la
 
 libingen_gui_la_CXXFLAGS = \
-	-I$(top_srcdir)/slv2 \
-	-I$(top_srcdir)/raul \
-	-I$(top_srcdir)/flowcanvas \
+	@SLV2_CFLAGS@ @RAUL_CFLAGS@ @FLOWCANVAS_CFLAGS@ \
 	-I$(top_srcdir)/ingen/src/common \
 	-I$(top_srcdir)/ingen/src/libs \
 	-DPKGDATADIR=\"$(pkgdatadir)\" \
diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp
index cbe931ab..0e591445 100644
--- a/src/libs/gui/PatchCanvas.cpp
+++ b/src/libs/gui/PatchCanvas.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../../../config/config.h"
+#include CONFIG_H_PATH
 #include "module/module.h"
 
 #include <cassert>
diff --git a/src/libs/gui/PatchCanvas.hpp b/src/libs/gui/PatchCanvas.hpp
index d0df1505..3099df91 100644
--- a/src/libs/gui/PatchCanvas.hpp
+++ b/src/libs/gui/PatchCanvas.hpp
@@ -18,7 +18,7 @@
 #ifndef PATCHCANVAS_H
 #define PATCHCANVAS_H
 
-#include "../../../../config/config.h"
+#include CONFIG_H_PATH
 
 #include <string>
 #include <map>
diff --git a/src/libs/gui/gui.hpp b/src/libs/gui/gui.hpp
index d99e4091..cc290851 100644
--- a/src/libs/gui/gui.hpp
+++ b/src/libs/gui/gui.hpp
@@ -18,7 +18,7 @@
 #ifndef INGEN_GUI_H
 #define INGEN_GUI_H
 
-#include "../../../config/config.h"
+#include CONFIG_H_PATH
 #include "module/module.h"
 #include <raul/SharedPtr.hpp>