1 files changed, 28 insertions, 36 deletions

diff --git a/src/engine/wscript b/src/engine/wscript
index ee98b125..10478637 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -31,33 +31,8 @@ def build(bld):
 		PortImpl.cpp
 		PostProcessor.cpp
 		ProcessSlave.cpp
-		QueuedEvent.cpp
-		events/SendPortActivity.cpp
-		events/SendPortValue.cpp
-		ingen_engine.cpp
-		internals/Controller.cpp
-		internals/Note.cpp
-		internals/Trigger.cpp
-	'''
-
-	obj = bld.new_task_gen('cxx', 'shlib')
-	obj.source = core_source
-	if bld.env['HAVE_LADSPA_H'] == 1:
-		obj.source += ' LADSPAPlugin.cpp LADSPANode.cpp '
-	if bld.env['HAVE_SLV2'] == 1:
-		obj.source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp '
-	obj.export_incdirs = ['.']
-	obj.includes     = ['.', '..', '../..', '../common']
-	obj.name         = 'libingen_engine'
-	obj.target       = 'ingen_engine'
-	obj.install_path = '${LIBDIR}/ingen'
-	obj.uselib_local = 'libingen_shared'
-	core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM'
-	autowaf.use_lib(bld, obj, core_libs)
-
-	obj = bld.new_task_gen('cxx', 'shlib')
-	obj.source = '''
 		QueuedEngineInterface.cpp
+		QueuedEvent.cpp
 		QueuedEventSource.cpp
 		events/AllNotesOff.cpp
 		events/ClearPatch.cpp
@@ -77,15 +52,30 @@ def build(bld):
 		events/RequestAllObjects.cpp
 		events/RequestMetadata.cpp
 		events/RequestPlugins.cpp
+		events/SendPortActivity.cpp
+		events/SendPortValue.cpp
 		events/SetMetadata.cpp
 		events/SetPortValue.cpp
 		events/UnregisterClient.cpp
+		ingen_engine.cpp
+		internals/Controller.cpp
+		internals/Note.cpp
+		internals/Trigger.cpp
 	'''
+
+	obj = bld.new_task_gen('cxx', 'shlib')
+	obj.source = core_source
+	if bld.env['HAVE_LADSPA_H'] == 1:
+		obj.source += ' LADSPAPlugin.cpp LADSPANode.cpp '
+	if bld.env['HAVE_SLV2'] == 1:
+		obj.source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp '
 	obj.export_incdirs = ['.']
-	obj.includes     = ['.', '..', '../..', '../common', '../engine']
-	obj.name         = 'libingen_engine_queued'
-	obj.target       = 'ingen_engine_queued'
+	obj.includes     = ['.', '..', '../..', '../common']
+	obj.name         = 'libingen_engine'
+	obj.target       = 'ingen_engine'
 	obj.install_path = '${LIBDIR}/ingen'
+	obj.uselib_local = 'libingen_shared'
+	core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM'
 	autowaf.use_lib(bld, obj, core_libs)
 
 	if bld.env['HAVE_SOUP'] == 1:
@@ -95,10 +85,11 @@ def build(bld):
 			QueuedEngineInterface.cpp
 			HTTPClientSender.cpp
 			HTTPEngineReceiver.cpp
+			ingen_http.cpp
 		'''
 		obj.includes     = ['.', '..', '../..', '../common', '../engine']
-		obj.name         = 'libingen_engine_http'
-		obj.target       = 'ingen_engine_http'
+		obj.name         = 'libingen__http'
+		obj.target       = 'ingen_http'
 		obj.install_path = '${LIBDIR}/ingen'
 		autowaf.use_lib(bld, obj, core_libs + ' SOUP')
 
@@ -109,21 +100,22 @@ def build(bld):
 			QueuedEngineInterface.cpp
 			OSCClientSender.cpp
 			OSCEngineReceiver.cpp
+			ingen_osc.cpp
 		'''
 		obj.export_incdirs = ['.']
 		obj.includes     = ['.', '..', '../..', '../common', '../engine']
-		obj.name         = 'libingen_engine_osc'
-		obj.target       = 'ingen_engine_osc'
+		obj.name         = 'libingen_osc'
+		obj.target       = 'ingen_osc'
 		obj.install_path = '${LIBDIR}/ingen'
 		autowaf.use_lib(bld, obj, core_libs + ' LIBLO')
 
 	if bld.env['HAVE_JACK'] == 1:
 		obj = bld.new_task_gen('cxx', 'shlib')
-		obj.source = 'JackAudioDriver.cpp JackMidiDriver.cpp'
+		obj.source = 'JackAudioDriver.cpp JackMidiDriver.cpp ingen_jack.cpp'
 		obj.export_incdirs = ['.']
 		obj.includes     = ['.', '..', '../..', '../common', '../engine']
-		obj.name         = 'libingen_engine_jack'
-		obj.target       = 'ingen_engine_jack'
+		obj.name         = 'libingen_jack'
+		obj.target       = 'ingen_jack'
 		obj.install_path = '${LIBDIR}/ingen'
 		autowaf.use_lib(bld, obj, core_libs + ' JACK')