Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libarch Makefile: define SHLIB_VERSION_FILE if SRCS defi...



details:   https://anonhg.NetBSD.org/src/rev/81ddd1da65e3
branches:  trunk
changeset: 475958:81ddd1da65e3
user:      simonb <simonb%NetBSD.org@localhost>
date:      Tue Aug 31 13:50:47 1999 +0000

description:
Makefile: define SHLIB_VERSION_FILE if SRCS defined.
arm32/Makefile.inc: don't need to set .PATH
i386/Makefile.inc: don't need to set .PATH, SHLIB_VERSION_FILE

Fixes PR lib/8298 from Richard Earnshaw in a more general way.

diffstat:

 lib/libarch/Makefile           |  3 ++-
 lib/libarch/arm32/Makefile.inc |  4 +---
 lib/libarch/i386/Makefile.inc  |  6 +-----
 3 files changed, 4 insertions(+), 9 deletions(-)

diffs (48 lines):

diff -r 9f8dc4fdd188 -r 81ddd1da65e3 lib/libarch/Makefile
--- a/lib/libarch/Makefile      Tue Aug 31 12:30:35 1999 +0000
+++ b/lib/libarch/Makefile      Tue Aug 31 13:50:47 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 1999/06/10 00:49:51 simonb Exp $
+#      $NetBSD: Makefile,v 1.13 1999/08/31 13:50:47 simonb Exp $
 
 ARCHDIRS= arm32 i386 m68k
 
@@ -14,6 +14,7 @@
 # Build the library if SRCS is now defined ...
 .if defined(SRCS)
 LIB=    ${MACHINE_ARCH:C/mipse[bl]/mips/}
+SHLIB_VERSION_FILE= ${.CURDIR}/${MACHINE_ARCH:C/mipse[bl]/mips/}/shlib_version
 
 .include <bsd.lib.mk>
 .else
diff -r 9f8dc4fdd188 -r 81ddd1da65e3 lib/libarch/arm32/Makefile.inc
--- a/lib/libarch/arm32/Makefile.inc    Tue Aug 31 12:30:35 1999 +0000
+++ b/lib/libarch/arm32/Makefile.inc    Tue Aug 31 13:50:47 1999 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.4 1999/06/10 00:49:51 simonb Exp $
+# $NetBSD: Makefile.inc,v 1.5 1999/08/31 13:50:47 simonb Exp $
 
 .if (${MACHINE_ARCH} == "arm32")
-.PATH: ${LIBC}/arm32
-
 SRCS+= arm32_sync_icache.c arm32_drain_writebuf.c
 .endif
 
diff -r 9f8dc4fdd188 -r 81ddd1da65e3 lib/libarch/i386/Makefile.inc
--- a/lib/libarch/i386/Makefile.inc     Tue Aug 31 12:30:35 1999 +0000
+++ b/lib/libarch/i386/Makefile.inc     Tue Aug 31 13:50:47 1999 +0000
@@ -1,13 +1,9 @@
-#      $NetBSD: Makefile.inc,v 1.7 1999/06/10 00:49:52 simonb Exp $
+#      $NetBSD: Makefile.inc,v 1.8 1999/08/31 13:50:47 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 \



Home | Main Index | Thread Index | Old Index