Print this page
@@ -20,16 +20,15 @@
#
#
# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2012 by Delphix. All rights reserved.
-# Copyright 2015, Joyent, Inc.
+# Copyright (c) 2012, Joyent, Inc. All rights reserved.
# Copyright (c) 2013 Gary Mills
# Copyright 2014 Garrett D'Amore <garrett@damore.org>
# Copyright (c) 2015 Gary Mills
# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
-# Copyright 2016 Toomas Soome <tsoome@me.com>
#
include ../Makefile.master
# Note that libcurses installs commands along with its library.
@@ -90,11 +89,10 @@
libavl \
libbe \
libbrand \
libbsdmalloc \
libbsm \
- libbunyan \
libc_db \
libcfgadm \
libcmd \
libcmdutils \
libcommputil \
@@ -117,29 +115,26 @@
libdns_sd \
libdoor \
libdscfg \
libdtrace \
libdtrace_jni \
- libdwarf \
libefi \
libelfsign \
libeti \
libexacct \
libexacct/demo \
libfakekernel \
libfcoe \
- libficl \
libfru \
libfruutils \
libfsmgt \
libfstyp \
libgen \
libgrubmgmt \
libgss \
libhotplug \
libidmap \
- libidspace \
libilb \
libima \
libinetsvc \
libinetutil \
libinstzones \
@@ -183,15 +178,13 @@
libproject \
libpthread \
libraidcfg \
librcm \
librdc \
- librename \
libreparse \
libresolv \
libresolv2 \
- libresolv2_joy \
librestart \
librpcsvc \
librsm \
librstp \
librt \
@@ -205,11 +198,10 @@
libshare \
libshell \
libsip \
libsldap \
libslp \
- libsmartsshd \
libsmbfs \
libsmbios \
libsmedia \
libsqlite \
libsrpt \
@@ -229,11 +221,10 @@
libtsol \
libumem \
libunistat \
libuuid \
libuutil \
- libvnd \
libvolmgt \
libvrrpadm \
libvscan \
libw \
libwanboot \
@@ -240,18 +231,18 @@
libwanbootutil \
libwrap \
libxcurses \
libxcurses2 \
libxnet \
- libzdoor \
libzfs \
libzfs_core \
libzfs_jni \
libzonecfg \
libzoneinfo \
libzonestat \
libzpool \
+ lvm \
madv \
mpapi \
mpss \
nametoaddr \
ncad_addr \
@@ -259,20 +250,22 @@
pam_modules \
passwdutil \
pkcs11 \
policykit \
print \
+ pylibbe \
+ pysolaris \
+ pyzfs \
raidcfg_plugins \
rpcsec_gss \
sasl_plugins \
scsi \
smbsrv \
smhba \
sun_fc \
sun_sas \
udapl \
- varpd \
watchmalloc \
$($(MACH)_SUBDIRS)
i386_SUBDIRS= \
libfdisk \
@@ -295,11 +288,12 @@
# Create a special version of $(SUBDIRS) with no .WAIT's, for use with the
# clean and clobber targets (for more information, see those targets, below).
#
NOWAIT_SUBDIRS= $(SUBDIRS:.WAIT=)
-DCSUBDIRS =
+DCSUBDIRS = \
+ lvm
MSGSUBDIRS= \
abi \
auditd_plugins \
brand \
@@ -341,11 +335,10 @@
libsecdb \
libshare \
libshell \
libsldap \
libslp \
- libsmartsshd \
libsmbfs \
libsmedia \
libsum \
libtsol \
libuutil \
@@ -353,14 +346,15 @@
libvscan \
libwanboot \
libwanbootutil \
libzfs \
libzonecfg \
- libzdoor \
+ lvm \
madv \
mpss \
pam_modules \
+ pyzfs \
rpcsec_gss \
$($(MACH)_MSGSUBDIRS)
sparc_MSGSUBDIRS= \
libprtdiag \
@@ -376,11 +370,10 @@
hbaapi \
libads \
libast \
libbrand \
libbsm \
- libbunyan \
libc \
libcmd \
libcmdutils \
libcommputil \
libcontract \
@@ -393,11 +386,10 @@
libdevinfo \
libdhcpagent \
libdhcputil \
libdisasm \
libdiskmgt \
- libdwarf \
libdladm \
libdll \
libdlpi \
libdns_sd \
libdscfg \
@@ -410,11 +402,10 @@
libfru \
libfstyp \
libgen \
libgrubmgmt \
libidmap \
- libidspace \
libilb \
libima \
libinetsvc \
libinetutil \
libinstzones \
@@ -446,11 +437,10 @@
libpp \
libproc \
libraidcfg \
librcm \
librdc \
- librename \
libreparse \
librestart \
librpcsvc \
librsm \
librstp \
@@ -480,11 +470,10 @@
libtsnet \
libtsol \
libumem \
libunistat \
libuutil \
- libvnd \
libvolmgt \
libvrrpadm \
libvscan \
libwanboot \
libwanbootutil \
@@ -493,10 +482,11 @@
libzfs \
libzfs_core \
libzfs_jni \
libzoneinfo \
libzonestat \
+ lvm \
mpapi \
passwdutil \
pkcs11 \
policykit \
scsi \
@@ -587,27 +577,25 @@
gss_mechs/mech_krb5: libgss libresolv2 pkcs11 libkstat
gss_mechs/mech_spnego: gss_mechs/mech_krb5
krb5: gss_mechs/mech_krb5 libtecla libldap5
libadt_jni: libbsm
libadutils: libldap5 libresolv2
-libbe: libzfs libinstzones libuuid libgen libdevinfo libefi libficl
+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
libdhcputil: libgen libinetutil libdlpi
libdiskmgt: libdevid libdevinfo libadm libefi libkstat libsysevent
$(INTEL_BLD)libdiskmgt: libfdisk
libdladm: libdevinfo libinetutil libscf librcm libexacct libkstat \
- libpool varpd
+ libpool
libdll: libast
libdlpi: libinetutil libdladm
libds: libsysevent
libdscfg: libnsctl libunistat libadm
libdtrace: libproc libgen libctf libmapmalloc
@@ -616,17 +604,15 @@
libelfsign: libcryptoutil libkmf ../cmd/sgs/libelf
libeti: libcurses
libexacct/demo: libexacct libproject
libfakekernel: libumem libcryptoutil
libfcoe: libdladm
-libficl: libumem
libfru: libfruutils
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
libipmp: libinetutil
libipsecutil: libtecla libtsol
@@ -657,11 +643,10 @@
libsec: libavl libidmap
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
libstmfproxy: libstmf libpthread
libsum: libast
@@ -677,11 +662,10 @@
libv12n: libds libuuid
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
libzonecfg: libuuid libsysevent libsec libbrand libpool libscf libproc \
libuutil libbsm libsecdb
@@ -689,12 +673,11 @@
libzpool: libavl libumem libcmdutils libsysevent
lvm: libadm libdevid libdevinfo libefi libgen libscf
madv: libgen
mpapi: libpthread libdevinfo libsysevent
mpss: libgen
-nsswitch: libadutils libidmap libdns_sd libscf libldap5 libsldap \
- libresolv2_joy
+nsswitch: libadutils libidmap libdns_sd libscf libldap5 libsldap
pam_modules: libproject passwdutil smbsrv libtsnet libpam libbsm libsecdb
passwdutil: libsldap
pkcs11: libcryptoutil libgen libuuid
policykit: libsecdb
print: libldap5 libmd5 libsendfile
@@ -710,12 +693,10 @@
libuuid libfakekernel libads libgss libldap5 krb5
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
# Makefile is that some of the directories do not exist
# in certain situations (e.g., exportable source builds,