Module Name: src
Committed By: isaki
Date: Tue May 7 15:01:50 UTC 2019
Modified Files:
src/sys/modules/audio [isaki-audio2]: Makefile
src/sys/modules/spkr [isaki-audio2]: Makefile
src/sys/rump/dev/lib/libaudio [isaki-audio2]: Makefile
Removed Files:
src/sys/rump/dev/lib/libaudio [isaki-audio2]: aurateconv.h mulaw.h
Log Message:
Fix paths and flags.
- aurateconv is gone. mulaw is a part of audio inseparably.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/modules/audio/Makefile
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/modules/spkr/Makefile
cvs rdiff -u -r1.6 -r1.6.12.1 src/sys/rump/dev/lib/libaudio/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libaudio/aurateconv.h \
src/sys/rump/dev/lib/libaudio/mulaw.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/audio/Makefile
diff -u src/sys/modules/audio/Makefile:1.3 src/sys/modules/audio/Makefile:1.3.2.1
--- src/sys/modules/audio/Makefile:1.3 Sun Feb 17 04:05:43 2019
+++ src/sys/modules/audio/Makefile Tue May 7 15:01:50 2019
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2019/02/17 04:05:43 rin Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2019/05/07 15:01:50 isaki Exp $
.include "../Makefile.inc"
-.PATH: ${S}/dev
+.PATH: ${S}/dev/audio
KMOD= audio
IOCONF= audio.ioconf
SRCS= audio.c \
- auconv.c \
- aurateconv.c \
- auvolconv.c \
+ alaw.c \
+ linear.c \
mulaw.c
-CPPFLAGS+= -DNAUDIO=1 -DNAURATECONV=1 -DNMULAW=1
+CPPFLAGS+= -DNAUDIO=1
WARNS= 3
Index: src/sys/modules/spkr/Makefile
diff -u src/sys/modules/spkr/Makefile:1.8 src/sys/modules/spkr/Makefile:1.8.2.1
--- src/sys/modules/spkr/Makefile:1.8 Sun Feb 17 04:05:58 2019
+++ src/sys/modules/spkr/Makefile Tue May 7 15:01:50 2019
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.8 2019/02/17 04:05:58 rin Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2019/05/07 15:01:50 isaki Exp $
.include "../Makefile.inc"
-.PATH: ${S}/dev/isa ${S}/dev
+.PATH: ${S}/dev/isa
KMOD= spkr
IOCONF= spkr.ioconf
SRCS= spkr.c spkr_pcppi.c
.PATH: ${S}/dev
-SRCS+= spkr_audio.c audiobell.c
+SRCS+= spkr_audio.c
+
+.PATH: ${S}/dev/audio
+SRCS+= audiobell.c
CPPFLAGS+= -DNWSMUX=1
Index: src/sys/rump/dev/lib/libaudio/Makefile
diff -u src/sys/rump/dev/lib/libaudio/Makefile:1.6 src/sys/rump/dev/lib/libaudio/Makefile:1.6.12.1
--- src/sys/rump/dev/lib/libaudio/Makefile:1.6 Thu Jun 1 09:44:30 2017
+++ src/sys/rump/dev/lib/libaudio/Makefile Tue May 7 15:01:50 2019
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2017/06/01 09:44:30 pgoyette Exp $
+# $NetBSD: Makefile,v 1.6.12.1 2019/05/07 15:01:50 isaki Exp $
#
-.PATH: ${.CURDIR}/../../../../dev
+.PATH: ${.CURDIR}/../../../../dev/audio
LIB= rumpdev_audio
COMMENT=Audio support (incl. /dev/audio and /dev/mixer)
IOCONF= AUDIO.ioconf
-SRCS= audio.c auconv.c aurateconv.c auvolconv.c mulaw.c
+SRCS= alaw.c audio.c linear.c mulaw.c
SRCS+= audio_component.c
-CPPFLAGS+= -DNAUDIO=1 -DNAURATECONV=1 -DNMULAW=1
+CPPFLAGS+= -DNAUDIO=1
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
