diff options
Diffstat (limited to 'usr/src/lib/Makefile')
| -rw-r--r-- | usr/src/lib/Makefile | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 6d8588d839..35c5c53004 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -22,7 +22,7 @@ # Copyright 2011 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012 by Delphix. All rights reserved. -# Copyright (c) 2012, Joyent, Inc. All rights reserved. +# Copyright 2015, Joyent, Inc. # Copyright (c) 2013 Gary Mills # Copyright 2014 Garrett D'Amore <garrett@damore.org> @@ -68,6 +68,7 @@ SUBDIRS += \ libcommputil \ libresolv \ libresolv2 .WAIT \ + libresolv2_joy .WAIT \ libw .WAIT \ libintl .WAIT \ ../cmd/sgs/librtld_db \ @@ -80,6 +81,8 @@ SUBDIRS += \ librt \ libadm \ libctf \ + libbrand .WAIT \ + libzonecfg .WAIT \ libdtrace \ libdtrace_jni \ libcurses \ @@ -134,6 +137,7 @@ SUBDIRS += \ libpp \ libproc \ libproject \ + librename \ libsendfile \ nametoaddr \ ncad_addr \ @@ -158,8 +162,11 @@ SUBDIRS += \ libpcidb \ libm1 \ libm \ - libmvec - + libmvec \ + libvnd \ + libidspace \ + varpd \ + libbunyan SUBDIRS += \ passwdutil \ @@ -182,7 +189,6 @@ SUBDIRS += \ libxnet \ libipsecutil \ nsswitch \ - print \ libuutil \ libscf \ libinetsvc \ @@ -201,10 +207,10 @@ SUBDIRS += \ libwrap \ libxcurses \ libxcurses2 \ - libbrand .WAIT \ - libzonecfg \ + libzdoor \ libzoneinfo \ libzonestat \ + libsmartsshd \ libtsnet \ libtsol \ gss_mechs/mech_spnego \ @@ -219,7 +225,6 @@ SUBDIRS += \ raidcfg_plugins \ cfgadm_plugins \ libmail \ - lvm \ libsmedia \ libipp \ libdiskmgt \ @@ -236,10 +241,7 @@ SUBDIRS += \ libzfs_core \ libzfs \ libbe \ - pylibbe \ libzfs_jni \ - pyzfs \ - pysolaris \ libmapid \ brand \ policykit \ @@ -298,9 +300,6 @@ fm: \ # NOWAIT_SUBDIRS= $(SUBDIRS:.WAIT=) -DCSUBDIRS = \ - lvm - MSGSUBDIRS= \ abi \ auditd_plugins \ @@ -355,12 +354,11 @@ MSGSUBDIRS= \ libwanbootutil \ libzfs \ libzonecfg \ - lvm \ + libzdoor \ + libsmartsshd \ madv \ mpss \ pam_modules \ - pyzfs \ - pysolaris \ rpcsec_gss \ libreparse MSGSUBDIRS += \ @@ -377,6 +375,7 @@ HDRSUBDIRS= \ libast \ libbrand \ libbsm \ + libbunyan \ libc \ libcmd \ libcmdutils \ @@ -406,6 +405,7 @@ HDRSUBDIRS= \ libfru \ libfstyp \ libgen \ + libidspace \ libipadm \ libipd \ libipsecutil \ @@ -437,6 +437,7 @@ HDRSUBDIRS= \ libraidcfg \ librcm \ librdc \ + librename \ libscf \ libsip \ libsmbios \ @@ -468,6 +469,7 @@ HDRSUBDIRS= \ libumem \ libunistat \ libuutil \ + libvnd \ libwanboot \ libwanbootutil \ libwrap \ @@ -479,7 +481,6 @@ HDRSUBDIRS= \ libzonestat \ hal \ policykit \ - lvm \ pkcs11 \ passwdutil \ ../cmd/sendmail/libmilter \ @@ -563,7 +564,7 @@ gss_mechs/mech_krb5: libgss libnsl libsocket libresolv pkcs11 libadt_jni: libbsm libast: libsocket libm libadutils: libldap5 libresolv libsocket libnsl -nsswitch: libadutils libidmap +nsswitch: libadutils libidmap libresolv2_joy libbe: libzfs libbsm: libtsol libcmd: libsum libast libsocket libnsl @@ -574,7 +575,7 @@ libdevinfo: libnvpair libsec libdhcpagent: libsocket libdhcputil libuuid libdlpi libcontract libdhcputil: libnsl libgen libinetutil libdlpi libdladm: libdevinfo libinetutil libsocket libscf librcm libnvpair \ - libexacct libnsl libkstat libcurses + libexacct libnsl libkstat libcurses varpd libdll: libast libdlpi: libinetutil libdladm libds: libsysevent @@ -618,6 +619,8 @@ libpool: libnvpair libexacct libpp: libast libzonecfg: libc libsocket libnsl libuuid libnvpair libsysevent libsec \ libbrand libpool libscf +libzdoor: libc libzonecfg libcontract +libsmartsshd: libc libcontract libproc: ../cmd/sgs/librtld_db ../cmd/sgs/libelf libctf libsaveargs libproject: libpool libproc libsecdb libtermcap: libcurses @@ -633,8 +636,6 @@ librestart: libuutil libscf libsaveargs: libdisasm ../cmd/sgs/libdl: ../cmd/sgs/libconv ../cmd/sgs/libelf: ../cmd/sgs/libconv -pkcs11: libcryptoutil -print: libldap5 udapl/udapl_tavor: udapl/libdat libzfs: libdevid libgen libnvpair libuutil \ libadm libavl libefi libidmap libmd libzfs_core libm @@ -659,9 +660,6 @@ sun_fc: libdevinfo libsysevent libnvpair libsun_ima: libdevinfo libsysevent libnsl sun_sas: libdevinfo libsysevent libnvpair libkstat libdevid libgrubmgmt: libdevinfo libzfs libfstyp -pylibbe: libbe libzfs -pyzfs: libnvpair libzfs -pysolaris: libsec libidmap libreparse: libnvpair libhotplug: libnvpair cfgadm_plugins: libhotplug @@ -671,9 +669,13 @@ libprtdiag: libm libsqlite: libm libstmf: libm libvscan: libm +libidspace: libumem +libbunyan: libnvpair $(INTEL_BUILD)libdiskmgt:libfdisk +varpd: libavl libidspace libumem libnsl libnvpair libmd5 librename \ + libbunyan libcmdutils # # The reason this rule checks for the existence of the |