partially convert lib/Makefile to SUBDIR.${MK_FOO} style
Cases other than MK_* (e.g. ${MACHINE_CPUARCH} == "i386") have been left as is. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D8246
This commit is contained in:
parent
16bacb8a2d
commit
cd060b8d7a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=307243
192
lib/Makefile
192
lib/Makefile
@ -28,106 +28,69 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
|
|||||||
libarchive \
|
libarchive \
|
||||||
libauditd \
|
libauditd \
|
||||||
libbegemot \
|
libbegemot \
|
||||||
${_libblacklist} \
|
|
||||||
libblocksruntime \
|
libblocksruntime \
|
||||||
${_libbluetooth} \
|
|
||||||
${_libbsnmp} \
|
|
||||||
libbsdstat \
|
libbsdstat \
|
||||||
libbsm \
|
libbsm \
|
||||||
libbz2 \
|
libbz2 \
|
||||||
libcalendar \
|
libcalendar \
|
||||||
libcam \
|
libcam \
|
||||||
libcapsicum \
|
libcapsicum \
|
||||||
${_libcasper} \
|
|
||||||
${_libcom_err} \
|
|
||||||
libcompat \
|
libcompat \
|
||||||
libcrypt \
|
libcrypt \
|
||||||
libdevctl \
|
libdevctl \
|
||||||
${_libdevdctl} \
|
|
||||||
libdevinfo \
|
libdevinfo \
|
||||||
libdevstat \
|
libdevstat \
|
||||||
libdwarf \
|
libdwarf \
|
||||||
libedit \
|
libedit \
|
||||||
${_libefivar} \
|
|
||||||
${_libelftc} \
|
|
||||||
libevent \
|
libevent \
|
||||||
libexecinfo \
|
libexecinfo \
|
||||||
libexpat \
|
libexpat \
|
||||||
libfetch \
|
libfetch \
|
||||||
libfigpar \
|
libfigpar \
|
||||||
libgeom \
|
libgeom \
|
||||||
${_libgpio} \
|
|
||||||
${_libgssapi} \
|
|
||||||
${_librpcsec_gss} \
|
|
||||||
${_libiconv_modules} \
|
|
||||||
libifconfig \
|
libifconfig \
|
||||||
libipsec \
|
libipsec \
|
||||||
libjail \
|
libjail \
|
||||||
libkiconv \
|
libkiconv \
|
||||||
libkvm \
|
libkvm \
|
||||||
${_libldns} \
|
|
||||||
liblzma \
|
liblzma \
|
||||||
${_libmagic} \
|
|
||||||
libmemstat \
|
libmemstat \
|
||||||
libmd \
|
libmd \
|
||||||
${_libmilter} \
|
|
||||||
${_libmp} \
|
|
||||||
libmt \
|
libmt \
|
||||||
${_libnandfs} \
|
|
||||||
lib80211 \
|
lib80211 \
|
||||||
libnetbsd \
|
libnetbsd \
|
||||||
${_libnetgraph} \
|
|
||||||
${_libngatm} \
|
|
||||||
libnv \
|
libnv \
|
||||||
libopenbsd \
|
libopenbsd \
|
||||||
libopie \
|
libopie \
|
||||||
libpam \
|
libpam \
|
||||||
libpcap \
|
libpcap \
|
||||||
${_libpe} \
|
|
||||||
libpjdlog \
|
libpjdlog \
|
||||||
${_libpmc} \
|
|
||||||
${_libproc} \
|
${_libproc} \
|
||||||
libprocstat \
|
libprocstat \
|
||||||
${_libradius} \
|
|
||||||
librpcsvc \
|
librpcsvc \
|
||||||
librss \
|
librss \
|
||||||
librt \
|
librt \
|
||||||
${_librtld_db} \
|
${_librtld_db} \
|
||||||
libsbuf \
|
libsbuf \
|
||||||
${_libsdp} \
|
|
||||||
${_libsm} \
|
|
||||||
libsmb \
|
libsmb \
|
||||||
${_libsmdb} \
|
|
||||||
${_libsmutil} \
|
|
||||||
libsqlite3 \
|
libsqlite3 \
|
||||||
libstand \
|
libstand \
|
||||||
libstdbuf \
|
libstdbuf \
|
||||||
libstdthreads \
|
libstdthreads \
|
||||||
libsysdecode \
|
libsysdecode \
|
||||||
libtacplus \
|
libtacplus \
|
||||||
${_libtelnet} \
|
|
||||||
${_libthr} \
|
|
||||||
libthread_db \
|
libthread_db \
|
||||||
libucl \
|
libucl \
|
||||||
libufs \
|
libufs \
|
||||||
libugidfw \
|
libugidfw \
|
||||||
libulog \
|
libulog \
|
||||||
${_libunbound} \
|
|
||||||
${_libusbhid} \
|
|
||||||
${_libusb} \
|
|
||||||
libutil \
|
libutil \
|
||||||
${_libvgl} \
|
${_libvgl} \
|
||||||
${_libvmmapi} \
|
|
||||||
libwrap \
|
libwrap \
|
||||||
libxo \
|
libxo \
|
||||||
liby \
|
liby \
|
||||||
${_libypclnt} \
|
|
||||||
libz \
|
libz \
|
||||||
ncurses \
|
ncurses
|
||||||
${_atf} \
|
|
||||||
${_clang} \
|
|
||||||
${_cuse} \
|
|
||||||
${_tests}
|
|
||||||
|
|
||||||
# Inter-library dependencies. When the makefile for a library contains LDADD
|
# Inter-library dependencies. When the makefile for a library contains LDADD
|
||||||
# libraries, those libraries should be listed as build order dependencies here.
|
# libraries, those libraries should be listed as build order dependencies here.
|
||||||
@ -159,70 +122,26 @@ SUBDIR_DEPEND_liblzma= ${_libthr}
|
|||||||
|
|
||||||
# NB: keep these sorted by MK_* knobs
|
# NB: keep these sorted by MK_* knobs
|
||||||
|
|
||||||
.if ${MK_ATM} != "no"
|
SUBDIR.${MK_ATM}+= libngatm
|
||||||
_libngatm= libngatm
|
SUBDIR.${MK_BLACKLIST}+=libblacklist
|
||||||
.endif
|
SUBDIR.${MK_BLUETOOTH}+=libbluetooth libsdp
|
||||||
|
SUBDIR.${MK_BSNMP}+= libbsnmp
|
||||||
.if ${MK_BLACKLIST} != "no"
|
SUBDIR.${MK_CASPER}+= libcasper
|
||||||
_libblacklist= libblacklist
|
|
||||||
.endif
|
.if !defined(COMPAT_32BIT) && !defined(COMPAT_SOFTFP)
|
||||||
|
SUBDIR.${MK_CLANG}+= clang
|
||||||
.if ${MK_BLUETOOTH} != "no"
|
|
||||||
_libbluetooth= libbluetooth
|
|
||||||
_libsdp= libsdp
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_BSNMP} != "no"
|
|
||||||
_libbsnmp= libbsnmp
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_CASPER} != "no"
|
|
||||||
_libcasper= libcasper
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT) && !defined(COMPAT_SOFTFP)
|
|
||||||
_clang= clang
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_CUSE} != "no"
|
|
||||||
_cuse= libcuse
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_CXX} != "no"
|
|
||||||
_libdevdctl= libdevdctl
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_TOOLCHAIN} != "no"
|
|
||||||
_libelftc= libelftc
|
|
||||||
_libpe= libpe
|
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
SUBDIR.${MK_CUSE}+= libcuse
|
||||||
|
SUBDIR.${MK_CXX}+= libdevdctl
|
||||||
|
SUBDIR.${MK_TOOLCHAIN}+=libelftc libpe
|
||||||
SUBDIR.${MK_DIALOG}+= libdpv
|
SUBDIR.${MK_DIALOG}+= libdpv
|
||||||
|
SUBDIR.${MK_FILE}+= libmagic
|
||||||
.if ${MK_FILE} != "no"
|
SUBDIR.${MK_GPIO}+= libgpio
|
||||||
_libmagic= libmagic
|
SUBDIR.${MK_GSSAPI}+= libgssapi librpcsec_gss
|
||||||
.endif
|
SUBDIR.${MK_ICONV}+= libiconv_modules
|
||||||
|
SUBDIR.${MK_KERBEROS_SUPPORT}+= libcom_err
|
||||||
.if ${MK_GPIO} != "no"
|
SUBDIR.${MK_LDNS}+= libldns
|
||||||
_libgpio= libgpio
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_GSSAPI} != "no"
|
|
||||||
_libgssapi= libgssapi
|
|
||||||
_librpcsec_gss= librpcsec_gss
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_ICONV} != "no"
|
|
||||||
_libiconv_modules= libiconv_modules
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_KERBEROS_SUPPORT} != "no"
|
|
||||||
_libcom_err= libcom_err
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_LDNS} != "no"
|
|
||||||
_libldns= libldns
|
|
||||||
.endif
|
|
||||||
|
|
||||||
# The libraries under libclang_rt can only be built by clang, and only make
|
# The libraries under libclang_rt can only be built by clang, and only make
|
||||||
# sense to build when clang is enabled at all. Furthermore, they can only be
|
# sense to build when clang is enabled at all. Furthermore, they can only be
|
||||||
@ -239,25 +158,11 @@ _libcxxrt= libcxxrt
|
|||||||
_libcplusplus= libc++
|
_libcplusplus= libc++
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_EFI} != "no"
|
SUBDIR.${MK_EFI}+= libefivar
|
||||||
_libefivar= libefivar
|
SUBDIR.${MK_LIBTHR}+= libthr
|
||||||
.endif
|
SUBDIR.${MK_NAND}+= libnandfs
|
||||||
|
SUBDIR.${MK_NETGRAPH}+= libnetgraph
|
||||||
.if ${MK_LIBTHR} != "no"
|
SUBDIR.${MK_NIS}+= libypclnt
|
||||||
_libthr= libthr
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_NAND} != "no"
|
|
||||||
_libnandfs= libnandfs
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_NETGRAPH} != "no"
|
|
||||||
_libnetgraph= libnetgraph
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_NIS} != "no"
|
|
||||||
_libypclnt= libypclnt
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
|
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
|
||||||
_libvgl= libvgl
|
_libvgl= libvgl
|
||||||
@ -266,9 +171,7 @@ _librtld_db= librtld_db
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MACHINE_CPUARCH} == "amd64"
|
.if ${MACHINE_CPUARCH} == "amd64"
|
||||||
.if ${MK_BHYVE} != "no"
|
SUBDIR.${MK_BHYVE}+= libvmmapi
|
||||||
_libvmmapi= libvmmapi
|
|
||||||
.endif
|
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MACHINE_CPUARCH} == "mips"
|
.if ${MACHINE_CPUARCH} == "mips"
|
||||||
@ -287,44 +190,15 @@ _libproc= libproc
|
|||||||
_librtld_db= librtld_db
|
_librtld_db= librtld_db
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_OPENSSL} != "no"
|
SUBDIR.${MK_OPENSSL}+= libmp
|
||||||
_libmp= libmp
|
SUBDIR.${MK_PMC}+= libpmc
|
||||||
.endif
|
SUBDIR.${MK_RADIUS_SUPPORT}+= libradius
|
||||||
|
SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil
|
||||||
.if ${MK_PMC} != "no"
|
SUBDIR.${MK_TELNET}+= libtelnet
|
||||||
_libpmc= libpmc
|
SUBDIR.${MK_TESTS_SUPPORT}+= atf
|
||||||
.endif
|
SUBDIR.${MK_TESTS}+= tests
|
||||||
|
SUBDIR.${MK_UNBOUND}+= libunbound
|
||||||
.if ${MK_RADIUS_SUPPORT} != "no"
|
SUBDIR.${MK_USB}+= libusbhid libusb
|
||||||
_libradius= libradius
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_SENDMAIL} != "no"
|
|
||||||
_libmilter= libmilter
|
|
||||||
_libsm= libsm
|
|
||||||
_libsmdb= libsmdb
|
|
||||||
_libsmutil= libsmutil
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_TELNET} != "no"
|
|
||||||
_libtelnet= libtelnet
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_TESTS_SUPPORT} != "no"
|
|
||||||
_atf= atf
|
|
||||||
.endif
|
|
||||||
.if ${MK_TESTS} != "no"
|
|
||||||
_tests= tests
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_UNBOUND} != "no"
|
|
||||||
_libunbound= libunbound
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_USB} != "no"
|
|
||||||
_libusbhid= libusbhid
|
|
||||||
_libusb= libusb
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if !make(install)
|
.if !make(install)
|
||||||
SUBDIR_PARALLEL=
|
SUBDIR_PARALLEL=
|
||||||
|
Loading…
Reference in New Issue
Block a user