[Midnightbsd-cvs] src [10411] trunk/lib/Makefile: update lib makefile

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Jun 4 18:56:12 EDT 2018


Revision: 10411
          http://svnweb.midnightbsd.org/src/?rev=10411
Author:   laffer1
Date:     2018-06-04 18:56:11 -0400 (Mon, 04 Jun 2018)
Log Message:
-----------
update lib makefile

Modified Paths:
--------------
    trunk/lib/Makefile

Modified: trunk/lib/Makefile
===================================================================
--- trunk/lib/Makefile	2018-06-04 19:51:38 UTC (rev 10410)
+++ trunk/lib/Makefile	2018-06-04 22:56:11 UTC (rev 10411)
@@ -1,74 +1,49 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.205.2.1 2005/07/28 13:47:18 rwatson Exp $
+# $FreeBSD: stable/10/lib/Makefile 322094 2017-08-05 12:33:00Z marius $
 # $MidnightBSD$
 
 .include <bsd.own.mk>
 
-# To satisfy shared library or ELF linkage when only the libraries being
-# built are visible:
-#
-# 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 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.
-# ncurses must be built before libdialog, libedit and libreadline.
-# libnetgraph must be built before libbsnmp/modules/snmp_netgraph.
-# libopie must be built before libpam.
-# libradius must be built before libpam.
-# librpcsvc must be built before libpam.
-# libsbuf must be built before libcam.
-# libtacplus must be built before libpam.
-# libutil must be built before libpam.
-# libypclnt must be built before libpam.
-# libgssapi must be built before librpcsec_gss
-#
-# Otherwise, the SUBDIR list should be in alphabetical order.
-#
-# Except it appears bind needs to be compiled last
+# The SUBDIR_ORDERED list is a small set of libraries which are used by many
+# of the other libraries.  These are built first with a .WAIT between them
+# and the main list to avoid needing a SUBDIR_DEPEND line on every library
+# naming just these few items.
 
-SUBDIR_ORDERED=	${_csu} \
+SUBDIR_ORDERED=	csu \
+	.WAIT \
 	libc \
 	libc_nonshared \
-	libbsm \
-	libauditd \
-	libcom_err \
 	libcompiler_rt \
-	libcrypt \
+	${_libcplusplus} \
+	${_libcxxrt} \
 	libelf \
-	${_libiconv_modules} \
-	libkvm \
-	msun \
-	libmd \
-	ncurses \
-	${_libnetgraph} \
-	libradius \
-	librpcsvc \
-	libsbuf \
-	libtacplus \
-	libutil \
-	${_libypclnt} \
-	${_libcxxrt} \
-	${_libcplusplus}
+	msun
 
+# The main list; please keep these sorted alphabetically.
+
 SUBDIR=	${SUBDIR_ORDERED} \
+	.WAIT \
 	libalias \
 	libarchive \
 	${_libatm} \
+	libauditd \
 	libbegemot \
 	libblocksruntime \
 	${_libbluetooth} \
 	${_libbsnmp} \
+	libbsm \
 	libbz2 \
 	libcalendar \
 	libcam \
+	${_libcom_err} \
 	libcompat \
+	libcrypt \
+	libdevctl \
 	libdevinfo \
 	libdevstat \
-	libdisk \
+	libdispatch \
+	libdns_sd \
+	${_libdpv} \
 	libdwarf \
 	libedit \
 	${_libefi} \
@@ -75,24 +50,34 @@
 	libexecinfo \
 	libexpat \
 	libfetch \
-	libftpio \
+	libfigpar \
 	libgeom \
 	${_libgpib} \
 	${_libgssapi} \
 	${_librpcsec_gss} \
+	${_libiconv_modules} \
 	libipsec \
 	${_libipx} \
 	libjail \
-	libjansson \
 	libkiconv \
+	libkvm \
+	${_libldns} \
 	liblzma \
-	libmagic \
+	${_libmagic} \
+	libmandoc \
 	libmemstat \
+	libmd \
 	${_libmilter} \
 	${_libmp} \
-	${_libncp} \
+	libmport \
+	libmsearch \
+	libmt \
+	${_libnandfs} \
 	libnetbsd \
+	${_libnetgraph} \
 	${_libngatm} \
+	libnss_mdns \
+	libnv \
 	libopie \
 	libpam \
 	libpcap \
@@ -99,43 +84,77 @@
 	${_libpmc} \
 	${_libproc} \
 	libprocstat \
+	${_libradius} \
+	librpcsvc \
 	librt \
 	${_librtld_db} \
+	libsbuf \
 	${_libsdp} \
 	${_libsm} \
-	${_libsmb} \
+	libsmb \
 	${_libsmdb} \
 	${_libsmutil} \
 	libstand \
 	libstdbuf \
+	libstdthreads \
+	libsqlite3 \
+	libtacplus \
 	${_libtelnet} \
 	${_libthr} \
 	libthread_db \
+	libucl \
 	libufs \
 	libugidfw \
 	libulog \
+	${_libunbound} \
 	${_libusbhid} \
 	${_libusb} \
+	libutil \
 	${_libvgl} \
+	${_libvmmapi} \
 	libwrap \
 	liby \
+	${_libypclnt} \
+	libyaml \
 	libz \
-	libsqlite3 \
-	libmport \
-	libmsearch \
-	${_bind} \
-	${_clang}
+	ncurses \
+	${_atf} \
+	${_clang} \
+	${_tests}
 
-.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
-_csu=csu/${MACHINE_ARCH}-elf
-.elif exists(${.CURDIR}/csu/${MACHINE_ARCH})
-_csu=csu/${MACHINE_ARCH}
-.elif exists(${.CURDIR}/csu/${MACHINE_CPUARCH}/Makefile)
-_csu=csu/${MACHINE_CPUARCH}
-.else
-_csu=csu
-.endif
+# Inter-library dependencies.  When the makefile for a library contains LDADD
+# libraries, those libraries should be listed as build order dependencies here.
 
+SUBDIR_DEPEND_libarchive= libz libbz2 libexpat liblzma libmd
+SUBDIR_DEPEND_libatm= libmd
+SUBDIR_DEPEND_libauditdm= libbsm
+SUBDIR_DEPEND_libbsnmp= ${_libnetgraph}
+SUBDIR_DEPEND_libc++= libcxxrt
+SUBDIR_DEPEND_libc= libcompiler_rt
+SUBDIR_DEPEND_libcam= libsbuf
+SUBDIR_DEPEND_libdevstat= libkvm
+SUBDIR_DEPEND_libdispatch= libblocksruntime
+SUBDIR_DEPEND_libdpv= libfigpar ncurses libutil
+SUBDIR_DEPEND_libedit= ncurses
+SUBDIR_DEPEND_libg++= msun
+SUBDIR_DEPEND_libgeom= libexpat libsbuf
+SUBDIR_DEPEND_librpcsec_gss= libgssapi
+SUBDIR_DEPEND_libmagic= libz
+SUBDIR_DEPEND_libmemstat= libkvm
+SUBDIR_DEPEND_libmport= libarchive libblocksruntime libdispatch libbz2 liblzma libfetch libsqlite3
+SUBDIR_DEPEND_libmsearch= libsqlite3 libmagic libz
+SUBDIR_DEPEND_libopie= libmd
+SUBDIR_DEPEND_libpam= libcrypt libopie ${_libradius} librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} 
+SUBDIR_DEPEND_libpjdlog= libutil
+SUBDIR_DEPEND_libprocstat= libkvm libutil
+SUBDIR_DEPEND_libradius= libmd
+SUBDIR_DEPEND_libsmb= libkiconv
+SUBDIR_DEPEND_libstdc++= msun
+SUBDIR_DEPEND_libtacplus= libmd
+SUBDIR_DEPEND_libulog= libmd
+SUBDIR_DEPEND_libunbound= ${_libldns}
+SUBDIR_DEPEND_liblzma= ${_libthr}
+
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_ATM} != "no"
@@ -142,10 +161,6 @@
 _libngatm=	libngatm
 .endif
 
-.if ${MK_BIND} != "no"
-_bind=		bind
-.endif
-
 .if ${MK_BLUETOOTH} != "no"
 _libbluetooth=	libbluetooth
 _libsdp=	libsdp
@@ -159,6 +174,14 @@
 _clang=		clang
 .endif
 
+.if ${MK_DIALOG} != "no"
+_libdpv=	libdpv
+.endif
+
+.if ${MK_FILE} != "no"
+_libmagic=	libmagic
+.endif
+
 .if ${MK_GPIB} != "no"
 _libgpib=	libgpib
 .endif
@@ -172,10 +195,18 @@
 _libiconv_modules=	libiconv_modules
 .endif
 
+.if ${MK_KERBEROS_SUPPORT} != "no"
+_libcom_err= libcom_err
+.endif
+
 .if ${MK_IPX} != "no"
 _libipx=	libipx
 .endif
 
+.if ${MK_LDNS} != "no"
+_libldns=	libldns
+.endif
+
 .if ${MK_LIBCPLUSPLUS} != "no"
 _libcxxrt=	libcxxrt
 _libcplusplus=	libc++
@@ -185,6 +216,10 @@
 _libthr=	libthr
 .endif
 
+.if ${MK_NAND} != "no"
+_libnandfs=	libnandfs
+.endif
+
 .if ${MK_NETGRAPH} != "no"
 _libnetgraph=	libnetgraph
 .endif
@@ -194,15 +229,31 @@
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-.if ${MK_NCP} != "no"
-_libncp=	libncp
-.endif
-_libsmb=	libsmb
 _libvgl=	libvgl
 _libproc=	libproc
 _librtld_db=	librtld_db
 .endif
 
+.if ${MACHINE_CPUARCH} == "amd64"
+.if ${MK_BHYVE} != "no"
+_libvmmapi=	libvmmapi
+.endif
+.endif
+
+.if ${MACHINE_CPUARCH} == "ia64"
+_libefi=	libefi
+.endif
+
+.if ${MACHINE_CPUARCH} == "mips"
+_libproc=	libproc
+_librtld_db=	librtld_db
+.endif
+
+.if ${MACHINE_CPUARCH} == "powerpc"
+_libproc=	libproc
+_librtld_db=	librtld_db
+.endif
+
 .if ${MK_OPENSSL} != "no"
 _libmp=		libmp
 .endif
@@ -211,6 +262,10 @@
 _libpmc=	libpmc
 .endif
 
+.if ${MK_RADIUS_SUPPORT} != "no"
+_libradius=	libradius
+.endif
+
 .if ${MK_SENDMAIL} != "no"
 _libmilter=	libmilter
 _libsm=		libsm
@@ -222,9 +277,27 @@
 _libtelnet=	libtelnet
 .endif
 
+.if ${MK_TESTS} != "no"
+_atf=		atf
+_tests=		tests
+.endif
+
+.if ${MK_UNBOUND} != "no"
+_libunbound=	libunbound
+.endif
+
 .if ${MK_USB} != "no"
 _libusbhid=	libusbhid
 _libusb=	libusb
 .endif
 
+.if !defined(LIBRARIES_ONLY)
+afterinstall:
+	${INSTALL_SYMLINK} ../include ${DESTDIR}/usr/lib/include
+.endif
+
+.if !make(install)
+SUBDIR_PARALLEL=
+.endif
+
 .include <bsd.subdir.mk>



More information about the Midnightbsd-cvs mailing list