From 105e4a9600bf622f8417fd3033bd740690bec02a Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Fri, 12 Feb 2016 13:22:40 +1100 Subject: [PATCH] Makefile.am: Fix for newer versions of automake Newer automake doesn't support including out-of-dir C files to the `*_SOURCES` line. Instead use libraries. --- Makefile.am | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 95bffcd..631bf08 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = subdir-objects + MAINTAINERCLEANFILES = Makefile.in if HAVE_READLINE @@ -143,22 +145,25 @@ jack_unload_LDADD = $(top_builddir)/libjack/libjack.la # # Netjack slave tools # -jack_netsource_SOURCES = netsource.c $(top_builddir)/drivers/netjack/netjack_packet.c +jack_netsource_SOURCES = netsource.c jack_netsource_CFLAGS = @NETJACK_CFLAGS@ -I$(top_srcdir)/drivers/netjack -jack_netsource_LDFLAGS = @NETJACK_LIBS@ @OS_LDFLAGS@ -jack_netsource_LDADD = $(top_builddir)/libjack/libjack.la +jack_netsource_LDFLAGS = @NETJACK_LIBS@ @OS_LDFLAGS@ +jack_netsource_LDADD = $(top_builddir)/libjack/libjack.la \ + $(top_builddir)/drivers/netjack/libnetjack_packet.la if HAVE_SAMPLERATE if HAVE_ALSA -alsa_in_SOURCES = alsa_in.c $(top_builddir)/drivers/alsa/memops.c +alsa_in_SOURCES = alsa_in.c alsa_in_CFLAGS = @NETJACK_CFLAGS@ -I$(top_builddir)/drivers/alsa alsa_in_LDFLAGS = -lasound -lsamplerate @OS_LDFLAGS@ -alsa_in_LDADD = $(top_builddir)/libjack/libjack.la +alsa_in_LDADD = $(top_builddir)/libjack/libjack.la \ + $(top_builddir)/drivers/alsa/libmemops.la -alsa_out_SOURCES = alsa_out.c $(top_builddir)/drivers/alsa/memops.c +alsa_out_SOURCES = alsa_out.c alsa_out_CFLAGS = @NETJACK_CFLAGS@ -I$(top_builddir)/drivers/alsa alsa_out_LDFLAGS = -lasound -lsamplerate @OS_LDFLAGS@ -alsa_out_LDADD = $(top_builddir)/libjack/libjack.la +alsa_out_LDADD = $(top_builddir)/libjack/libjack.la \ + $(top_builddir)/drivers/alsa/libmemops.la endif #HAVE_ALSA endif #HAVE_SAMPLERATE