summaryrefslogtreecommitdiffstats
path: root/lib/Makefile
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2010-05-18 00:46:15 +0000
committermm <mm@FreeBSD.org>2010-05-18 00:46:15 +0000
commitaeccfd7aa1f603dae9baccbaf18fe0dbcb27ac5e (patch)
tree937856ccab882471311248d454af55d2b6bc8c73 /lib/Makefile
parent0f237b313b4087d357b07293f594cfa72e567d3c (diff)
downloadFreeBSD-src-aeccfd7aa1f603dae9baccbaf18fe0dbcb27ac5e.zip
FreeBSD-src-aeccfd7aa1f603dae9baccbaf18fe0dbcb27ac5e.tar.gz
MFC r204738, r205113 (imp):
MFC r204738: Remove stale references to libkrb5. Rejigger the SUBDIR setting a smidge: we now set all the libraries that depend on something else, and then SUBDIR+= the rest. MFC r205113: Make this conform to the other top-level Makefile subdir listings with one file per line. Approved by: delphij (mentor)
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile93
1 files changed, 78 insertions, 15 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 00b1c60..694b606 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,8 +9,8 @@
# csu must be built before all shared libaries for ELF.
# libc must be built before all other shared libraries.
# libbsm must be built before ibauditd.
-# libcom_err must be built before libkrb5 and libpam.
-# libcrypt must be built before libkrb5 and libpam.
+# libcom_err must be built before libpam.
+# libcrypt must be built before libpam.
# libkvm must be built before libdevstat.
# msun must be built before libg++ and libstdc++.
# libmd must be built before libatm, libopie, libradius, and libtacplus.
@@ -26,21 +26,84 @@
# libgssapi must be built before librpcsec_gss
#
# Otherwise, the SUBDIR list should be in alphabetical order.
-
-SUBDIR= ${_csu} libc libbsm libauditd libcom_err libcrypt libelf libkvm msun \
+#
+# Except it appears bind needs to be compiled last
+
+SUBDIR_ORDERED= ${_csu} \
+ libc \
+ libbsm \
+ libauditd \
+ libcom_err \
+ libcrypt \
+ libelf \
+ libkvm \
+ msun \
libmd \
- ncurses ${_libnetgraph} libradius librpcsvc libsbuf \
- libtacplus libutil ${_libypclnt} libalias libarchive ${_libatm} \
- libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \
- libcalendar libcam libcompat libdevinfo libdevstat libdisk \
- libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \
- ${_libgssapi} ${_librpcsec_gss} libipsec \
- ${_libipx} libjail libkiconv libmagic libmemstat ${_libmilter} \
- ${_libmp} ${_libncp} ${_libngatm} libopie libpam libpcap \
- ${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
+ ncurses \
+ ${_libnetgraph} \
+ libradius \
+ librpcsvc \
+ libsbuf \
+ libtacplus \
+ libutil \
+ ${_libypclnt}
+
+SUBDIR= ${SUBDIR_ORDERED} \
+ libalias \
+ libarchive \
+ ${_libatm} \
+ libbegemot \
+ ${_libbluetooth} \
+ ${_libbsnmp} \
+ libbz2 \
+ libcalendar \
+ libcam \
+ libcompat \
+ libdevinfo \
+ libdevstat \
+ libdisk \
+ libdwarf \
+ libedit \
+ libexpat \
+ libfetch \
+ libftpio \
+ libgeom \
+ ${_libgpib} \
+ ${_libgssapi} \
+ ${_librpcsec_gss} \
+ libipsec \
+ ${_libipx} \
+ libjail \
+ libkiconv \
+ libmagic \
+ libmemstat \
+ ${_libmilter} \
+ ${_libmp} \
+ ${_libncp} \
+ ${_libngatm} \
+ libopie \
+ libpam \
+ libpcap \
+ ${_libpmc} \
+ libproc \
+ librt \
+ ${_libsdp} \
+ ${_libsm} \
+ ${_libsmb} \
${_libsmdb} \
- ${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \
- libugidfw ${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \
+ ${_libsmutil} \
+ libstand \
+ ${_libtelnet} \
+ ${_libthr} \
+ libthread_db \
+ libufs \
+ libugidfw \
+ ${_libusbhid} \
+ ${_libusb} \
+ ${_libvgl} \
+ libwrap \
+ liby \
+ libz \
${_bind}
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
OpenPOWER on IntegriCloud