[src/isaki-audio2]: src/sys Fix paths and flags.

[isaki <isaki%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/41e53da36679
branches:  isaki-audio2
changeset: 998545:41e53da36679
user:      isaki <isaki%NetBSD.org@localhost>
date:      Tue May 07 15:01:50 2019 +0000

description:
Fix paths and flags.
- aurateconv is gone.  mulaw is a part of audio inseparably.

diffstat:

 sys/modules/audio/Makefile             |  11 +++++------
 sys/modules/spkr/Makefile              |   9 ++++++---
 sys/rump/dev/lib/libaudio/Makefile     |   8 ++++----
 sys/rump/dev/lib/libaudio/aurateconv.h |   3 ---
 sys/rump/dev/lib/libaudio/mulaw.h      |   3 ---
 5 files changed, 15 insertions(+), 19 deletions(-)

diffs (91 lines):

diff -r 41fe33380201 -r 41e53da36679 sys/modules/audio/Makefile
--- a/sys/modules/audio/Makefile        Mon May 06 13:40:03 2019 +0000
+++ b/sys/modules/audio/Makefile        Tue May 07 15:01:50 2019 +0000
@@ -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
 
diff -r 41fe33380201 -r 41e53da36679 sys/modules/spkr/Makefile
--- a/sys/modules/spkr/Makefile Mon May 06 13:40:03 2019 +0000
+++ b/sys/modules/spkr/Makefile Tue May 07 15:01:50 2019 +0000
@@ -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
 
diff -r 41fe33380201 -r 41e53da36679 sys/rump/dev/lib/libaudio/Makefile
--- a/sys/rump/dev/lib/libaudio/Makefile        Mon May 06 13:40:03 2019 +0000
+++ b/sys/rump/dev/lib/libaudio/Makefile        Tue May 07 15:01:50 2019 +0000
@@ -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>
diff -r 41fe33380201 -r 41e53da36679 sys/rump/dev/lib/libaudio/aurateconv.h
--- a/sys/rump/dev/lib/libaudio/aurateconv.h    Mon May 06 13:40:03 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: aurateconv.h,v 1.1 2010/05/01 23:19:56 pooka Exp $     */
-
-#define NAURATECONV 1
diff -r 41fe33380201 -r 41e53da36679 sys/rump/dev/lib/libaudio/mulaw.h
--- a/sys/rump/dev/lib/libaudio/mulaw.h Mon May 06 13:40:03 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: mulaw.h,v 1.1 2010/05/01 23:19:56 pooka Exp $  */
-
-#define NMULAW 1