From 9b24c3ac59cd0a394672689aa82b6845628626cb Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 16 Mar 2008 17:01:28 +0000 Subject: Add Jack D-Bus driver (from Nedko). git-svn-id: http://svn.drobilla.net/lad/patchage@1167 a436a847-0d15-0410-975c-d299462d15a1 --- src/Makefile.am | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index a87563b..3d8c76b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -AM_CXXFLAGS = -I.. -I$(top_srcdir)/raul -I$(top_srcdir)/flowcanvas -DDATA_DIR=\"$(pkgdatadir)\" @GTHREAD_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @JACK_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ -patchage_LDADD = @GTHREAD_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @RAUL_LIBS@ @FLOWCANVAS_LIBS@ +AM_CXXFLAGS = -I.. -I$(top_srcdir)/raul -I$(top_srcdir)/flowcanvas -DDATA_DIR=\"$(pkgdatadir)\" @GTHREAD_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ +patchage_LDADD = @GTHREAD_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @RAUL_LIBS@ @FLOWCANVAS_LIBS@ EXTRA_DIST = patchage.gladep @@ -10,8 +10,6 @@ bin_PROGRAMS = patchage patchage_SOURCES = \ Driver.hpp \ GladeFile.hpp \ - JackDriver.cpp \ - JackDriver.hpp \ JackSettingsDialog.hpp \ Patchage.cpp \ Patchage.hpp \ @@ -26,6 +24,20 @@ patchage_SOURCES = \ Widget.hpp \ main.cpp +if WITH_JACK_DBUS +AM_CXXFLAGS += @DBUS_CFLAGS@ +patchage_SOURCES += JackDbusDriver.cpp +patchage_SOURCES += JackDbusDriver.hpp +patchage_LDADD += @DBUS_LIBS@ +else +if WITH_JACK +AM_CXXFLAGS += @JACK_CFLAGS@ +patchage_SOURCES += JackDriver.cpp +patchage_SOURCES += JackDriver.hpp +patchage_LDADD += @JACK_LIBS@ +endif +endif + if WITH_LASH patchage_SOURCES += LashDriver.hpp LashDriver.cpp endif -- cgit v1.2.1