Print this page


Split Close
Expand all
Collapse all
          --- old/usr/src/lib/Makefile
          +++ new/usr/src/lib/Makefile
↓ open down ↓ 14 lines elided ↑ open up ↑
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  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      -# Copyright 2015, Joyent, Inc.
       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   28  # Copyright (c) 2015 Gary Mills
  29   29  # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  30      -# Copyright 2016 Toomas Soome <tsoome@me.com>
  31   30  #
  32   31  
  33   32  include ../Makefile.master
  34   33  
  35   34  #       Note that libcurses installs commands along with its library.
  36   35  #       This is a minor bug which probably should be fixed.
  37   36  #       Note also that a few extra libraries are kept in cmd source.
  38   37  #
  39   38  # Certain libraries are linked with, hence depend on, other libraries.
  40   39  # Library dependencies are called out explicitly, see "Library
↓ open down ↓ 44 lines elided ↑ open up ↑
  85   84          libads          \
  86   85          libadt_jni      \
  87   86          libadutils      \
  88   87          libaio          \
  89   88          libast          \
  90   89          libavl          \
  91   90          libbe           \
  92   91          libbrand        \
  93   92          libbsdmalloc    \
  94   93          libbsm          \
  95      -        libbunyan       \
  96   94          libc_db         \
  97   95          libcfgadm       \
  98   96          libcmd          \
  99   97          libcmdutils     \
 100   98          libcommputil    \
 101   99          libcontract     \
 102  100          libcpc          \
 103  101          libcrypt        \
 104  102          libcryptoutil   \
 105  103          libctf          \
↓ open down ↓ 6 lines elided ↑ open up ↑
 112  110          libdisasm       \
 113  111          libdiskmgt      \
 114  112          libdladm        \
 115  113          libdll          \
 116  114          libdlpi         \
 117  115          libdns_sd       \
 118  116          libdoor         \
 119  117          libdscfg        \
 120  118          libdtrace       \
 121  119          libdtrace_jni   \
 122      -        libdwarf        \
 123  120          libefi          \
 124  121          libelfsign      \
 125  122          libeti          \
 126  123          libexacct       \
 127  124          libexacct/demo  \
 128  125          libfakekernel   \
 129  126          libfcoe         \
 130      -        libficl         \
 131  127          libfru          \
 132  128          libfruutils     \
 133  129          libfsmgt        \
 134  130          libfstyp        \
 135  131          libgen          \
 136  132          libgrubmgmt     \
 137  133          libgss          \
 138  134          libhotplug      \
 139  135          libidmap        \
 140      -        libidspace      \
 141  136          libilb          \
 142  137          libima          \
 143  138          libinetsvc      \
 144  139          libinetutil     \
 145  140          libinstzones    \
 146  141          libintl         \
 147  142          libipadm        \
 148  143          libipd          \
 149  144          libipmi         \
 150  145          libipmp         \
↓ open down ↓ 27 lines elided ↑ open up ↑
 178  173          libpicltree     \
 179  174          libpkg          \
 180  175          libpool         \
 181  176          libpp           \
 182  177          libproc         \
 183  178          libproject      \
 184  179          libpthread      \
 185  180          libraidcfg      \
 186  181          librcm          \
 187  182          librdc          \
 188      -        librename       \
 189  183          libreparse      \
 190  184          libresolv       \
 191  185          libresolv2      \
 192      -        libresolv2_joy  \
 193  186          librestart      \
 194  187          librpcsvc       \
 195  188          librsm          \
 196  189          librstp         \
 197  190          librt           \
 198  191          libsasl         \
 199  192          libscf          \
 200  193          libsched        \
 201  194          libsctp         \
 202  195          libsec          \
 203  196          libsecdb        \
 204  197          libsendfile     \
 205  198          libshare        \
 206  199          libshell        \
 207  200          libsip          \
 208  201          libsldap        \
 209  202          libslp          \
 210      -        libsmartsshd    \
 211  203          libsmbfs        \
 212  204          libsmbios       \
 213  205          libsmedia       \
 214  206          libsqlite       \
 215  207          libsrpt         \
 216  208          libstmf         \
 217  209          libstmfproxy    \
 218  210          libsum          \
 219  211          libsun_ima      \
 220  212          libsys          \
↓ open down ↓ 3 lines elided ↑ open up ↑
 224  216          libthread       \
 225  217          libtnf          \
 226  218          libtnfctl       \
 227  219          libtnfprobe     \
 228  220          libtsnet        \
 229  221          libtsol         \
 230  222          libumem         \
 231  223          libunistat      \
 232  224          libuuid         \
 233  225          libuutil        \
 234      -        libvnd          \
 235  226          libvolmgt       \
 236  227          libvrrpadm      \
 237  228          libvscan        \
 238  229          libw            \
 239  230          libwanboot      \
 240  231          libwanbootutil  \
 241  232          libwrap         \
 242  233          libxcurses      \
 243  234          libxcurses2     \
 244  235          libxnet         \
 245      -        libzdoor        \
 246  236          libzfs          \
 247  237          libzfs_core     \
 248  238          libzfs_jni      \
 249  239          libzonecfg      \
 250  240          libzoneinfo     \
 251  241          libzonestat     \
 252  242          libzpool        \
      243 +        lvm             \
 253  244          madv            \
 254  245          mpapi           \
 255  246          mpss            \
 256  247          nametoaddr      \
 257  248          ncad_addr       \
 258  249          nsswitch        \
 259  250          pam_modules     \
 260  251          passwdutil      \
 261  252          pkcs11          \
 262  253          policykit       \
 263  254          print           \
      255 +        pylibbe         \
      256 +        pysolaris       \
      257 +        pyzfs           \
 264  258          raidcfg_plugins \
 265  259          rpcsec_gss      \
 266  260          sasl_plugins    \
 267  261          scsi            \
 268  262          smbsrv          \
 269  263          smhba           \
 270  264          sun_fc          \
 271  265          sun_sas         \
 272  266          udapl           \
 273      -        varpd           \
 274  267          watchmalloc     \
 275  268          $($(MACH)_SUBDIRS)
 276  269  
 277  270  i386_SUBDIRS=           \
 278  271          libfdisk        \
 279  272          libsaveargs
 280  273  
 281  274  sparc_SUBDIRS=          \
 282  275          efcode          \
 283  276          libds           \
↓ open down ↓ 6 lines elided ↑ open up ↑
 290  283          libpcp          \
 291  284          libtsalarm      \
 292  285          libv12n
 293  286  
 294  287  #
 295  288  # Create a special version of $(SUBDIRS) with no .WAIT's, for use with the
 296  289  # clean and clobber targets (for more information, see those targets, below).
 297  290  #
 298  291  NOWAIT_SUBDIRS= $(SUBDIRS:.WAIT=)
 299  292  
 300      -DCSUBDIRS =
      293 +DCSUBDIRS =             \
      294 +        lvm
 301  295  
 302  296  MSGSUBDIRS=             \
 303  297          abi             \
 304  298          auditd_plugins  \
 305  299          brand           \
 306  300          cfgadm_plugins  \
 307  301          gss_mechs/mech_dh       \
 308  302          gss_mechs/mech_krb5     \
 309  303          krb5            \
 310  304          libast          \
↓ open down ↓ 25 lines elided ↑ open up ↑
 336  330          libpool         \
 337  331          libpp           \
 338  332          libreparse      \
 339  333          libsasl         \
 340  334          libscf          \
 341  335          libsecdb        \
 342  336          libshare        \
 343  337          libshell        \
 344  338          libsldap        \
 345  339          libslp          \
 346      -        libsmartsshd    \
 347  340          libsmbfs        \
 348  341          libsmedia       \
 349  342          libsum          \
 350  343          libtsol         \
 351  344          libuutil        \
 352  345          libvrrpadm      \
 353  346          libvscan        \
 354  347          libwanboot      \
 355  348          libwanbootutil  \
 356  349          libzfs          \
 357  350          libzonecfg      \
 358      -        libzdoor        \
      351 +        lvm             \
 359  352          madv            \
 360  353          mpss            \
 361  354          pam_modules     \
      355 +        pyzfs           \
 362  356          rpcsec_gss      \
 363  357          $($(MACH)_MSGSUBDIRS)
 364  358  
 365  359  sparc_MSGSUBDIRS=       \
 366  360          libprtdiag      \
 367  361          libprtdiag_psr
 368  362  
 369  363  i386_MSGSUBDIRS= libfdisk
 370  364  
 371  365  HDRSUBDIRS=                             \
 372  366          ../cmd/sendmail/libmilter       \
 373  367          auditd_plugins  \
 374  368          fm              \
 375  369          hal             \
 376  370          hbaapi          \
 377  371          libads          \
 378  372          libast          \
 379  373          libbrand        \
 380  374          libbsm          \
 381      -        libbunyan       \
 382  375          libc            \
 383  376          libcmd          \
 384  377          libcmdutils     \
 385  378          libcommputil    \
 386  379          libcontract     \
 387  380          libcpc          \
 388  381          libcryptoutil   \
 389  382          libctf          \
 390  383          libcurses       \
 391  384          libdevice       \
 392  385          libdevid        \
 393  386          libdevinfo      \
 394  387          libdhcpagent    \
 395  388          libdhcputil     \
 396  389          libdisasm       \
 397  390          libdiskmgt      \
 398      -        libdwarf        \
 399  391          libdladm        \
 400  392          libdll          \
 401  393          libdlpi         \
 402  394          libdns_sd       \
 403  395          libdscfg        \
 404  396          libdtrace       \
 405  397          libdtrace_jni   \
 406  398          libelfsign      \
 407  399          libeti          \
 408  400          libfakekernel   \
 409  401          libfcoe         \
 410  402          libfru          \
 411  403          libfstyp        \
 412  404          libgen          \
 413  405          libgrubmgmt     \
 414  406          libidmap        \
 415      -        libidspace      \
 416  407          libilb          \
 417  408          libima          \
 418  409          libinetsvc      \
 419  410          libinetutil     \
 420  411          libinstzones    \
 421  412          libipadm        \
 422  413          libipd          \
 423  414          libipmi         \
 424  415          libipmp         \
 425  416          libipp          \
↓ open down ↓ 15 lines elided ↑ open up ↑
 441  432          libpcidb        \
 442  433          libpctx         \
 443  434          libpicl         \
 444  435          libpicltree     \
 445  436          libpool         \
 446  437          libpp           \
 447  438          libproc         \
 448  439          libraidcfg      \
 449  440          librcm          \
 450  441          librdc          \
 451      -        librename       \
 452  442          libreparse      \
 453  443          librestart      \
 454  444          librpcsvc       \
 455  445          librsm          \
 456  446          librstp         \
 457  447          libsasl         \
 458  448          libscf          \
 459  449          libsec          \
 460  450          libshare        \
 461  451          libshell        \
↓ open down ↓ 13 lines elided ↑ open up ↑
 475  465          libtecla        \
 476  466          libtermcap      \
 477  467          libtnf          \
 478  468          libtnfctl       \
 479  469          libtnfprobe     \
 480  470          libtsnet        \
 481  471          libtsol         \
 482  472          libumem         \
 483  473          libunistat      \
 484  474          libuutil        \
 485      -        libvnd          \
 486  475          libvolmgt       \
 487  476          libvrrpadm      \
 488  477          libvscan        \
 489  478          libwanboot      \
 490  479          libwanbootutil  \
 491  480          libwrap         \
 492  481          libxcurses2     \
 493  482          libzfs          \
 494  483          libzfs_core     \
 495  484          libzfs_jni      \
 496  485          libzoneinfo     \
 497  486          libzonestat     \
      487 +        lvm             \
 498  488          mpapi           \
 499  489          passwdutil      \
 500  490          pkcs11          \
 501  491          policykit       \
 502  492          scsi            \
 503  493          smbsrv          \
 504  494          smhba           \
 505  495          udapl           \
 506  496          $($(MACH)_HDRSUBDIRS)
 507  497  
↓ open down ↓ 73 lines elided ↑ open up ↑
 581  571  cfgadm_plugins: libdevice libdevinfo libhotplug librcm hbaapi libkstat libscf
 582  572  fm:             libexacct libipmi libzfs scsi libdevinfo libdevid libcfgadm \
 583  573                  libcontract libsysevent ../cmd/sgs/libelf
 584  574  $(SPARC_BLD)fm: libpri
 585  575  gss_mechs/mech_dh: libgss
 586  576  gss_mechs/mech_dummy: libgss
 587  577  gss_mechs/mech_krb5: libgss libresolv2 pkcs11 libkstat
 588  578  gss_mechs/mech_spnego: gss_mechs/mech_krb5
 589  579  krb5:           gss_mechs/mech_krb5 libtecla libldap5
 590  580  libadt_jni:     libbsm
 591      -libadutils:     libldap5 libresolv2
 592      -libbe:          libzfs libinstzones libuuid libgen libdevinfo libefi libficl
      581 +libadutils:     libldap5 libresolv2
      582 +libbe:          libzfs libinstzones libuuid libgen libdevinfo libefi
 593  583  libbsm:         libinetutil libscf libsecdb libtsol
 594      -libbunyan:      libnvpair
 595  584  libcfgadm:      libdevinfo
 596      -libcmd:         libsum libast
      585 +libcmd:         libsum libast
 597  586  libcmdutils:    libavl
 598  587  libcpc:         libpctx
 599  588  libcrypt:       libgen
 600      -libctf:         libdwarf
 601  589  libdevid:       libdevinfo
 602  590  libdevinfo:     libsec libgen
 603  591  libdhcpagent:   libdhcputil libuuid libdlpi libcontract
 604  592  libdhcputil:    libgen libinetutil libdlpi
 605  593  libdiskmgt:     libdevid libdevinfo libadm libefi libkstat libsysevent
 606  594  $(INTEL_BLD)libdiskmgt: libfdisk
 607  595  libdladm:       libdevinfo libinetutil libscf librcm libexacct libkstat \
 608      -                libpool varpd
      596 +                libpool
 609  597  libdll:         libast
 610  598  libdlpi:        libinetutil libdladm
 611  599  libds:          libsysevent
 612  600  libdscfg:       libnsctl libunistat libadm
 613  601  libdtrace:      libproc libgen libctf libmapmalloc
 614  602  libdtrace_jni:  libuutil libdtrace
 615  603  libefi:         libuuid
 616  604  libelfsign:     libcryptoutil libkmf ../cmd/sgs/libelf
 617  605  libeti:         libcurses
 618  606  libexacct/demo: libexacct libproject
 619  607  libfakekernel:  libumem libcryptoutil
 620  608  libfcoe:        libdladm
 621      -libficl:        libumem
 622  609  libfru:         libfruutils
 623  610  libfsmgt:       libkstat
 624  611  libgrubmgmt:    libdevinfo libzfs libfstyp libefi
 625  612  $(INTEL_BLD)libgrubmgmt: libfdisk
 626  613  libidmap:       libavl libuutil
 627      -libidspace:     libumem
 628  614  libinetsvc:     libscf
 629  615  libinstzones:   libzonecfg libcontract
 630  616  libipadm:       libinetutil libdlpi libdhcpagent libdladm libsecdb
 631  617  libipmp:        libinetutil
 632  618  libipsecutil:   libtecla libtsol
 633  619  libiscsit:      libstmf libuuid
 634  620  libkmf:         libcryptoutil pkcs11
 635  621  libkvm:         ../cmd/sgs/libelf
 636  622  libldap5:       libsasl
 637  623  libmapid:       libresolv2 libscf
↓ open down ↓ 14 lines elided ↑ open up ↑
 652  638  librdc:         libnsctl libunistat libdscfg
 653  639  librestart:     libuutil libscf libpool libproject libsecdb libsysevent
 654  640  libsasl:        libgss pkcs11
 655  641  libsaveargs:    libdisasm
 656  642  libscf:         libuutil libgen libsmbios
 657  643  libsec:         libavl libidmap
 658  644  libshare:       libscf libzfs libuuid libfsmgt libsecdb libumem libsmbfs
 659  645  libshell:       libast libcmd libdll libsecdb
 660  646  libsip:         libmd5
 661  647  libsldap:       libldap5 libscf
 662      -libsmartsshd:   libc libcontract
 663  648  libsmbfs:       libkrb5 libsec libidmap pkcs11
 664  649  libsrpt:        libstmf
 665  650  libstmf:        libscf
 666  651  libstmfproxy:   libstmf libpthread
 667  652  libsum:         libast
 668  653  libsun_ima:     libdevinfo libsysevent
 669  654  libsysevent:    libsecdb
 670  655  libtecla:       libcurses
 671  656  libtermcap:     libcurses
 672  657  libtnfctl:      ../cmd/sgs/libelf
 673  658  libtsalarm:     libpcp
 674  659  libtsnet:       libtsol libsecdb
 675  660  libtsol:        libsecdb
 676  661  libuuid:        libdlpi
 677  662  libv12n:        libds libuuid
 678  663  libvolmgt:      libadm
 679  664  libvrrpadm:     libdladm libscf
 680  665  libvscan:       libscf libsecdb
 681  666  libwanboot:     libresolv2 libdevinfo libinetutil libdhcputil
 682      -libzdoor:       libc libzonecfg libcontract
 683  667  libzfs:         libdevid libgen libuutil libadm libavl libefi libidmap \
 684  668                  libumem libtsol libzfs_core
 685  669  libzfs_jni:     libdiskmgt libzfs
 686  670  libzonecfg:     libuuid libsysevent libsec libbrand libpool libscf libproc \
 687  671                  libuutil libbsm libsecdb
 688  672  libzonestat:    libcmdutils libumem
 689  673  libzpool:       libavl libumem libcmdutils libsysevent
 690  674  lvm:            libadm libdevid libdevinfo libefi libgen libscf
 691  675  madv:           libgen
 692  676  mpapi:          libpthread libdevinfo libsysevent
 693  677  mpss:           libgen
 694      -nsswitch:       libadutils libidmap libdns_sd libscf libldap5 libsldap \
 695      -                libresolv2_joy
      678 +nsswitch:       libadutils libidmap libdns_sd libscf libldap5 libsldap
 696  679  pam_modules:    libproject passwdutil smbsrv libtsnet libpam libbsm libsecdb
 697  680  passwdutil:     libsldap
 698  681  pkcs11:         libcryptoutil libgen libuuid
 699  682  policykit:      libsecdb
 700  683  print:          libldap5 libmd5 libsendfile
 701  684  pylibbe:        libbe libzfs
 702  685  pysolaris:      libsec libidmap
 703  686  pyzfs:          libzfs
 704  687  raidcfg_plugins: libraidcfg librcm libcfgadm libpicl libpicltree
 705  688  rpcsec_gss:     libgss
 706  689  sasl_plugins:   pkcs11 libgss libsasl
 707  690  scsi:           libfru libumem libdevid libdevinfo
 708  691  smbsrv:         libxnet libpthread librt libshare libidmap pkcs11 libsqlite \
 709  692                  libcryptoutil libreparse libcmdutils libresolv2 libsmbfs \
 710  693                  libuuid libfakekernel libads libgss libldap5 krb5
 711  694  storage:        libdevice libdevinfo libdevid
 712  695  sun_fc:         libdevinfo libsysevent
 713  696  sun_sas:        libdevinfo libsysevent libkstat libdevid
 714  697  udapl:          libdevinfo libdladm
 715      -varpd:          libavl libidspace libumem libnsl libnvpair libmd5 librename \
 716      -                libbunyan libcmdutils
 717  698  
 718  699  #
 719  700  # The reason this rule checks for the existence of the
 720  701  # Makefile is that some of the directories do not exist
 721  702  # in certain situations (e.g., exportable source builds,
 722  703  # OpenSolaris).
 723  704  #
 724  705  $(SUBDIRS): FRC
 725  706          @if [ -f $@/Makefile  ]; then \
 726  707                  cd $@; pwd; $(MAKE) $(TARGET); \
↓ open down ↓ 12 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX