From 9a3d8d0604a2f81e3514e8a1a30aaf41aadf73a2 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 10 Jun 2006 04:01:53 +0000
Subject: Actually got all this stuff building again

git-svn-id: http://svn.drobilla.net/lad/grauph@21 a436a847-0d15-0410-975c-d299462d15a1
---
 src/libs/client/Makefile.am | 18 +++++-------------
 src/libs/engine/Makefile.am |  4 ++--
 2 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'src/libs')

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 \
-- 
cgit v1.2.1