[src/trunk]: src/lib/libarch Include all arch-dependant Makefile.inc's. In e...

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

details:   https://anonhg.NetBSD.org/src/rev/1bec3eb7e435
branches:  trunk
changeset: 473623:1bec3eb7e435
user:      simonb <simonb%NetBSD.org@localhost>
date:      Thu Jun 10 00:49:51 1999 +0000

description:
Include all arch-dependant Makefile.inc's.  In each arch-dependent
Makefile.inc, always add the man pages for that directory, and only
specify a SRCS= line (at whatever else is needed for that arch) inside
a ${MACHINE_ARCH} .ifdef.  The top-level Makefile includes <bsd.lib.mk>
only if SRCS is defined, and otherwise just includes <bsd.man.mk>.

diffstat:

 lib/libarch/Makefile           |  25 +++++++++++++++++++------
 lib/libarch/Makefile.inc       |   9 ---------
 lib/libarch/arm32/Makefile     |  10 ----------
 lib/libarch/arm32/Makefile.inc |   7 +++----
 lib/libarch/i386/Makefile      |  17 -----------------
 lib/libarch/i386/Makefile.inc  |  18 ++++++++++++++++++
 lib/libarch/m68k/Makefile      |   7 -------
 lib/libarch/m68k/Makefile.inc  |   7 ++++---
 8 files changed, 44 insertions(+), 56 deletions(-)

diffs (145 lines):

diff -r 8fc6370b19e7 -r 1bec3eb7e435 lib/libarch/Makefile
--- a/lib/libarch/Makefile      Thu Jun 10 00:40:05 1999 +0000
+++ b/lib/libarch/Makefile      Thu Jun 10 00:49:51 1999 +0000
@@ -1,9 +1,22 @@
-#      $NetBSD: Makefile,v 1.11 1999/03/05 12:19:17 drochner Exp $
+#      $NetBSD: Makefile,v 1.12 1999/06/10 00:49:51 simonb Exp $
+
+ARCHDIRS= arm32 i386 m68k
 
-ARCHSUBDIR= ${MACHINE_ARCH:C/mipse[bl]/mips/}
+.for arch in ${ARCHDIRS}
+.include "${.CURDIR}/${arch:C/mipse[bl]/mips/}/Makefile.inc"
+.PATH: ${.CURDIR}/${arch:C/mipse[bl]/mips/}
+.endfor
 
-.if exists(${ARCHSUBDIR})
-SUBDIR+= ${ARCHSUBDIR}
+OBJS+= ${ASM}
+POBJS+=        ${ASM:.o=.po}
+CLEANFILES+= ${ASM} ${POBJS}
+
+# Build the library if SRCS is now defined ...
+.if defined(SRCS)
+LIB=    ${MACHINE_ARCH:C/mipse[bl]/mips/}
+
+.include <bsd.lib.mk>
+.else
+# ... otherwise just build the manpages
+.include <bsd.man.mk>
 .endif
-
-.include <bsd.subdir.mk>
diff -r 8fc6370b19e7 -r 1bec3eb7e435 lib/libarch/Makefile.inc
--- a/lib/libarch/Makefile.inc  Thu Jun 10 00:40:05 1999 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#      $NetBSD: Makefile.inc,v 1.4 1999/03/05 12:19:17 drochner Exp $
-#
-# This Makefile includes boiler-plate stuff included by each subdir's Makefile.
-
-OBJS+= ${ASM}
-POBJS+=        ${ASM:.o=.po}
-CLEANFILES+= ${ASM} ${POBJS}
-
-LIB=    ${MACHINE_ARCH:C/mipse[bl]/mips/}
diff -r 8fc6370b19e7 -r 1bec3eb7e435 lib/libarch/arm32/Makefile
--- a/lib/libarch/arm32/Makefile        Thu Jun 10 00:40:05 1999 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.2 1997/10/05 23:48:40 mark Exp $
-
-.PATH: ${LIBC}/arm32
-
-SRCS+= arm32_sync_icache.c arm32_drain_writebuf.c
-
-MAN+=  arm32_sync_icache.2 arm32_drain_writebuf.2
-
-.include <bsd.lib.mk>
-
diff -r 8fc6370b19e7 -r 1bec3eb7e435 lib/libarch/arm32/Makefile.inc
--- a/lib/libarch/arm32/Makefile.inc    Thu Jun 10 00:40:05 1999 +0000
+++ b/lib/libarch/arm32/Makefile.inc    Thu Jun 10 00:49:51 1999 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.3 1999/06/09 05:43:10 simonb Exp $
+# $NetBSD: Makefile.inc,v 1.4 1999/06/10 00:49:51 simonb Exp $
 
+.if (${MACHINE_ARCH} == "arm32")
 .PATH: ${LIBC}/arm32
 
 SRCS+= arm32_sync_icache.c arm32_drain_writebuf.c
+.endif
 
 MAN+=  arm32_sync_icache.2 arm32_drain_writebuf.2
-
-.include <bsd.lib.mk>
-
diff -r 8fc6370b19e7 -r 1bec3eb7e435 lib/libarch/i386/Makefile
--- a/lib/libarch/i386/Makefile Thu Jun 10 00:40:05 1999 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 1996/02/21 02:45:47 jtk Exp $
-
-.PATH: ${LIBC}/i386
-
-SRCS+= i386_get_ldt.c i386_set_ldt.c \
-       i386_iopl.c i386_get_ioperm.c i386_set_ioperm.c \
-       i386_vm86.c
-
-MAN+=  i386_get_ldt.2 \
-       i386_iopl.2 i386_get_ioperm.2 \
-       i386_vm86.2
-
-MLINKS+=i386_get_ldt.2 i386_set_ldt.2 \
-       i386_get_ioperm.2 i386_set_ioperm.2
-
-.include <bsd.lib.mk>
-
diff -r 8fc6370b19e7 -r 1bec3eb7e435 lib/libarch/i386/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libarch/i386/Makefile.inc     Thu Jun 10 00:49:51 1999 +0000
@@ -0,0 +1,18 @@
+#      $NetBSD: Makefile.inc,v 1.7 1999/06/10 00:49:52 simonb Exp $
+
+.if (${MACHINE_ARCH} == "i386")
+.PATH: ${LIBC}/i386
+
+SRCS+= i386_get_ldt.c i386_set_ldt.c \
+       i386_iopl.c i386_get_ioperm.c i386_set_ioperm.c \
+       i386_vm86.c
+
+SHLIB_VERSION_FILE= ${.CURDIR}/i386/shlib_version
+.endif
+
+MAN+=  i386_get_ldt.2 \
+       i386_iopl.2 i386_get_ioperm.2 \
+       i386_vm86.2
+
+MLINKS+=i386_get_ldt.2 i386_set_ldt.2 \
+       i386_get_ioperm.2 i386_set_ioperm.2
diff -r 8fc6370b19e7 -r 1bec3eb7e435 lib/libarch/m68k/Makefile
--- a/lib/libarch/m68k/Makefile Thu Jun 10 00:40:05 1999 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile,v 1.3 1999/02/17 08:24:53 itohy Exp $
-
-SRCS=  m68k_sync_icache.S
-MAN=   m68k_sync_icache.2
-MKLINT=no
-
-.include <bsd.lib.mk>
diff -r 8fc6370b19e7 -r 1bec3eb7e435 lib/libarch/m68k/Makefile.inc
--- a/lib/libarch/m68k/Makefile.inc     Thu Jun 10 00:40:05 1999 +0000
+++ b/lib/libarch/m68k/Makefile.inc     Thu Jun 10 00:49:51 1999 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.4 1999/06/09 05:43:48 simonb Exp $
+# $NetBSD: Makefile.inc,v 1.5 1999/06/10 00:49:52 simonb Exp $
 
+.if (${MACHINE_ARCH} == "m68k")
 SRCS=  m68k_sync_icache.S
-MAN=   m68k_sync_icache.2
 MKLINT=no
+.endif
 
-.include <bsd.lib.mk>
+MAN+=  m68k_sync_icache.2