Print this page
5470 libz should be part of illumos
1002 Integrate zlib

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/Makefile
          +++ new/usr/src/lib/Makefile
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  # Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  23   23  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright (c) 2012 by Delphix. All rights reserved.
  25   25  # Copyright (c) 2012, Joyent, Inc. All rights reserved.
  26   26  # Copyright (c) 2013 Gary Mills
  27   27  # Copyright 2014 Garrett D'Amore <garrett@damore.org>
       28 +# Copyright (c) 2015 Gary Mills
  28   29  
  29   30  include ../Makefile.master
  30   31  
  31   32  #       Note that libcurses installs commands along with its library.
  32   33  #       This is a minor bug which probably should be fixed.
  33   34  #       Note also that a few extra libraries are kept in cmd source.
  34   35  #
  35   36  # Certain libraries are linked with, hence depend on, other libraries.
  36   37  #
  37   38  # Although we have historically used .WAIT to express dependencies, it
↓ open down ↓ 219 lines elided ↑ open up ↑
 257  258          libilb          \
 258  259          scsi            \
 259  260          libima          \
 260  261          libsun_ima      \
 261  262          mpapi           \
 262  263          librstp         \
 263  264          libreparse      \
 264  265          libhotplug      \
 265  266          libfruutils     .WAIT   \
 266  267          libfru          \
      268 +        zlib            \
 267  269          $($(MACH)_SUBDIRS)
 268  270  
 269  271  i386_SUBDIRS=           \
 270  272          libfdisk        \
 271  273          libsaveargs
 272  274  
 273  275  sparc_SUBDIRS= .WAIT    \
 274  276          efcode          \
 275  277          libds           \
 276  278          libdscp         \
↓ open down ↓ 217 lines elided ↑ open up ↑
 494  496          libgrubmgmt     \
 495  497          smbsrv          \
 496  498          libilb          \
 497  499          scsi            \
 498  500          hbaapi          \
 499  501          smhba           \
 500  502          libima          \
 501  503          libsun_ima      \
 502  504          mpapi           \
 503  505          libreparse      \
      506 +        zlib            \
 504  507          $($(MACH)_HDRSUBDIRS)
 505  508  
 506  509  i386_HDRSUBDIRS=        \
 507  510          libfdisk        \
 508  511          libsaveargs
 509  512  
 510  513  sparc_HDRSUBDIRS=       \
 511  514          libds           \
 512  515          libdscp         \
 513  516          libpri          \
↓ open down ↓ 119 lines elided ↑ open up ↑
 633  636  libsaveargs:    libdisasm
 634  637  ../cmd/sgs/libdl:       ../cmd/sgs/libconv
 635  638  ../cmd/sgs/libelf:      ../cmd/sgs/libconv
 636  639  pkcs11:         libcryptoutil
 637  640  print:          libldap5
 638  641  udapl/udapl_tavor:      udapl/libdat
 639  642  libzfs:         libdevid libgen libnvpair libuutil \
 640  643                  libadm libavl libefi libidmap libmd libzfs_core libm
 641  644  libzfs_core:    libnvpair
 642  645  libzfs_jni:     libdiskmgt libnvpair libzfs
 643      -libzpool:       libavl libumem libnvpair libcmdutils
      646 +libzpool:       libavl libumem libnvpair libcmdutils zlib
 644  647  libsec:         libavl libidmap
 645  648  brand:          libc libsocket
 646  649  libshare:       libscf libzfs libuuid libfsmgt libsecdb libumem libsmbfs
 647  650  libexacct/demo: libexacct libproject libsocket libnsl
 648  651  libtsalarm:     libpcp
 649  652  smbsrv:         libsocket libnsl libmd libxnet libpthread librt \
 650  653                  libshare libidmap pkcs11 libsqlite libcryptoutil \
 651  654                  libreparse libcmdutils
 652  655  libv12n:        libds libuuid
 653  656  libvrrpadm:     libsocket libdladm libscf
↓ open down ↓ 45 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX