From cf1c161a0209cdce869a3e8c3b48b1d53c1bab00 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/ingen@610 a436a847-0d15-0410-975c-d299462d15a1
---
 src/libs/gui/App.cpp           |  6 +++---
 src/libs/gui/ConnectWindow.cpp |  2 +-
 src/libs/gui/Makefile.am       | 13 ++++++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'src/libs/gui')

diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp
index 7697ca11..7b815db2 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.h"
+#include "../../../config/config.h"
 #include "App.h"
 #include <cassert>
 #include <string>
@@ -41,9 +41,9 @@
 #include "ConnectWindow.h"
 #include "ThreadedLoader.h"
 #include "WindowFactory.h"
-#ifdef HAVE_LASH
+/*#ifdef HAVE_LASH
 #include "LashController.h"
-#endif
+#endif*/
 using std::cerr; using std::cout; using std::endl;
 using std::string;
 namespace Ingen { namespace Client { class PluginModel; } }
diff --git a/src/libs/gui/ConnectWindow.cpp b/src/libs/gui/ConnectWindow.cpp
index 0bc24452..ae787c99 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.h>
-#include "config.h"
+#include "../../../../config/config.h"
 #include "interface/ClientKey.h"
 #include "interface/EngineInterface.h"
 #include "engine/tuning.h"
diff --git a/src/libs/gui/Makefile.am b/src/libs/gui/Makefile.am
index c94ebbb5..13e082b1 100644
--- a/src/libs/gui/Makefile.am
+++ b/src/libs/gui/Makefile.am
@@ -12,18 +12,21 @@ moduledir = $(libdir)/ingen
 module_LTLIBRARIES = libingen_gui.la
 
 libingen_gui_la_CXXFLAGS = \
+	-I$(top_srcdir)/slv2 \
+	-I$(top_srcdir)/raul \
+	-I$(top_srcdir)/flowcanvas \
+	-I$(top_srcdir)/ingen/src/common \
+	-I$(top_srcdir)/ingen/src/libs \
 	-DPKGDATADIR=\"$(pkgdatadir)\" \
 	-DINGEN_MODULE_DIR=\"$(libdir)/ingen\" \
 	-DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
-	@RAUL_CFLAGS@ @LOSC_CFLAGS@ @SLV2_CFLAGS@ @CURL_CFLAGS@ \
-	@GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @FLOWCANVAS_CFLAGS@ @GNOMECANVASMM_CFLAGS@ \
-	-I$(top_srcdir)/src/common \
-	-I$(top_srcdir)/src/libs
+	@LIBLO_CFLAGS@ @CURL_CFLAGS@ \
+	@GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ 
 
 libingen_gui_la_LDFLAGS = -no-undefined -module -avoid-version
 
 libingen_gui_la_LIBADD = \
-	@RAUL_LIBS@ @LOSC_LIBS@ @SLV2_LIBS@ @CURL_LIBS@ \
+	@RAUL_LIBS@ @LIBLO_LIBS@ @SLV2_LIBS@ @CURL_LIBS@ \
 	@GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @FLOWCANVAS_LIBS@ @GNOMECANVASMM_LIBS@ \
 	../module/libingen_module.la \
 	../client/libingen_client.la
-- 
cgit v1.2.1