tidy up by inlining next level included makefiles

ok deraadt guenther

7 files changed, 38 insertions, 51 deletions

diff --git a/lib/libc/db/Makefile.inc b/lib/libc/db/Makefile.inc
index 9f9a35830d4..4afd83c05c5 100644
--- a/lib/libc/db/Makefile.inc
+++ b/lib/libc/db/Makefile.inc
@@ -1,10 +1,41 @@
-#	$OpenBSD: Makefile.inc,v 1.3 1998/11/20 11:18:33 d Exp $
+#	$OpenBSD: Makefile.inc,v 1.4 2015/04/06 09:05:32 tedu Exp $
 #
 CFLAGS+=-D__DBINTERFACE_PRIVATE
 
-.include "${LIBCSRCDIR}/db/btree/Makefile.inc"
-.include "${LIBCSRCDIR}/db/db/Makefile.inc"
-.include "${LIBCSRCDIR}/db/hash/Makefile.inc"
-.include "${LIBCSRCDIR}/db/man/Makefile.inc"
-.include "${LIBCSRCDIR}/db/mpool/Makefile.inc"
-.include "${LIBCSRCDIR}/db/recno/Makefile.inc"
+.PATH: ${LIBCSRCDIR}/db/btree
+
+SRCS+=	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \
+	bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \
+	bt_utils.c
+
+.PATH: ${LIBCSRCDIR}/db/db
+
+SRCS+=	db.c
+
+.PATH: ${LIBCSRCDIR}/db/hash
+
+SRCS+=	hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
+	hash_page.c ndbm.c
+
+.PATH: ${LIBCSRCDIR}/db/man
+
+MAN+=	btree.3 dbm.3 dbopen.3 hash.3 mpool.3 ndbm.3 recno.3
+MLINKS+= dbopen.3 db.3
+MLINKS+= dbm.3 dbminit.3 dbm.3 dbmclose.3 dbm.3 fetch.3 dbm.3 store.3
+MLINKS+= dbm.3 delete.3 dbm.3 firstkey.3 dbm.3 nextkey.3
+MLINKS+= mpool.3 mpool_open.3 mpool.3 mpool_filter.3 mpool.3 mpool_new.3
+MLINKS+= mpool.3 mpool_delete.3 mpool.3 mpool_get.3 mpool.3 mpool_put.3
+MLINKS+= mpool.3 mpool_sync.3 mpool.3 mpool_close.3
+MLINKS+= ndbm.3 dbm_clearerr.3 ndbm.3 dbm_close.3 ndbm.3 dbm_delete.3
+MLINKS+= ndbm.3 dbm_dirfno.3 ndbm.3 dbm_error.3 ndbm.3 dbm_fetch.3
+MLINKS+= ndbm.3 dbm_firstkey.3 ndbm.3 dbm_nextkey.3 ndbm.3 dbm_open.3
+MLINKS+= ndbm.3 dbm_pagfno.3 ndbm.3 dbm_rdonly.3 ndbm.3 dbm_store.3
+
+.PATH: ${LIBCSRCDIR}/db/mpool
+
+SRCS+=	mpool.c
+
+.PATH: ${LIBCSRCDIR}/db/recno
+
+SRCS+=	rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \
+	rec_seq.c rec_utils.c
diff --git a/lib/libc/db/btree/Makefile.inc b/lib/libc/db/btree/Makefile.inc
deleted file mode 100644
index ac2f83a919e..00000000000
--- a/lib/libc/db/btree/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.4 1998/11/20 11:18:34 d Exp $
-
-.PATH: ${LIBCSRCDIR}/db/btree
-
-SRCS+=	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \
-	bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \
-	bt_utils.c
diff --git a/lib/libc/db/db/Makefile.inc b/lib/libc/db/db/Makefile.inc
deleted file mode 100644
index d93f931be9b..00000000000
--- a/lib/libc/db/db/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.3 1998/11/20 11:18:34 d Exp $
-
-.PATH: ${LIBCSRCDIR}/db/db
-
-SRCS+=	db.c
diff --git a/lib/libc/db/hash/Makefile.inc b/lib/libc/db/hash/Makefile.inc
deleted file mode 100644
index 5825ef8c976..00000000000
--- a/lib/libc/db/hash/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.5 2004/06/24 04:43:33 millert Exp $
-
-.PATH: ${LIBCSRCDIR}/db/hash
-
-SRCS+=	hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
-	hash_page.c ndbm.c
diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc
deleted file mode 100644
index 6a56912cac4..00000000000
--- a/lib/libc/db/man/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.13 2005/07/17 09:10:36 jaredy Exp $
-
-.PATH: ${LIBCSRCDIR}/db/man
-
-MAN+=	btree.3 dbm.3 dbopen.3 hash.3 mpool.3 ndbm.3 recno.3
-MLINKS+= dbopen.3 db.3
-MLINKS+= dbm.3 dbminit.3 dbm.3 dbmclose.3 dbm.3 fetch.3 dbm.3 store.3
-MLINKS+= dbm.3 delete.3 dbm.3 firstkey.3 dbm.3 nextkey.3
-MLINKS+= mpool.3 mpool_open.3 mpool.3 mpool_filter.3 mpool.3 mpool_new.3
-MLINKS+= mpool.3 mpool_delete.3 mpool.3 mpool_get.3 mpool.3 mpool_put.3
-MLINKS+= mpool.3 mpool_sync.3 mpool.3 mpool_close.3
-MLINKS+= ndbm.3 dbm_clearerr.3 ndbm.3 dbm_close.3 ndbm.3 dbm_delete.3
-MLINKS+= ndbm.3 dbm_dirfno.3 ndbm.3 dbm_error.3 ndbm.3 dbm_fetch.3
-MLINKS+= ndbm.3 dbm_firstkey.3 ndbm.3 dbm_nextkey.3 ndbm.3 dbm_open.3
-MLINKS+= ndbm.3 dbm_pagfno.3 ndbm.3 dbm_rdonly.3 ndbm.3 dbm_store.3
diff --git a/lib/libc/db/mpool/Makefile.inc b/lib/libc/db/mpool/Makefile.inc
deleted file mode 100644
index 2e8eaf54761..00000000000
--- a/lib/libc/db/mpool/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.3 1998/11/20 11:18:36 d Exp $
-
-.PATH: ${LIBCSRCDIR}/db/mpool
-
-SRCS+=	mpool.c
diff --git a/lib/libc/db/recno/Makefile.inc b/lib/libc/db/recno/Makefile.inc
deleted file mode 100644
index e9976e019d5..00000000000
--- a/lib/libc/db/recno/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.4 1998/11/20 11:18:36 d Exp $
-
-.PATH: ${LIBCSRCDIR}/db/recno
-
-SRCS+=	rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \
-	rec_seq.c rec_utils.c