Page MenuHomeFreeBSD
Files F172250973

D54705.id169838.diff
No OneTemporary
Actions

D54705.id169838.diff
View Options

diff --git a/lib/virtual_oss/Makefile.inc b/lib/virtual_oss/Makefile.inc
--- a/lib/virtual_oss/Makefile.inc
+++ b/lib/virtual_oss/Makefile.inc
@@ -3,5 +3,7 @@
SHLIBDIR= ${LIBDIR}/virtual_oss
CFLAGS+= -I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss
+# XXX virtual_oss/int.h includes samplerate.h, but the library isn't used
+CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate
.include "../Makefile.inc"
diff --git a/lib/virtual_oss/bt/Makefile b/lib/virtual_oss/bt/Makefile
--- a/lib/virtual_oss/bt/Makefile
+++ b/lib/virtual_oss/bt/Makefile
@@ -4,8 +4,7 @@
avdtp.c \
sbc_encode.c
-CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate
-LIBADD= bluetooth samplerate sdp
+LIBADD= bluetooth 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
--- a/lib/virtual_oss/null/Makefile
+++ b/lib/virtual_oss/null/Makefile
@@ -2,7 +2,4 @@
SRCS= null.c
-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
--- a/lib/virtual_oss/oss/Makefile
+++ b/lib/virtual_oss/oss/Makefile
@@ -2,7 +2,4 @@
SRCS= oss.c
-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
--- a/lib/virtual_oss/sndio/Makefile
+++ b/lib/virtual_oss/sndio/Makefile
@@ -2,9 +2,7 @@
SRCS= sndio.c
-CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate \
- -I${LOCALBASE:U/usr/local}/include
+CFLAGS+= -I${LOCALBASE:U/usr/local}/include \
LDFLAGS+= -L${LOCALBASE:U/usr/local}/lib -lsndio
-LIBADD= samplerate
.include <bsd.lib.mk>

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 18, 6:32 AM (9 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
39123661
Default Alt Text
D54705.id169838.diff (1 KB)

Event Timeline