From 49e62f1cb32c7851a3a2e37d43bf7acbfc98ebf0 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Sat, 7 Oct 2006 19:26:46 +0000
Subject: [PATCH] Shuffle _*_libs assigments (no functional changes).

---
 Makefile.inc1 | 61 +++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 817528a0e22f..951906c00a22 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1012,39 +1012,28 @@ _startup_libs+=	lib/csu/${MACHINE_ARCH}-elf
 _startup_libs+=	lib/csu/${MACHINE_ARCH}
 .endif
 
-_prebuild_libs=
-
-_generic_libs=	gnu/lib
-
-.if ${MK_IPX} != "no"
-_prebuild_libs+= lib/libipx
-.endif
-
-.if ${MK_KERBEROS} != "no"
-_prebuild_libs+=	kerberos5/lib/libasn1
-_prebuild_libs+=	kerberos5/lib/libkrb5
-_prebuild_libs+=	kerberos5/lib/libroken
-_prebuild_libs+=	lib/libgssapi
-_generic_libs+=	kerberos5/lib
-.endif
-
-_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
+_prebuild_libs=	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
+		${_kerberos5_lib_libroken} \
+		lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
+		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/libncurses lib/libopie lib/libpam \
-		lib/libradius \
-		lib/libsbuf lib/libtacplus lib/libutil \
-		lib/libz lib/msun
+		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
+		${_lib_libypclnt} lib/libz lib/msun \
+		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
+		${_secure_lib_libssl}
+
+_generic_libs=	gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
-_generic_libs+=	lib
-
 .if ${MK_CRYPT} != "no"
 .if ${MK_OPENSSL} != "no"
-_prebuild_libs+=	secure/lib/libcrypto secure/lib/libssl
+_secure_lib_libcrypto= secure/lib/libcrypto
+_secure_lib_libssl= secure/lib/libssl
 lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
 .if ${MK_OPENSSH} != "no"
-_prebuild_libs+=	secure/lib/libssh
+_secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
 .if ${MK_KERBEROS} != "no"
 secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
@@ -1053,19 +1042,29 @@ secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
 .endif
 .endif
 .endif
-_generic_libs+=	secure/lib
+_secure_lib=	secure/lib
+.endif
+
+.if ${MK_IPX} != "no"
+_lib_libipx=	lib/libipx
+.endif
+
+.if ${MK_KERBEROS} != "no"
+_kerberos5_lib=	kerberos5/lib
+_kerberos5_lib_libasn1= kerberos5/lib/libasn1
+_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
+_kerberos5_lib_libroken= kerberos5/lib/libroken
+_lib_libgssapi=	lib/libgssapi
+.endif
+
+.if ${MK_NIS} != "no"
+_lib_libypclnt=	lib/libypclnt
 .endif
 
 .if ${MK_OPENSSL} == "no"
 lib/libradius__L: lib/libmd__L
 .endif
 
-.if ${MK_NIS} != "no"
-_prebuild_libs+=	lib/libypclnt
-.endif
-
-_generic_libs+=	usr.bin/lex/lib
-
 .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
 ${_lib}__L: .PHONY
 .if exists(${.CURDIR}/${_lib})