Global build system, build system bugfixes.

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

7 files changed, 12 insertions, 11 deletions

diff --git a/src/progs/Makefile.am b/src/progs/Makefile.am
index f37c8af0..aa28c47d 100644
--- a/src/progs/Makefile.am
+++ b/src/progs/Makefile.am
@@ -1,6 +1,6 @@
 AM_CXXFLAGS = -I$(top_srcdir)/src/common
 
-DIST_SUBDIRS = python supercollider
+DIST_SUBDIRS = python supercollider patch_loader ingenuity server demolition
 
 SUBDIRS = server
 
diff --git a/src/progs/ingenuity/DSSIController.cpp b/src/progs/ingenuity/DSSIController.cpp
index 4d5bb2f7..a5075470 100644
--- a/src/progs/ingenuity/DSSIController.cpp
+++ b/src/progs/ingenuity/DSSIController.cpp
@@ -75,6 +75,8 @@ DSSIController::show_gui()
 void
 DSSIController::update_program_menu()
 {
+	cerr << "FIXME: Program menu\n";
+#if 0
 	m_program_menu.items().clear();
 	
 	const map<int, map<int, string> >& banks = node_model()->get_programs();
@@ -113,13 +115,14 @@ DSSIController::update_program_menu()
 		m_program_menu_item->set_sensitive(true);
 	
 	m_banks_dirty = false;
+#endif
 }
 
 
 void
 DSSIController::send_program_change(int bank, int program)
 {
-	App::instance().engine()->set_program(node_model()->path(), bank, program);
+	//App::instance().engine()->set_program(node_model()->path(), bank, program);
 }
 
 
diff --git a/src/progs/ingenuity/DSSIController.h b/src/progs/ingenuity/DSSIController.h
index 3eaba91a..7b8c6fb6 100644
--- a/src/progs/ingenuity/DSSIController.h
+++ b/src/progs/ingenuity/DSSIController.h
@@ -20,6 +20,7 @@
 #include <string>
 #include <gtkmm.h>
 #include "util/Path.h"
+#include "NodeModel.h"
 
 using std::string;
 using namespace Ingen::Client;
diff --git a/src/progs/ingenuity/Makefile.am b/src/progs/ingenuity/Makefile.am
index 753980b8..24b818cb 100644
--- a/src/progs/ingenuity/Makefile.am
+++ b/src/progs/ingenuity/Makefile.am
@@ -13,7 +13,6 @@ ingenuity_DEPENDENCIES = ../../libs/client/libingenclient.la
 # FIXME: make engine have a separate include dir
 if MONOLITHIC_INGENUITY
 ingenuity_CXXFLAGS += -I$(top_srcdir)/src/libs
-#ingenuity_LDADD += @JACK_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ -lrt ../../libs/engine/libingen.la
 ingenuity_LDADD += ../../libs/engine/libingen.la
 ingenuity_DEPENDENCIES += ../../libs/engine/libingen.la
 endif
@@ -58,14 +57,14 @@ ingenuity_SOURCES = \
 	PatchWindow.cpp \
 	WindowFactory.h \
 	WindowFactory.cpp \
-	../../common/types.h \
-	../../common/Path.h \
 	NodeModule.h \
 	NodeModule.cpp \
 	PatchPortModule.h \
 	PatchPortModule.cpp \
 	DSSIModule.h \
 	DSSIModule.cpp \
+	DSSIController.h \
+	DSSIController.cpp \
 	SubpatchModule.h \
 	SubpatchModule.cpp \
 	Port.h \
diff --git a/src/progs/ingenuity/PatchCanvas.cpp b/src/progs/ingenuity/PatchCanvas.cpp
index 3f9c97fa..289150de 100644
--- a/src/progs/ingenuity/PatchCanvas.cpp
+++ b/src/progs/ingenuity/PatchCanvas.cpp
@@ -174,10 +174,8 @@ PatchCanvas::connection(CountedPtr<ConnectionModel> cm)
 	boost::shared_ptr<LibFlowCanvas::Port> dst = get_port(dst_parent_name, cm->dst_port_path().name());
 	
 	if (src && dst) {
-		boost::shared_ptr<Connection> c(new Connection(shared_from_this(), cm, src, dst));
-		src->add_connection(c);
-		dst->add_connection(c);
-		add_connection(c);
+		add_connection(boost::shared_ptr<Connection>(
+			new Connection(shared_from_this(), cm, src, dst)));
 	} else {
 		cerr << "[Canvas] ERROR: Unable to find ports to create connection." << endl;
 	}
diff --git a/src/progs/python/Makefile.am b/src/progs/python/Makefile.am
index 017b1f4b..c6da5467 100644
--- a/src/progs/python/Makefile.am
+++ b/src/progs/python/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS = scripts
 
-EXTRA_DIST = omecho.py omsynth.py OSC.py
+EXTRA_DIST = ingen.py ingenecho.py OSC.py
 
diff --git a/src/progs/supercollider/Makefile.am b/src/progs/supercollider/Makefile.am
index 69661c73..a6001b7a 100644
--- a/src/progs/supercollider/Makefile.am
+++ b/src/progs/supercollider/Makefile.am
@@ -1,2 +1,2 @@
-EXTRA_DIST = Om.sc example.sc
+EXTRA_DIST = Ingen.sc example.sc