sb16: flatten mixer, common, dsp hierarchy into 2-PROGS dir

diff --git a/drivers/sb16/Makefile b/drivers/sb16/Makefile
index 1c7aa1d10ed351982d5cdbea17f04680bb8b3594..3136fe52188d10c77ab5793c80322d2920255aed 100644 (file)
--- a/drivers/sb16/Makefile
+++ b/drivers/sb16/Makefile
@@ -1,7 +1,13 @@
 # Makefile for the Sound Blaster 16 (SB16) driver
 
-.include <bsd.own.mk>
+PROGS=sb16_mixer sb16_dsp
 
-SUBDIR=        common .WAIT dsp mixer
+SRCS.sb16_dsp=sb16.c sb16_dsp.c sb16_dsp_liveupdate.c
+SRCS.sb16_mixer=sb16.c sb16_mixer.c
+MAN.sb16_dsp=
+MAN.sb16_mixer=
 
-.include <bsd.subdir.mk>
+DPADD+= ${LIBDRIVER} ${LIBSYS}
+LDADD+= -ldriver -lsys
+
+.include <bsd.prog.mk>

diff --git a/drivers/sb16/Makefile.inc b/drivers/sb16/Makefile.inc
deleted file mode 100644 (file)
index 2da8439..0000000
--- a/drivers/sb16/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-.include <bsd.own.mk>
-
-LIBCOMMON != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
-CPPFLAGS+=-I${.CURDIR}/../common
-DPADD+= ${LIBCOMMON}/libcommon.a
-LDADD+= -L${LIBCOMMON} -lcommon
-
-DPADD+= ${LIBDRIVER} ${LIBSYS}
-LDADD+=        -ldriver -lsys
-
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
-.endif

diff --git a/drivers/sb16/common/Makefile b/drivers/sb16/common/Makefile
deleted file mode 100644 (file)
index 0dcdab1..0000000
--- a/drivers/sb16/common/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Makefile for the Sound Blaster 16 (SB16) common
-
-LIBISPRIVATE=   yes
-
-LIB=    common
-SRCS=   sb16.c
-
-.include <bsd.lib.mk>

diff --git a/drivers/sb16/dsp/Makefile b/drivers/sb16/dsp/Makefile
deleted file mode 100644 (file)
index 82393ac..0000000
--- a/drivers/sb16/dsp/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Makefile for the Sound Blaster 16 (SB16) dsp
-PROG=  sb16_dsp
-SRCS=  sb16_dsp.c sb16_dsp_liveupdate.c
-
-MAN=
-
-BINDIR?= /usr/sbin
-
-.include <bsd.prog.mk>

diff --git a/drivers/sb16/mixer/Makefile b/drivers/sb16/mixer/Makefile
deleted file mode 100644 (file)
index 1da7722..0000000
--- a/drivers/sb16/mixer/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Makefile for the Sound Blaster 16 (SB16) mixer
-PROG=  sb16_mixer
-SRCS=  sb16_mixer.c
-
-MAN=
-
-BINDIR?= /usr/sbin
-
-.include <bsd.prog.mk>

diff --git a/drivers/sb16/common/sb16.c b/drivers/sb16/sb16.c
similarity index 100%
rename from drivers/sb16/common/sb16.c
rename to drivers/sb16/sb16.c

diff --git a/drivers/sb16/common/sb16.h b/drivers/sb16/sb16.h
similarity index 100%
rename from drivers/sb16/common/sb16.h
rename to drivers/sb16/sb16.h

diff --git a/drivers/sb16/dsp/sb16_dsp.c b/drivers/sb16/sb16_dsp.c
similarity index 100%
rename from drivers/sb16/dsp/sb16_dsp.c
rename to drivers/sb16/sb16_dsp.c

diff --git a/drivers/sb16/dsp/sb16_dsp_liveupdate.c b/drivers/sb16/sb16_dsp_liveupdate.c
similarity index 100%
rename from drivers/sb16/dsp/sb16_dsp_liveupdate.c
rename to drivers/sb16/sb16_dsp_liveupdate.c

diff --git a/drivers/sb16/mixer/sb16_mixer.c b/drivers/sb16/sb16_mixer.c
similarity index 100%
rename from drivers/sb16/mixer/sb16_mixer.c
rename to drivers/sb16/sb16_mixer.c