4 files changed, 66 insertions, 83 deletions
diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am
index 126b07fa..de9b1ca4 100644
--- a/src/libs/client/Makefile.am
+++ b/src/libs/client/Makefile.am
@@ -7,7 +7,6 @@ libingenclient_la_CXXFLAGS = -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdata
 libingenclient_la_LIBADD = @LXML2_LIBS@ @LOSC_LIBS@ @RAPTOR_LIBS@ @LSIGCPP_LIBS@
 
 libingenclient_la_SOURCES = \
-	ClientInterface.h \
 	OSCEngineSender.h \
 	OSCEngineSender.cpp \
 	OSCModelEngineInterface.h \
@@ -21,7 +20,6 @@ libingenclient_la_SOURCES = \
 	ModelEngineInterface.cpp \
 	PresetModel.h \
 	ControlModel.h \
-	ObjectController.h \
 	ObjectModel.h \
 	ObjectModel.cpp \
 	NodeModel.h \
diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am
index 95b684d5..ac58885f 100644
--- a/src/libs/engine/Makefile.am
+++ b/src/libs/engine/Makefile.am
@@ -1,5 +1,4 @@
-SUBDIRS = tests
-DIST_SUBDIRS = events
+SUBDIRS = tests events
 
 AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events
 
@@ -12,6 +11,7 @@ noinst_LTLIBRARIES = libingen.la
 libingen_la_SOURCES = \
 	util.h \
 	tuning.h \
+	events.h \
 	DataType.h \
 	Node.h \
 	NodeBase.h \
@@ -31,7 +31,6 @@ libingen_la_SOURCES = \
 	DirectResponder.h \
 	OSCResponder.h \
 	OSCResponder.cpp \
-	ClientKey.h \
 	ClientBroadcaster.h \
 	ClientBroadcaster.cpp \
 	ObjectSender.h \
@@ -68,7 +67,7 @@ libingen_la_SOURCES = \
 	Maid.cpp \
 	MaidObject.h \
 	Tree.h \
-	ClientRecord.h \
+	TreeImplementation.h \
 	PluginLibrary.h \
 	Plugin.h \
 	Plugin.cpp \
@@ -88,12 +87,6 @@ libingen_la_SOURCES = \
 	AudioDriver.h \
 	MidiDriver.h \
 	midi.h \
-	../libingen_la/util/Semaphore.h \
-	../libingen_la/util/types.h \
-	../libingen_la/util/Path.h \
-	../libingen_la/util/Queue.h \
-	../libingen_la/interface/ClientInterface.h \
-	../libingen_la/interface/EngineInterface.h \
 	instantiations.cpp \
 	events/RegisterClientEvent.h \
 	events/RegisterClientEvent.cpp \
@@ -213,7 +206,6 @@ endif
 if WITH_LASH
 libingen_la_SOURCES += \
 	LashDriver.h \
-	LashDriver.cpp \
-	LashRestoreDoneEvent.h
+	LashDriver.cpp
 endif
 
diff --git a/src/libs/engine/events/Makefile.am b/src/libs/engine/events/Makefile.am
index a1760738..7bc54238 100644
--- a/src/libs/engine/events/Makefile.am
+++ b/src/libs/engine/events/Makefile.am
@@ -1,65 +1,65 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = \
-	events/RegisterClientEvent.h \
-	events/RegisterClientEvent.cpp \
-	events/UnregisterClientEvent.h \
-	events/UnregisterClientEvent.cpp \
-	events/PingQueuedEvent.h \
-	events/ActivateEvent.h \
-	events/ActivateEvent.cpp \
-	events/DeactivateEvent.h \
-	events/DeactivateEvent.cpp \
-	events/SetPortValueEvent.h \
-	events/SetPortValueEvent.cpp \
-	events/SetPortValueQueuedEvent.h \
-	events/SetPortValueQueuedEvent.cpp \
-	events/NoteOnEvent.h \
-	events/NoteOnEvent.cpp \
-	events/NoteOffEvent.h \
-	events/NoteOffEvent.cpp \
-	events/AllNotesOffEvent.h \
-	events/AllNotesOffEvent.cpp \
-	events/ConnectionEvent.h \
-	events/ConnectionEvent.cpp \
-	events/DisconnectionEvent.h \
-	events/DisconnectionEvent.cpp \
-	events/DisconnectNodeEvent.h \
-	events/DisconnectNodeEvent.cpp \
-	events/DisconnectPortEvent.h \
-	events/DisconnectPortEvent.cpp \
-	events/DestroyEvent.h \
-	events/DestroyEvent.cpp \
-	events/AddNodeEvent.h \
-	events/AddNodeEvent.cpp \
-	events/SetMetadataEvent.h \
-	events/SetMetadataEvent.cpp \
-	events/RequestMetadataEvent.h \
-	events/RequestMetadataEvent.cpp \
-	events/RequestPluginEvent.h \
-	events/RequestPluginEvent.cpp \
-	events/RequestObjectEvent.h \
-	events/RequestObjectEvent.cpp \
-	events/RequestPortValueEvent.h \
-	events/RequestPortValueEvent.cpp \
-	events/RequestAllObjectsEvent.h \
-	events/RequestAllObjectsEvent.cpp \
-	events/RequestPluginsEvent.h \
-	events/RequestPluginsEvent.cpp \
-	events/CreatePatchEvent.h \
-	events/CreatePatchEvent.cpp \
-	events/LoadPluginsEvent.h \
-	events/LoadPluginsEvent.cpp \
-	events/EnablePatchEvent.h \
-	events/EnablePatchEvent.cpp \
-	events/DisablePatchEvent.h \
-	events/DisablePatchEvent.cpp \
-	events/ClearPatchEvent.h \
-	events/ClearPatchEvent.cpp \
-	events/RenameEvent.h \
-	events/RenameEvent.cpp \
-	events/MidiLearnEvent.h \
-	events/MidiLearnEvent.cpp \
+	RegisterClientEvent.h \
+	RegisterClientEvent.cpp \
+	UnregisterClientEvent.h \
+	UnregisterClientEvent.cpp \
+	PingQueuedEvent.h \
+	ActivateEvent.h \
+	ActivateEvent.cpp \
+	DeactivateEvent.h \
+	DeactivateEvent.cpp \
+	SetPortValueEvent.h \
+	SetPortValueEvent.cpp \
+	SetPortValueQueuedEvent.h \
+	SetPortValueQueuedEvent.cpp \
+	NoteOnEvent.h \
+	NoteOnEvent.cpp \
+	NoteOffEvent.h \
+	NoteOffEvent.cpp \
+	AllNotesOffEvent.h \
+	AllNotesOffEvent.cpp \
+	ConnectionEvent.h \
+	ConnectionEvent.cpp \
+	DisconnectionEvent.h \
+	DisconnectionEvent.cpp \
+	DisconnectNodeEvent.h \
+	DisconnectNodeEvent.cpp \
+	DisconnectPortEvent.h \
+	DisconnectPortEvent.cpp \
+	DestroyEvent.h \
+	DestroyEvent.cpp \
+	AddNodeEvent.h \
+	AddNodeEvent.cpp \
+	SetMetadataEvent.h \
+	SetMetadataEvent.cpp \
+	RequestMetadataEvent.h \
+	RequestMetadataEvent.cpp \
+	RequestPluginEvent.h \
+	RequestPluginEvent.cpp \
+	RequestObjectEvent.h \
+	RequestObjectEvent.cpp \
+	RequestPortValueEvent.h \
+	RequestPortValueEvent.cpp \
+	RequestAllObjectsEvent.h \
+	RequestAllObjectsEvent.cpp \
+	RequestPluginsEvent.h \
+	RequestPluginsEvent.cpp \
+	CreatePatchEvent.h \
+	CreatePatchEvent.cpp \
+	LoadPluginsEvent.h \
+	LoadPluginsEvent.cpp \
+	EnablePatchEvent.h \
+	EnablePatchEvent.cpp \
+	DisablePatchEvent.h \
+	DisablePatchEvent.cpp \
+	ClearPatchEvent.h \
+	ClearPatchEvent.cpp \
+	RenameEvent.h \
+	RenameEvent.cpp \
+	MidiLearnEvent.h \
+	MidiLearnEvent.cpp \
 	DSSIConfigureEvent.cpp \
 	DSSIConfigureEvent.h \
 	DSSIControlEvent.cpp \
diff --git a/src/libs/engine/tests/Makefile.am b/src/libs/engine/tests/Makefile.am
index 54f6ad1f..0da5ee09 100644
--- a/src/libs/engine/tests/Makefile.am
+++ b/src/libs/engine/tests/Makefile.am
@@ -5,23 +5,16 @@ common_ldadd = @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ -lrt
 node_tree_test_LDADD = $(common_ldadd)
 queue_test_LDADD = $(common_ldadd)
 
-bin_PROGRAMS = node_tree_test queue_test list_test path_test
+bin_PROGRAMS = node_tree_test queue_test list_test
 
 list_test_SOURCES = \
 	../List.h \
 	list_test.cpp
 
-path_test_SOURCES = \
-	../../common/Path.h \
-	path_test.cpp
-
 node_tree_test_SOURCES = \
-	node_tree_test.cpp \
-	../Tree.h \
-	../TreeImplementation.h
+	node_tree_test.cpp
 
 queue_test_SOURCES = \
-	queue_test.cpp \
-	../../common/Queue.h
+	queue_test.cpp
 
 endif # BUILD_UNIT_TESTS