freebsd/freebsd-src
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-11-07 04:36:52 -10:00
Code Issues Packages Projects Releases Wiki Activity

virtual_oss: build system tidying

Browse Source 
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
This commit is contained in:
Brooks Davis committed 2026-01-16 09:33:56 +00:00
1 parent adab1dd6a7
commit 373c72ad50
8 files changed
+14 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/virtual_oss/Makefile
-2
View File
@@ -1,7 +1,5 @@
.include <src.opts.mk>
SHLIBDIR?= ${LIBDIR}/virtual_oss
SUBDIR+= null \
oss
lib/virtual_oss/Makefile.inc
+4 -2
View File
@@ -1,5 +1,7 @@
PACKAGE= sound
.include "../Makefile.inc"
SHLIBDIR= ${LIBDIR}/virtual_oss
LDFLAGS+= -L${.OBJDIR:H:H}/libsamplerate
CFLAGS+= -I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss
.include "../Makefile.inc"
lib/virtual_oss/bt/Makefile
+2 -5
View File
@@ -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
lib/virtual_oss/null/Makefile
+1 -3
View File
@@ -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>
lib/virtual_oss/oss/Makefile
+1 -3
View File
@@ -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>
lib/virtual_oss/sndio/Makefile
+1 -3
View File
@@ -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
usr.sbin/virtual_oss/virtual_bt_speaker/Makefile
+1 -1
View File
@@ -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>
usr.sbin/virtual_oss/virtual_oss/Makefile
+4 -5
View File
@@ -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>