From 95b13851ad5905c4124d975802163403e9d18ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Lind=C3=A9n?= Date: Sun, 5 Apr 2015 20:56:53 +0200 Subject: [PATCH 1/2] replace a few incorrect $(top_builddir) with $(top_srcdir) --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 95bffcd..a0eecfc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -143,19 +143,19 @@ 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 $(top_srcdir)/drivers/netjack/netjack_packet.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 if HAVE_SAMPLERATE if HAVE_ALSA -alsa_in_SOURCES = alsa_in.c $(top_builddir)/drivers/alsa/memops.c +alsa_in_SOURCES = alsa_in.c $(top_srcdir)/drivers/alsa/memops.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_out_SOURCES = alsa_out.c $(top_builddir)/drivers/alsa/memops.c +alsa_out_SOURCES = alsa_out.c $(top_srcdir)/drivers/alsa/memops.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 From bcc82b85cb7980e78f17b7740888c0ebde174362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Lind=C3=A9n?= Date: Sun, 5 Apr 2015 21:14:53 +0200 Subject: [PATCH 2/2] replace more incorrect $(top_builddir) with $(top_srcdir) --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index a0eecfc..d99de42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -151,12 +151,12 @@ jack_netsource_LDADD = $(top_builddir)/libjack/libjack.la if HAVE_SAMPLERATE if HAVE_ALSA alsa_in_SOURCES = alsa_in.c $(top_srcdir)/drivers/alsa/memops.c -alsa_in_CFLAGS = @NETJACK_CFLAGS@ -I$(top_builddir)/drivers/alsa +alsa_in_CFLAGS = @NETJACK_CFLAGS@ -I$(top_srcdir)/drivers/alsa alsa_in_LDFLAGS = -lasound -lsamplerate @OS_LDFLAGS@ alsa_in_LDADD = $(top_builddir)/libjack/libjack.la alsa_out_SOURCES = alsa_out.c $(top_srcdir)/drivers/alsa/memops.c -alsa_out_CFLAGS = @NETJACK_CFLAGS@ -I$(top_builddir)/drivers/alsa +alsa_out_CFLAGS = @NETJACK_CFLAGS@ -I$(top_srcdir)/drivers/alsa alsa_out_LDFLAGS = -lasound -lsamplerate @OS_LDFLAGS@ alsa_out_LDADD = $(top_builddir)/libjack/libjack.la endif #HAVE_ALSA