virtual_oss: build system tidying

general:
 - find libsamplerate's headers in the temporary sysroot instead of
   digging in the source tree.
 - use LIBADD where possible

lib/virtual_oss:
 - centralize SHLIBDIR define
 - centralize include path for internal headers
 - don't try to find libsamplerate directly in .OBJDIR

No functional changes.

Reviewed by:	christos
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D54704

8 files changed, 14 insertions, 24 deletions

diff --git a/lib/virtual_oss/Makefile b/lib/virtual_oss/Makefile
index 11715bbcbf0b..e6cb5fbe5985 100644
--- a/lib/virtual_oss/Makefile
+++ b/lib/virtual_oss/Makefile
@@ -1,7 +1,5 @@
 .include <src.opts.mk>
 
-SHLIBDIR?=	${LIBDIR}/virtual_oss
-
 SUBDIR+= null \
 	 oss
 
diff --git a/lib/virtual_oss/Makefile.inc b/lib/virtual_oss/Makefile.inc
index 877465a5c548..2a0c75218f49 100644
--- a/lib/virtual_oss/Makefile.inc
+++ b/lib/virtual_oss/Makefile.inc
@@ -1,5 +1,7 @@
 PACKAGE=	sound
 
-.include "../Makefile.inc"
+SHLIBDIR=	${LIBDIR}/virtual_oss
+
+CFLAGS+=	-I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss
 
-LDFLAGS+=	-L${.OBJDIR:H:H}/libsamplerate
+.include "../Makefile.inc"
diff --git a/lib/virtual_oss/bt/Makefile b/lib/virtual_oss/bt/Makefile
index 15413b7a1f1e..9a4ce586ef95 100644
--- a/lib/virtual_oss/bt/Makefile
+++ b/lib/virtual_oss/bt/Makefile
@@ -1,14 +1,11 @@
 SHLIB_NAME= 	voss_bt.so
-SHLIBDIR=	${LIBDIR}/virtual_oss
 
 SRCS=		bt.c \
 		avdtp.c \
 		sbc_encode.c
 
-CFLAGS+= 	-I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss \
-		-I${SRCTOP}/contrib/libsamplerate
-LDFLAGS+=	-lbluetooth -lsdp
-LIBADD=		samplerate
+CFLAGS+= 	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate
+LIBADD=		bluetooth samplerate sdp
 
 .if defined(HAVE_LIBAV)
 CFLAGS+=	-I${LOCALBASE:U/usr/local}/include -DHAVE_LIBAV
diff --git a/lib/virtual_oss/null/Makefile b/lib/virtual_oss/null/Makefile
index ec5c2d40f665..5c265d1be055 100644
--- a/lib/virtual_oss/null/Makefile
+++ b/lib/virtual_oss/null/Makefile
@@ -1,10 +1,8 @@
 SHLIB_NAME= 	voss_null.so
-SHLIBDIR=	${LIBDIR}/virtual_oss
 
 SRCS=		null.c
 
-CFLAGS+= 	-I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss \
-		-I${SRCTOP}/contrib/libsamplerate
+CFLAGS+= 	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate
 LIBADD=		samplerate
 
 .include <bsd.lib.mk>
diff --git a/lib/virtual_oss/oss/Makefile b/lib/virtual_oss/oss/Makefile
index 257d7f0c0bae..773b3518602e 100644
--- a/lib/virtual_oss/oss/Makefile
+++ b/lib/virtual_oss/oss/Makefile
@@ -1,10 +1,8 @@
 SHLIB_NAME= 	voss_oss.so
-SHLIBDIR=	${LIBDIR}/virtual_oss
 
 SRCS=		oss.c
 
-CFLAGS+= 	-I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss \
-		-I${SRCTOP}/contrib/libsamplerate
+CFLAGS+= 	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate
 LIBADD=		samplerate
 
 .include <bsd.lib.mk>
diff --git a/lib/virtual_oss/sndio/Makefile b/lib/virtual_oss/sndio/Makefile
index 9b5af63a3246..238507be1e4b 100644
--- a/lib/virtual_oss/sndio/Makefile
+++ b/lib/virtual_oss/sndio/Makefile
@@ -1,10 +1,8 @@
 SHLIB_NAME= 	voss_sndio.so
-SHLIBDIR=	${LIBDIR}/virtual_oss
 
 SRCS=		sndio.c
 
-CFLAGS+= 	-I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss \
-		-I${SRCTOP}/contrib/libsamplerate \
+CFLAGS+= 	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate \
 		-I${LOCALBASE:U/usr/local}/include
 LDFLAGS+=	-L${LOCALBASE:U/usr/local}/lib -lsndio
 LIBADD=		samplerate
diff --git a/usr.sbin/virtual_oss/virtual_bt_speaker/Makefile b/usr.sbin/virtual_oss/virtual_bt_speaker/Makefile
index 0f5fb2b4eb99..d3bb0e4cdb44 100644
--- a/usr.sbin/virtual_oss/virtual_bt_speaker/Makefile
+++ b/usr.sbin/virtual_oss/virtual_bt_speaker/Makefile
@@ -6,6 +6,6 @@ SRCS=		bt_speaker.c
 CFLAGS+= 	-I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss \
 		-I${SRCTOP}/lib/virtual_oss/bt
 
-LDFLAGS+= 	-lm -lbluetooth -lsdp
+LIBADD=		bluetooth m sdp
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/virtual_oss/virtual_oss/Makefile b/usr.sbin/virtual_oss/virtual_oss/Makefile
index cdb6bcac3fad..78532356f097 100644
--- a/usr.sbin/virtual_oss/virtual_oss/Makefile
+++ b/usr.sbin/virtual_oss/virtual_oss/Makefile
@@ -12,13 +12,12 @@ SRCS=		audio_delay.c \
 		ring.c \
 		virtual_oss.c
 
-CFLAGS+=	-I${SRCTOP}/contrib/libsamplerate
+CFLAGS+=	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate
+
+LIBADD=		cuse m nv pthread samplerate
 # The --export-dynamic-symbol flags below are needed because some backends make
 # use of those symbols.
-LDFLAGS+= 	-lpthread -lcuse -lnv -lm \
-		-Wl,--export-dynamic-symbol=virtual_oss_wait \
+LDFLAGS+=	-Wl,--export-dynamic-symbol=virtual_oss_wait \
 		-Wl,--export-dynamic-symbol=voss_has_synchronization
-LIBADD=		samplerate
-LDFLAGS+=	-L${.OBJDIR:H:H}/libsamplerate
 
 .include <bsd.prog.mk>