From 8731fd1c47ee8fde0d0a707438278d0f8088cee2 Mon Sep 17 00:00:00 2001
From: David van Moolenbroek <david@minix3.org>
Date: Mon, 6 Jul 2015 13:57:19 +0200
Subject: [PATCH] audio: use standard Makefile structure

The previous approach of including libraries through the parent
directory's Makefile.inc created linking issues, with libchardriver
not finding snprintf in certain cases.  The new approach of including
libraries through the driver's only Makefile is the one used by all
other drivers.

Change-Id: I96e6308e12e54f0fce8ecf58bd061269860d4355
---
 minix/drivers/audio/Makefile.inc    | 6 ------
 minix/drivers/audio/README          | 3 ---
 minix/drivers/audio/es1370/Makefile | 5 ++++-
 minix/drivers/audio/es1371/Makefile | 5 ++++-
 minix/drivers/audio/sb16/Makefile   | 3 +++
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/minix/drivers/audio/Makefile.inc b/minix/drivers/audio/Makefile.inc
index d32baf393..01b5f2341 100644
--- a/minix/drivers/audio/Makefile.inc
+++ b/minix/drivers/audio/Makefile.inc
@@ -1,7 +1 @@
-BINDIR?= /service
-MAN?=
-
-DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} 
-LDADD+= -laudiodriver -lchardriver -lsys 
-
 .include "../Makefile.inc"
diff --git a/minix/drivers/audio/README b/minix/drivers/audio/README
index f8031831e..ee1b90223 100644
--- a/minix/drivers/audio/README
+++ b/minix/drivers/audio/README
@@ -1,11 +1,8 @@
 ***** Minix 3 Audio drivers *****
 
 Directories:
-common/            Generic driver framework
 es1370/            ES1370 driver
 es1371/            ES1371 driver
-
-Needs updating:
 sb16/              SB16 ISA driver
 
 Running the drivers:
diff --git a/minix/drivers/audio/es1370/Makefile b/minix/drivers/audio/es1370/Makefile
index 0fe5b1338..86e89f645 100644
--- a/minix/drivers/audio/es1370/Makefile
+++ b/minix/drivers/audio/es1370/Makefile
@@ -1,5 +1,8 @@
-# Makefile for the ES1371 sounddriver (SB16)
+# Makefile for the ES1370 sounddriver
 PROG=	es1370
 SRCS=	es1370.c ak4531.c pci_helper.c
 
+DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}
+LDADD+= -laudiodriver -lchardriver -lsys
+
 .include <minix.service.mk>
diff --git a/minix/drivers/audio/es1371/Makefile b/minix/drivers/audio/es1371/Makefile
index c8b56e605..f7608ad75 100644
--- a/minix/drivers/audio/es1371/Makefile
+++ b/minix/drivers/audio/es1371/Makefile
@@ -1,5 +1,8 @@
-# Makefile for the ES1371 sounddriver (SB16)
+# Makefile for the ES1371 sounddriver
 PROG=	es1371
 SRCS=	es1371.c AC97.c pci_helper.c wait.c sample_rate_converter.c
 
+DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}
+LDADD+= -laudiodriver -lchardriver -lsys
+
 .include <minix.service.mk>
diff --git a/minix/drivers/audio/sb16/Makefile b/minix/drivers/audio/sb16/Makefile
index 8e3b89d02..ca31704ce 100644
--- a/minix/drivers/audio/sb16/Makefile
+++ b/minix/drivers/audio/sb16/Makefile
@@ -2,4 +2,7 @@
 PROG=	sb16
 SRCS=	sb16.c mixer.c
 
+DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}
+LDADD+= -laudiodriver -lchardriver -lsys
+
 .include <minix.service.mk>
-- 
2.44.0