summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--share/mk/Makefile4
-rw-r--r--share/mk/bsd.lib.mk3
-rw-r--r--share/mk/bsd.libnames.mk54
-rw-r--r--share/mk/bsd.prog.mk57
4 files changed, 60 insertions, 58 deletions
diff --git a/share/mk/Makefile b/share/mk/Makefile
index fc9bd75..9debbba 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,9 +1,9 @@
-# $Id: Makefile,v 1.10 1996/04/12 11:13:29 wosch Exp $
+# $Id: Makefile,v 1.11 1996/06/24 04:23:51 jkh Exp $
# From: @(#)Makefile 8.1 (Berkeley) 6/8/93
FILES= bsd.README
FILES+= bsd.dep.mk bsd.doc.mk bsd.info.mk bsd.kmod.mk bsd.obj.mk
-FILES+= bsd.lib.mk bsd.man.mk bsd.own.mk bsd.port.mk
+FILES+= bsd.lib.mk bsd.libnames.mk bsd.man.mk bsd.own.mk bsd.port.mk
FILES+= bsd.port.subdir.mk bsd.prog.mk bsd.sgml.mk bsd.subdir.mk
FILES+= sys.mk
NOOBJ= noobj
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index cf2a304..4e02330 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
-# $Id: bsd.lib.mk,v 1.39 1996/08/11 12:24:44 peter Exp $
+# $Id: bsd.lib.mk,v 1.42 1996/08/25 05:16:56 jkh Exp $
#
.if exists(${.CURDIR}/../Makefile.inc)
@@ -261,4 +261,5 @@ all-man:
.endif
.include <bsd.dep.mk>
+.include <bsd.libnames.mk>
.include <bsd.obj.mk>
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
new file mode 100644
index 0000000..22a7eba
--- /dev/null
+++ b/share/mk/bsd.libnames.mk
@@ -0,0 +1,54 @@
+# $Id$
+
+LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o
+LIBKZHEAD?= ${DESTDIR}/usr/lib/kzhead.o
+LIBKZTAIL?= ${DESTDIR}/usr/lib/kztail.o
+
+LIBC?= ${DESTDIR}/usr/lib/libc.a
+LIBC_PIC= ${DESTDIR}/usr/lib/libc_pic.a
+LIBCOM_ERR= ${DESTDIR}/usr/lib/libcom_err.a
+LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a
+LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a
+LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a
+LIBDES?= ${DESTDIR}/usr/lib/libdes.a # XXX doesn't exist
+LIBDIALOG?= ${DESTDIR}/usr/lib/libdialog.a
+LIBDISK?= ${DESTDIR}/usr/lib/libdisk.a
+LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a
+LIBF2C?= ${DESTDIR}/usr/lib/libf2c.a
+LIBFL?= "don't use LIBFL, use LIBL"
+LIBFORMS?= ${DESTDIR}/usr/lib/libforms.a
+LIBFTPIO?= ${DESTDIR}/usr/lib/libftpio.a
+LIBGPLUSPLUS?= ${DESTDIR}/usr/lib/libg++.a
+LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a
+LIBGCC_PIC?= ${DESTDIR}/usr/lib/libgcc_pic.a
+LIBGMP?= ${DESTDIR}/usr/lib/libgmp.a
+LIBGNUREGEX?= ${DESTDIR}/usr/lib/libgnuregex.a
+LIBIPX?= ${DESTDIR}/usr/lib/libipx.a
+LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a # XXX doesn't exist
+LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a # XXX doesn't exist
+LIBKEYCAP?= ${DESTDIR}/usr/lib/libkeycap.a
+LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a
+LIBL?= ${DESTDIR}/usr/lib/libl.a
+LIBLN?= "don't use, LIBLN, use LIBL"
+LIBM?= ${DESTDIR}/usr/lib/libm.a
+LIBMD?= ${DESTDIR}/usr/lib/libmd.a
+LIBMP?= ${DESTDIR}/usr/lib/libmp.a
+LIBMYTINFO?= ${DESTDIR}/usr/lib/libmytinfo.a
+LIBNCURSES?= ${DESTDIR}/usr/lib/libncurses.a
+LIBPC?= ${DESTDIR}/usr/lib/libpc.a # XXX doesn't exist
+LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a
+LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a # XXX doesn't exist
+LIBREADLINE?= ${DESTDIR}/usr/lib/libreadline.a
+LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a
+LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a
+LIBSCRYPT?= "don't use LIBSCRYPT, use LIBCRYPT"
+LIBSCSI?= ${DESTDIR}/usr/lib/libscsi.a
+LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a
+LIBSS?= ${DESTDIR}/usr/lib/libss.a
+LIBTCL?= ${DESTDIR}/usr/lib/libtcl.a
+LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.a
+LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a
+LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP"
+LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a
+LIBXPG4?= ${DESTDIR}/usr/lib/libxpg4.a
+LIBY?= ${DESTDIR}/usr/lib/liby.a
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 33c39fd..e0fb655 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $Id: bsd.prog.mk,v 1.35 1996/06/29 03:12:49 phk Exp $
+# $Id: bsd.prog.mk,v 1.38 1996/08/25 05:16:56 jkh Exp $
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
@@ -17,60 +17,6 @@ CXXINCLUDES+= -I${DESTDIR}/usr/include/${CXX}
STRIP?= -s
.endif
-
-LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o
-LIBKZHEAD?= ${DESTDIR}/usr/lib/kzhead.o
-LIBKZTAIL?= ${DESTDIR}/usr/lib/kztail.o
-
-LIBC?= ${DESTDIR}/usr/lib/libc.a
-LIBC_PIC= ${DESTDIR}/usr/lib/libc_pic.a
-LIBCOM_ERR= ${DESTDIR}/usr/lib/libcom_err.a
-LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a
-LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a
-LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a
-LIBDES?= ${DESTDIR}/usr/lib/libdes.a # XXX doesn't exist
-LIBDIALOG?= ${DESTDIR}/usr/lib/libdialog.a
-LIBDISK?= ${DESTDIR}/usr/lib/libdisk.a
-LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a
-LIBF2C?= ${DESTDIR}/usr/lib/libf2c.a
-LIBFL?= "don't use LIBFL, use LIBL"
-LIBFORMS?= ${DESTDIR}/usr/lib/libforms.a
-LIBFTPIO?= ${DESTDIR}/usr/lib/libftpio.a
-LIBGPLUSPLUS?= ${DESTDIR}/usr/lib/libg++.a
-LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a
-LIBGCC_PIC?= ${DESTDIR}/usr/lib/libgcc_pic.a
-LIBGMP?= ${DESTDIR}/usr/lib/libgmp.a
-LIBGNUREGEX?= ${DESTDIR}/usr/lib/libgnuregex.a
-LIBIPX?= ${DESTDIR}/usr/lib/libipx.a
-LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a # XXX doesn't exist
-LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a # XXX doesn't exist
-LIBKEYCAP?= ${DESTDIR}/usr/lib/libkeycap.a
-LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a
-LIBL?= ${DESTDIR}/usr/lib/libl.a
-LIBLN?= "don't use, LIBLN, use LIBL"
-LIBM?= ${DESTDIR}/usr/lib/libm.a
-LIBMD?= ${DESTDIR}/usr/lib/libmd.a
-LIBMP?= ${DESTDIR}/usr/lib/libmp.a
-LIBMYTINFO?= ${DESTDIR}/usr/lib/libmytinfo.a
-LIBNCURSES?= ${DESTDIR}/usr/lib/libncurses.a
-LIBPC?= ${DESTDIR}/usr/lib/libpc.a # XXX doesn't exist
-LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a
-LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a # XXX doesn't exist
-LIBREADLINE?= ${DESTDIR}/usr/lib/libreadline.a
-LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a
-LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a
-LIBSCRYPT?= "don't use LIBSCRYPT, use LIBCRYPT"
-LIBSCSI?= ${DESTDIR}/usr/lib/libscsi.a
-LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a
-LIBSS?= ${DESTDIR}/usr/lib/libss.a
-LIBTCL?= ${DESTDIR}/usr/lib/libtcl.a
-LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.a
-LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a
-LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP"
-LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a
-LIBXPG4?= ${DESTDIR}/usr/lib/libxpg4.a
-LIBY?= ${DESTDIR}/usr/lib/liby.a
-
.if defined(NOSHARED)
LDFLAGS+= -static
.endif
@@ -209,4 +155,5 @@ all-man:
.endif
.include <bsd.dep.mk>
+.include <bsd.libnames.mk>
.include <bsd.obj.mk>
OpenPOWER on IntegriCloud