8 files changed, 22 insertions, 27 deletions
diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am
index 24e6a3bb..ada22522 100644
--- a/src/libs/client/Makefile.am
+++ b/src/libs/client/Makefile.am
@@ -1,13 +1,11 @@
 AM_CXXFLAGS = -I$(top_srcdir)/src/common -fno-exceptions -fno-rtti
 
-SUBDIRS = . python supercollider
+if BUILD_CLIENT_LIB
+noinst_LTLIBRARIES = libomclient.la
 
-if BUILD_CONSOLE_CLIENTS
-noinst_LIBRARIES = libomclient.a
+libomclient_la_CXXFLAGS = -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LIBGLADEMM_CFLAGS) $(GNOMECANVASMM_CFLAGS) $(JACK_CFLAGS) $(LXML2_CFLAGS)
 
-libomclient_a_CXXFLAGS = -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LIBGLADEMM_CFLAGS) $(GNOMECANVASMM_CFLAGS) $(JACK_CFLAGS) $(LXML2_CFLAGS)
-
-libomclient_a_SOURCES = \
+libomclient_la_SOURCES = \
 	ClientInterface.h \
 	OSCEngineInterface.h \
 	OSCEngineInterface.cpp \
@@ -41,11 +39,5 @@ libomclient_a_SOURCES = \
 	$(top_srcdir)/src/common/interface/ClientInterface.h \
 	$(top_srcdir)/src/common/interface/EngineInterface.h
 
-SUBDIRS += patch_loader patches demolition
-
-endif # BUILD_CONSOLE_CLIENTS
-
-if BUILD_GTK_CLIENT
-SUBDIRS += gtk
-endif
+endif # BUILD_CLIENT_LIB
 
diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am
index 3b425ba2..6f0c023d 100644
--- a/src/libs/engine/Makefile.am
+++ b/src/libs/engine/Makefile.am
@@ -1,11 +1,11 @@
 SUBDIRS = tests
 DIST_SUBDIRS = events
 
-AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/libom_la -I$(top_srcdir)/src/engine/events -fno-exceptions -fno-rtti
+AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events -fno-exceptions -fno-rtti
 
 MAINTAINERCLEANFILES = Makefile.in
 
-LTLIBRARIES = libom.la
+noinst_LTLIBRARIES = libom.la
 
 libom_la_SOURCES = \
 	util.h \
diff --git a/src/progs/Makefile.am b/src/progs/Makefile.am
index ad10dcf6..520c3652 100644
--- a/src/progs/Makefile.am
+++ b/src/progs/Makefile.am
@@ -1,6 +1,8 @@
 AM_CXXFLAGS = -I$(top_srcdir)/src/common -fno-exceptions -fno-rtti
 
-SUBDIRS = . python supercollider
+DIST_SUBDIRS = python supercollider
+
+SUBDIRS = om
 
 if BUILD_CONSOLE_CLIENTS
 SUBDIRS += patch_loader demolition
diff --git a/src/progs/demolition/DemolitionClientInterface.h b/src/progs/demolition/DemolitionClientInterface.h
index 374008b5..7b114c52 100644
--- a/src/progs/demolition/DemolitionClientInterface.h
+++ b/src/progs/demolition/DemolitionClientInterface.h
@@ -43,7 +43,7 @@ public:
 	void bundle_begin() {}
 	void bundle_end()   {}
 
-	void num_plugins(size_t num) {}
+	void num_plugins(uint32_t num) {}
 
 	// OSC thread functions
 	void error(const string& msg);
diff --git a/src/progs/demolition/Makefile.am b/src/progs/demolition/Makefile.am
index 4854f045..64fb3315 100644
--- a/src/progs/demolition/Makefile.am
+++ b/src/progs/demolition/Makefile.am
@@ -1,11 +1,11 @@
 EXTRA_DIST = README
 
-om_demolition_CXXFLAGS = -I$(top_srcdir)/src/clients -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS)
-om_demolition_LDADD = ../libomclient.a $(LOSC_LIBS) $(LXML2_LIBS)
+om_demolition_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS)
+om_demolition_LDADD = ../../libs/client/libomclient.la $(LOSC_LIBS) $(LXML2_LIBS)
 
 bin_PROGRAMS = om_demolition
 
-om_demolition_DEPENDENCIES = ../libomclient.a
+om_demolition_DEPENDENCIES = ../../libs/client/libomclient.la
 
 om_demolition_SOURCES = \
 	DemolitionClientInterface.h \
diff --git a/src/progs/gtk/Makefile.am b/src/progs/gtk/Makefile.am
index c92ae2b2..42d66b05 100644
--- a/src/progs/gtk/Makefile.am
+++ b/src/progs/gtk/Makefile.am
@@ -1,13 +1,14 @@
 if BUILD_GTK_CLIENT
 
 EXTRA_DIST = om_gtk.gladep
+MAINTAINERCLEANFILES = Makefile.in
 
 sharefilesdir = $(pkgdatadir)
 dist_sharefiles_DATA = om_gtk.glade om-icon.png
 
-AM_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/clients -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@
-om_gtk_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ ../libomclient.a
-om_gtk_DEPENDENCIES = ../libomclient.a
+AM_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/client -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@
+om_gtk_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ ../../libs/client/libomclient.la
+om_gtk_DEPENDENCIES = ../../libs/client/libomclient.la
 
 
 bin_PROGRAMS = om_gtk
diff --git a/src/progs/om/Makefile.am b/src/progs/om/Makefile.am
index 2f503130..2689088e 100644
--- a/src/progs/om/Makefile.am
+++ b/src/progs/om/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/engine -I$(top_srcdir)/src/engine/events -fno-exceptions -fno-rtti
+AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine -I$(top_srcdir)/src/libs/engine/events -fno-exceptions -fno-rtti
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/progs/patch_loader/Makefile.am b/src/progs/patch_loader/Makefile.am
index 15e0c503..1dddefbb 100644
--- a/src/progs/patch_loader/Makefile.am
+++ b/src/progs/patch_loader/Makefile.am
@@ -1,11 +1,11 @@
 EXTRA_DIST = README
 
-om_patch_loader_CXXFLAGS = -I$(top_srcdir)/src/clients -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS)
-om_patch_loader_LDADD = ../libomclient.a $(LOSC_LIBS) $(LXML2_LIBS)
+om_patch_loader_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS)
+om_patch_loader_LDADD = ../../libs/client/libomclient.la $(LOSC_LIBS) $(LXML2_LIBS)
 
 bin_PROGRAMS = om_patch_loader
 
-om_patch_loader_DEPENDENCIES = ../libomclient.a
+om_patch_loader_DEPENDENCIES = ../../libs/client/libomclient.la
 
 om_patch_loader_SOURCES = \
 	patch_loader.cpp \