From d57516168ed6719590a96aa9ac17ffd0dc9832f5 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Fri, 30 Jul 2004 04:18:48 +0000
Subject: [PATCH] Move the LIB<libname>?= assignments from bsd.prog.mk to
 bsd.own.mk so that they may be used by non PROGs (e.g., LIBs).

Improve some comments.
---
 share/mk/bsd.own.mk  | 57 ++++++++++++++++++++++++++++++++++++++------
 share/mk/bsd.prog.mk | 47 +-----------------------------------
 2 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index b23f839da9ac..f4028431e8a2 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.421 2004/06/11 07:14:16 jmc Exp $
+#	$NetBSD: bsd.own.mk,v 1.422 2004/07/30 04:18:48 lukem Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -524,7 +524,8 @@ dependall:	.NOTMAIN realdepend .MAKE
 # Supported NO* options (if defined, MK* will be forced to "no",
 # regardless of user's mk.conf setting).
 #
-.for var in CRYPTO DOC HTML LINKLIB LINT MAN NLS OBJ PIC PICINSTALL PROFILE \
+.for var in \
+	CRYPTO DOC HTML LINKLIB LINT MAN NLS OBJ PIC PICINSTALL PROFILE \
 	SHARE STATICLIB
 .if defined(NO${var})
 MK${var}:=	no
@@ -543,7 +544,8 @@ MK${var}:=	yes
 #
 # MK* options which default to "yes".
 #
-.for var in BFD BINUTILS \
+.for var in \
+	BFD BINUTILS \
 	CATPAGES CRYPTO CVS \
 	DOC \
 	GCC GCCCMDS GDB \
@@ -564,7 +566,8 @@ MK${var}?=	yes
 #
 # MK* options which default to "no".
 #
-.for var in CRYPTO_IDEA CRYPTO_MDC2 CRYPTO_RC5 \
+.for var in \
+	CRYPTO_IDEA CRYPTO_MDC2 CRYPTO_RC5 \
 	MANZ OBJDIRS PRIVATELIB SOFTFLOAT UNPRIVED UPDATE X11
 MK${var}?=	no
 .endfor
@@ -667,9 +670,49 @@ USE_${var}?= yes
 USE_${var}?= yes
 .endfor
 
+
 #
-# Use XFree86 4.x as default version on i386, amd64, macppc, cats, sgimips,
-# and sparc*.
+# Installed system library definitions.
+#
+#	E.g.
+#		LIBC?=${DESTDIR}/usr/lib/libc.a
+#		LIBX11?=${DESTDIR}/usr/X11R6/lib/libX11.a
+#	etc..
+
+.for _lib in \
+	bz2 c c_pic cdk com_err compat crypt crypto crypto_idea \
+	crypto_mdc2 crypto_rc5 curses dbm des edit event \
+	form gcc gnumalloc gssapi hdb intl ipsec \
+	kadm kadm5clnt kadm5srv kafs kdb krb krb5 kstream kvm l \
+	m magic menu objc ossaudio pcap pci pmc posix pthread pthread_dbg \
+	resolv rmt roken rpcsvc rt skey sl ss ssl termcap usbhid util \
+	wrap y z
+.ifndef LIB${_lib:tu}
+LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_lib}.a
+.MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
+.endif
+.endfor
+
+.ifndef LIBSTDCXX
+LIBSTDCXX=	${DESTDIR}/usr/lib/libstdc++.a
+.MADE:		${LIBSTDCXX}
+.endif
+
+.for _lib in \
+	dps expat fntstubs fontcache fontconfig fontenc freetype FS \
+	GL GLU ICE lbxutil SM X11 Xau Xaw Xdmcp Xext Xfont Xft \
+	Xi Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt \
+	XTrap Xtst Xv Xxf86dga Xxf86misc Xxf86vm
+.ifndef LIB${_lib:tu}
+LIB${_lib:tu}=	${DESTDIR}/usr/X11R6/lib/lib${_lib}.a
+.MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
+.endif
+.endfor
+
+
+#
+# Use XFree86 4.x as default version on:
+#	i386, amd64, macppc, cats, sgimips, sparc, sparc64.
 #
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE} == "amd64" || \
     ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
@@ -679,7 +722,7 @@ USE_XF86_4?=	yes
 .endif
 
 #
-# Where X11R6 sources are and where it is installed to
+# Where X11R6 sources are and where it is installed to.
 #
 X11SRCDIR?=		/usr/xsrc
 X11SRCDIR.xc?=		${X11SRCDIR}/xfree/xc
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 9e80707b3c04..0e7940259c98 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.200 2004/06/10 00:29:59 lukem Exp $
+#	$NetBSD: bsd.prog.mk,v 1.201 2004/07/30 04:18:48 lukem Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -51,51 +51,6 @@ LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
 .MADE: ${LIBCRT0}
 .endif
 
-##### Installed system library definitions
-#     E.g. LIBC?=${DESTDIR}/usr/lib/libc.a
-#     etc..
-#
-__bsd_prog_mk_system_libs?= \
-	BZ2 C C_PIC CDK COM_ERR COMPAT CRYPT CRYPTO CRYPTO_IDEA CRYPTO_MDC2 \
-	CRYPTO_RC5 \
-	CURSES DBM DES EDIT EVENT FORM GCC GNUMALLOC GSSAPI HDB INTL IPSEC \
-	KADM KADM5CLNT KADM5SRV KAFS KDB KRB KRB5 KSTREAM KVM L M MAGIC MENU \
-	OBJC OSSAUDIO PCAP PCI PMC POSIX PTHREAD PTHREAD_DBG RESOLV RMT \
-	ROKEN RPCSVC RT SKEY SL SS SSL TERMCAP USBHID UTIL WRAP Y Z
-
-.for _n in ${__bsd_prog_mk_system_libs}
-.ifndef LIB${_n}
-LIB${_n}= ${DESTDIR}/usr/lib/lib${_n:tl}.a
-# Note: ${DESTDIR} will be expanded in the following rule
-.MADE: ${LIB${_n}}
-.endif
-.endfor
-.undef __bsd_prog_mk_system_libs
-
-.ifndef LIBSTDCXX
-LIBSTDCXX=	${DESTDIR}/usr/lib/libstdc++.a
-.MADE: ${LIBSTDCXX}
-.endif
-
-##### Installed X11R6 library definitions
-#     E.g. LIBX11?=${DESTDIR}/usr/X11R6/lib/libX11.a
-#     etc..
-#
-__bsd_prog_mk_x11r6_libs?= \
-	dps expat fntstubs fontcache fontconfig fontenc freetype FS \
-	GL GLU ICE lbxutil SM X11 Xau Xaw Xdmcp Xext Xfont Xft \
-	Xi Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt \
-	XTrap Xtst Xv Xxf86dga Xxf86misc Xxf86vm
-
-.for _n in ${__bsd_prog_mk_x11r6_libs}
-.ifndef LIB${_n:tu}
-LIB${_n:tu}= ${DESTDIR}/usr/X11R6/lib/lib${_n}.a
-# Note: ${DESTDIR} will be expanded in the following rule
-.MADE: ${LIB${_n:tu}}
-.endif
-.endfor
-.undef __bsd_prog_mk_x11r6_libs
-
 ##### Build and install rules
 .if defined(SHAREDSTRINGS)
 CLEANFILES+=strings