summaryrefslogtreecommitdiff
path: root/usr/src/lib/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/Makefile')
-rw-r--r--usr/src/lib/Makefile43
1 files changed, 29 insertions, 14 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile
index 7c6c561ea2..9c2ae475c9 100644
--- a/usr/src/lib/Makefile
+++ b/usr/src/lib/Makefile
@@ -22,7 +22,7 @@
#
# 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>
# Copyright (c) 2015 Gary Mills
@@ -91,6 +91,7 @@ SUBDIRS += \
libbrand \
libbsdmalloc \
libbsm \
+ libbunyan \
libc_db \
libcfgadm \
libcmd \
@@ -117,6 +118,7 @@ SUBDIRS += \
libdscfg \
libdtrace \
libdtrace_jni \
+ libdwarf \
libefi \
libelfsign \
libeti \
@@ -133,6 +135,7 @@ SUBDIRS += \
libgss \
libhotplug \
libidmap \
+ libidspace \
libilb \
libima \
libinetsvc \
@@ -180,9 +183,11 @@ SUBDIRS += \
libraidcfg \
librcm \
librdc \
+ librename \
libreparse \
libresolv \
libresolv2 \
+ libresolv2_joy \
librestart \
librpcsvc \
librsm \
@@ -200,6 +205,7 @@ SUBDIRS += \
libsip \
libsldap \
libslp \
+ libsmartsshd \
libsmbfs \
libsmbios \
libsmedia \
@@ -223,6 +229,7 @@ SUBDIRS += \
libunistat \
libuuid \
libuutil \
+ libvnd \
libvolmgt \
libvrrpadm \
libvscan \
@@ -233,6 +240,7 @@ SUBDIRS += \
libxcurses \
libxcurses2 \
libxnet \
+ libzdoor \
libzfs \
libzfs_core \
libzfs_jni \
@@ -240,7 +248,6 @@ SUBDIRS += \
libzoneinfo \
libzonestat \
libzpool \
- lvm \
madv \
mpapi \
mpss \
@@ -252,9 +259,6 @@ SUBDIRS += \
pkcs11 \
policykit \
print \
- pylibbe \
- pysolaris \
- pyzfs \
raidcfg_plugins \
rpcsec_gss \
sasl_plugins \
@@ -264,6 +268,7 @@ SUBDIRS += \
sun_fc \
sun_sas \
udapl \
+ varpd \
watchmalloc \
$($(MACH)_SUBDIRS)
@@ -290,8 +295,7 @@ sparc_SUBDIRS= \
#
NOWAIT_SUBDIRS= $(SUBDIRS:.WAIT=)
-DCSUBDIRS = \
- lvm
+DCSUBDIRS =
MSGSUBDIRS= \
abi \
@@ -337,6 +341,7 @@ MSGSUBDIRS= \
libshell \
libsldap \
libslp \
+ libsmartsshd \
libsmbfs \
libsmedia \
libsum \
@@ -348,12 +353,10 @@ MSGSUBDIRS= \
libwanbootutil \
libzfs \
libzonecfg \
- lvm \
+ libzdoor \
madv \
mpss \
pam_modules \
- pysolaris \
- pyzfs \
rpcsec_gss \
$($(MACH)_MSGSUBDIRS)
@@ -373,6 +376,7 @@ HDRSUBDIRS= \
libast \
libbrand \
libbsm \
+ libbunyan \
libc \
libcmd \
libcmdutils \
@@ -389,6 +393,7 @@ HDRSUBDIRS= \
libdhcputil \
libdisasm \
libdiskmgt \
+ libdwarf \
libdladm \
libdll \
libdlpi \
@@ -405,6 +410,7 @@ HDRSUBDIRS= \
libgen \
libgrubmgmt \
libidmap \
+ libidspace \
libilb \
libima \
libinetsvc \
@@ -440,6 +446,7 @@ HDRSUBDIRS= \
libraidcfg \
librcm \
librdc \
+ librename \
libreparse \
librestart \
librpcsvc \
@@ -473,6 +480,7 @@ HDRSUBDIRS= \
libumem \
libunistat \
libuutil \
+ libvnd \
libvolmgt \
libvrrpadm \
libvscan \
@@ -485,7 +493,6 @@ HDRSUBDIRS= \
libzfs_jni \
libzoneinfo \
libzonestat \
- lvm \
mpapi \
passwdutil \
pkcs11 \
@@ -568,7 +575,7 @@ basedeps := TARGET=install
# libc libm libmd libmp libnsl libnvpair libsocket
abi: libctf libmapmalloc libproc
auditd_plugins: libbsm libsecdb libgss libmtmalloc
-brand: libzonecfg libmapmalloc
+brand: libzonecfg libmapmalloc libipadm libcmdutils libproc librpcsvc
cfgadm_plugins: libdevice libdevinfo libhotplug librcm hbaapi libkstat libscf
fm: libexacct libipmi libzfs scsi libdevinfo libdevid libcfgadm \
libcontract libsysevent ../cmd/sgs/libelf
@@ -582,11 +589,13 @@ libadt_jni: libbsm
libadutils: libldap5 libresolv2
libbe: libzfs libinstzones libuuid libgen libdevinfo libefi
libbsm: libinetutil libscf libsecdb libtsol
+libbunyan: libnvpair
libcfgadm: libdevinfo
libcmd: libsum libast
libcmdutils: libavl
libcpc: libpctx
libcrypt: libgen
+libctf: libdwarf
libdevid: libdevinfo
libdevinfo: libsec libgen
libdhcpagent: libdhcputil libuuid libdlpi libcontract
@@ -594,7 +603,7 @@ libdhcputil: libgen libinetutil libdlpi
libdiskmgt: libdevid libdevinfo libadm libefi libkstat libsysevent
$(INTEL_BLD)libdiskmgt: libfdisk
libdladm: libdevinfo libinetutil libscf librcm libexacct libkstat \
- libpool
+ libpool varpd
libdll: libast
libdlpi: libinetutil libdladm
libds: libsysevent
@@ -612,6 +621,7 @@ libfsmgt: libkstat
libgrubmgmt: libdevinfo libzfs libfstyp libefi
$(INTEL_BLD)libgrubmgmt: libfdisk
libidmap: libavl libuutil
+libidspace: libumem
libinetsvc: libscf
libinstzones: libzonecfg libcontract
libipadm: libinetutil libdlpi libdhcpagent libdladm libsecdb
@@ -646,6 +656,7 @@ libshare: libscf libzfs libuuid libfsmgt libsecdb libumem libsmbfs
libshell: libast libcmd libdll libsecdb
libsip: libmd5
libsldap: libldap5 libscf
+libsmartsshd: libc libcontract
libsmbfs: libkrb5 libsec libidmap pkcs11
libsrpt: libstmf
libstmf: libscf
@@ -665,6 +676,7 @@ libvolmgt: libadm
libvrrpadm: libdladm libscf
libvscan: libscf libsecdb
libwanboot: libresolv2 libdevinfo libinetutil libdhcputil
+libzdoor: libc libzonecfg libcontract
libzfs: libdevid libgen libuutil libadm libavl libefi libidmap \
libumem libtsol libzfs_core
libzfs_jni: libdiskmgt libzfs
@@ -676,7 +688,8 @@ lvm: libadm libdevid libdevinfo libefi libgen libscf
madv: libgen
mpapi: libpthread libdevinfo libsysevent
mpss: libgen
-nsswitch: libadutils libidmap libdns_sd libscf libldap5 libsldap
+nsswitch: libadutils libidmap libdns_sd libscf libldap5 libsldap \
+ libresolv2_joy
pam_modules: libproject passwdutil smbsrv libtsnet libpam libbsm libsecdb
passwdutil: libsldap
pkcs11: libcryptoutil libgen libuuid
@@ -696,6 +709,8 @@ storage: libdevice libdevinfo libdevid
sun_fc: libdevinfo libsysevent
sun_sas: libdevinfo libsysevent libkstat libdevid
udapl: libdevinfo libdladm
+varpd: libavl libidspace libumem libnsl libnvpair libmd5 librename \
+ libbunyan libcmdutils
#
# The reason this rule checks for the existence of the