From 8396b09173b878b61f5c342512e7457744ab05f8 Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Sat, 18 Dec 2010 15:16:19 -1000
Subject: [PATCH] Rearrange lib/Makefile.

Use one line per subdir.  This greatly improves readability.

Remove libraries we don't have any more from the comments.
---
 lib/Makefile | 98 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 74 insertions(+), 24 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index a5a65b1fc5..84a7ed493c 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -5,34 +5,88 @@
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
 #
-# libcom_err must be built before libkrb and libpam.
-# libcrypt must be built before libkrb and libpam.
+# ${_libc_r} must be built before libpthread.
+# libcom_err must be built before libpam.
+# libcrypt must be built before libpam.
 # libmd must be built before libarchive, libatm, libopie, libradius, and libtacplus.
-# libncurses must be built before libdialog, libedit and libreadline.
+# libncurses must be built before libdialog and libedit.
 # libradius must be built before libpam.
-# libtacplus must be built before libpam.
-# libutil must be built before libpam.
 # libsbuf must be built before libcam.
+# libtacplus must be built before libpam.
 # libthread_xu must be built before libpthread.
-# ${_libc_r} must be built before libpthread.
+# libutil must be built before libpam.
 # libpthread must be built before libprop.
 #
 # Otherwise, the SUBDIR list should be in alphabetical order.
 
-SUBDIR=	csu \
-	libbluetooth libcom_err libcrypt libm libmd libarchive \
-	libncurses libradius librt libtacplus libutil libsbuf \
-	libalias libatm libbz2 libc ${_libc_r} \
-	libcalendar libcam libcompat libdevinfo libdevstat libedit \
-	libexpat libfetch libfsid \
-	libftpio libipsec libipx libldns libkcore libkiconv libkinfo \
-	libkvm libmagic \
-	${_libmilter} ${_libncp} libnetgraph libopie libpam \
-	libpcap libposix1e libsdp libthread_xu libpthread libprop \
-	librpcsvc ${_libsm} \
-	${_libsmb} ${_libsmdb} ${_libsmutil} libstand libtelnet libusbhid \
-	${_libvgl} libwrap libxpg4 liby libypclnt libz i18n_module pam_module \
-	libc_rtld libsctp libevtr libdevattr
+SUBDIR_ORDERED=	${_libc_r} \
+	libcom_err \
+	libcrypt \
+	libmd \
+	libncurses \
+	libradius \
+	libsbuf \
+	libtacplus \
+	libthread_xu \
+	libutil \
+	libpthread
+SUBDIR=	${SUBDIR_ORDERED} \
+	csu \
+	i18n_module \
+	libalias \
+	libarchive \
+	libatm \
+	libbluetooth \
+	libbz2 \
+	libc \
+	libc_rtld \
+	libcalendar \
+	libcam \
+	libcompat \
+	libdevattr \
+	libdevinfo \
+	libdevstat \
+	libedit \
+	libevtr \
+	libexpat \
+	libfetch \
+	libfsid \
+	libftpio \
+	libipsec \
+	libipx \
+	libkcore \
+	libkiconv \
+	libkinfo \
+	libkvm \
+	libldns \
+	libm \
+	libmagic \
+	${_libmilter} \
+	libncp \
+	libnetgraph \
+	libopie \
+	libpam \
+	libpcap \
+	libposix1e \
+	libprop \
+	librpcsvc \
+	librt \
+	libsctp \
+	libsdp \
+	${_libsm} \
+	libsmb \
+	${_libsmdb} \
+	${_libsmutil} \
+	libstand \
+	libtelnet \
+	libusbhid \
+	libvgl \
+	libwrap \
+	libxpg4 \
+	liby \
+	libypclnt \
+	libz \
+	pam_module
 
 .if exists(${.CURDIR}/compat/${MACHINE_ARCH}/Makefile)
 SUBDIR+= compat/${MACHINE_ARCH}
@@ -49,8 +103,4 @@ _libsmdb=	libsmdb
 _libsmutil=	libsmutil
 .endif
 
-_libncp=	libncp
-_libsmb=	libsmb
-_libvgl=	libvgl
-
 .include <bsd.subdir.mk>
-- 
2.41.0