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

diff --git a/minix/drivers/audio/Makefile.inc b/minix/drivers/audio/Makefile.inc
index d32baf3935dfcac0821e52ab862b9f5f4eb74500..01b5f23410c841bf51e05b95e22841fb657be42a 100644 (file)
--- 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 f8031831e94e662d5379e42895c6a91b52db403f..ee1b90223ab202982c48dda80830f64a788131b0 100644 (file)
--- 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 0fe5b1338555e71d8c6ff5ff49022914ff8ec474..86e89f6450c7998bef2a32758ee22eb70e74cdb8 100644 (file)
--- 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 c8b56e6055ee6ca6d29545bf9251a011fbdfdfae..f7608ad75093e25495b5cda41d18122f849a1c2c 100644 (file)
--- 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 8e3b89d0200b875c1a5d4fb8d77f4c3514a56cbe..ca31704ceed6fdfb1fe8fe0e06b6ccc0f073950d 100644 (file)
--- 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>