From fa8c25fd08953b6b14b22faa807a5446cec7294c Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 8 Jan 2007 04:26:52 +0000
Subject: Fix for building against local raul. Fix for some LADSPA plugins
 where munged port names weren't unique.

git-svn-id: http://svn.drobilla.net/lad/ingen@243 a436a847-0d15-0410-975c-d299462d15a1
---
 src/libs/client/Makefile.am        | 8 ++++----
 src/libs/engine/LADSPANode.cpp     | 2 ++
 src/libs/engine/Makefile.am        | 7 +++----
 src/libs/engine/ObjectStore.cpp    | 8 ++++----
 src/progs/patch_loader/Makefile.am | 2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am
index e35e9a9b..5161eea8 100644
--- a/src/libs/client/Makefile.am
+++ b/src/libs/client/Makefile.am
@@ -1,10 +1,10 @@
-AM_CXXFLAGS = -I$(top_srcdir)/src/common
-
 if BUILD_CLIENT_LIB
+
 noinst_LTLIBRARIES = libingenclient.la
 
-libingenclient_la_CXXFLAGS = -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" @LXML2_CFLAGS@ @RASQAL_CFLAGS@ @RAPTOR_CFLAGS@ @LSIGCPP_CFLAGS@ @RAUL_CFLAGS@ @GLIBMM_CFLAGS@
-libingenclient_la_LIBADD = @LXML2_LIBS@ @LOSC_LIBS@ @RASQAL_LIBS@ @RAPTOR_LIBS@ @LSIGCPP_LIBS@ @RAUL_LIBS@ @GLIBMM_LIBS@
+libingenclient_la_CXXFLAGS = @RAUL_CFLAGS@ @LXML2_CFLAGS@ @RASQAL_CFLAGS@ @RAPTOR_CFLAGS@ @LSIGCPP_CFLAGS@ @GLIBMM_CFLAGS@ -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\"
+
+libingenclient_la_LIBADD = @RAUL_LIBS@ @LXML2_LIBS@ @LOSC_LIBS@ @RASQAL_LIBS@ @RAPTOR_LIBS@ @LSIGCPP_LIBS@ @GLIBMM_LIBS@
 
 libingenclient_la_SOURCES = \
 	OSCEngineSender.h \
diff --git a/src/libs/engine/LADSPANode.cpp b/src/libs/engine/LADSPANode.cpp
index 00cfd450..d1720429 100644
--- a/src/libs/engine/LADSPANode.cpp
+++ b/src/libs/engine/LADSPANode.cpp
@@ -75,7 +75,9 @@ LADSPANode::instantiate()
 	Port* port = NULL;
 	
 	for (size_t j=0; j < _descriptor->PortCount; ++j) {
+		cerr << "Name before: " << _descriptor->PortNames[j] << endl;
 		port_name = Path::nameify(_descriptor->PortNames[j]);
+		cerr << "Name after: " << port_name << endl;
 		string::size_type slash_index;
 		
 		// Name mangling, to guarantee port names are unique
diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am
index 97eadb29..3eb30f9d 100644
--- a/src/libs/engine/Makefile.am
+++ b/src/libs/engine/Makefile.am
@@ -1,12 +1,11 @@
 SUBDIRS = tests events
 
-AM_CXXFLAGS = @RAUL_CFLAGS@ @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events
-
-libingen_la_LIBADD = @RAUL_LIBS@ @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@
-
 MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libingen.la
+libingen_la_CXXFLAGS = @RAUL_CFLAGS@ @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events
+
+libingen_la_LIBADD = @RAUL_LIBS@ @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@
 
 libingen_la_SOURCES = \
 	util.h \
diff --git a/src/libs/engine/ObjectStore.cpp b/src/libs/engine/ObjectStore.cpp
index 852d734b..87005d1f 100644
--- a/src/libs/engine/ObjectStore.cpp
+++ b/src/libs/engine/ObjectStore.cpp
@@ -69,7 +69,7 @@ ObjectStore::find(const Path& path)
 void
 ObjectStore::add(GraphObject* o)
 {
-	//cerr << "[ObjectStore] Adding " << o->path() << endl;
+	cerr << "[ObjectStore] Adding " << o->path() << endl;
 	m_objects.insert(new TreeNode<GraphObject*>(o->path(), o));
 }
 
@@ -79,7 +79,7 @@ ObjectStore::add(GraphObject* o)
 void
 ObjectStore::add(TreeNode<GraphObject*>* tn)
 {
-	//cerr << "[ObjectStore] Adding " << tn->key() << endl;
+	cerr << "[ObjectStore] Adding " << tn->key() << endl;
 	m_objects.insert(tn);
 }
 
@@ -97,8 +97,8 @@ ObjectStore::remove(const string& path)
 
 	if (removed == NULL)
 		cerr << "[ObjectStore] WARNING: Removing " << path << " failed." << endl;
-	//else
-	//	cerr << "[ObjectStore] Removed " << path << endl;
+	else
+		cerr << "[ObjectStore] Removed " << path << endl;
 	
 	return removed;
 }
diff --git a/src/progs/patch_loader/Makefile.am b/src/progs/patch_loader/Makefile.am
index da9ba356..9913411a 100644
--- a/src/progs/patch_loader/Makefile.am
+++ b/src/progs/patch_loader/Makefile.am
@@ -5,7 +5,7 @@ ingen_load_LDADD = ../../libs/client/libingenclient.la  @RAUL_LIBS@ @LSIGCPP_LIB
 
 bin_PROGRAMS = ingen_load
 
-ingen_load_DEPENDENCIES = ../../libs/client/libingenclient.la
+#ingen_load_DEPENDENCIES = ../../libs/client/libingenclient.la
 
 ingen_load_SOURCES = \
 	patch_loader.cpp \
-- 
cgit v1.2.1