Print this page
4027 remove CLOSED_BUILD
4028 remove CLOSED_IS_PRESENT
4029 remove tonic build bits
Reviewed by: Andy Stormont <andyjstormont@gmail.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/Makefile
          +++ new/usr/src/lib/Makefile
↓ open down ↓ 37 lines elided ↑ open up ↑
  38   38  # takes to build the libraries.  Thus, we now require that any new
  39   39  # libraries explicitly call out their dependencies.  Eventually, all
  40   40  # the library dependencies will be called out explicitly.  See
  41   41  # "Library interdependencies" near the end of this file.
  42   42  #
  43   43  # Aside from explicit dependencies (and legacy .WAITs), all libraries
  44   44  # are built in parallel.
  45   45  #
  46   46  .PARALLEL:
  47   47  
  48      -#
  49      -# The $(CLOSED_BUILD) additions to SUBDIRS & MSGSUBDIRS are unfortunate,
  50      -# but required due to the "dependencies" of using .WAIT to barrier the
  51      -# parallel dmake builds.  once 4631488 has been fixed, they can be
  52      -# consolidated into one $(CLOSED_BUILD)SUBDIRS += (all closed libs) as
  53      -# shown in HDRSUBDIRS
  54      -#
  55   48  SUBDIRS= \
  56   49          common                  .WAIT   \
  57   50          ../cmd/sgs/libconv              \
  58   51          ../cmd/sgs/libdl        .WAIT
  59   52  
  60   53  SUBDIRS += \
  61   54          libc                    .WAIT   \
  62   55          ../cmd/sgs/libelf       .WAIT   \
  63   56          c_synonyms                      \
  64   57          libmd                           \
↓ open down ↓ 111 lines elided ↑ open up ↑
 176  169          libc_db         \
 177  170          libndmp         \
 178  171          libsec          \
 179  172          libtnfprobe     \
 180  173          libtnf          \
 181  174          libtnfctl       \
 182  175          libdhcpagent    \
 183  176          libdhcpdu       \
 184  177          libdhcputil     \
 185  178          libxnet         \
 186      -        libipsecutil
 187      -$(CLOSED_BUILD)SUBDIRS += \
 188      -        $(CLOSED)/lib/libike
 189      -SUBDIRS += \
      179 +        libipsecutil    \
 190  180          nsswitch        \
 191  181          print           \
 192  182          libuutil        \
 193  183          libscf          \
 194  184          libinetsvc      \
 195  185          librestart      \
 196  186          libsched        \
 197  187          libelfsign      \
 198  188          pkcs11          .WAIT   \
 199  189          libpctx         .WAIT   \
↓ open down ↓ 305 lines elided ↑ open up ↑
 505  495          libilb          \
 506  496          scsi            \
 507  497          hbaapi          \
 508  498          smhba           \
 509  499          libima          \
 510  500          libsun_ima      \
 511  501          mpapi           \
 512  502          libreparse      \
 513  503          $($(MACH)_HDRSUBDIRS)
 514  504  
 515      -$(CLOSED_BUILD)HDRSUBDIRS += \
 516      -        $(CLOSED)/lib/libike
 517      -
 518  505  i386_HDRSUBDIRS=        \
 519  506          libparted       \
 520  507          libfdisk        \
 521  508          libsaveargs
 522  509  
 523  510  sparc_HDRSUBDIRS=       \
 524  511          libds           \
 525  512          libdscp         \
 526  513          libpri          \
 527  514          libv12n         \
↓ open down ↓ 72 lines elided ↑ open up ↑
 600  587  libelfsign:     libcryptoutil libkmf
 601  588  libidmap:       libadutils libldap5 libavl libsldap libuutil
 602  589  libipadm:       libnsl libinetutil libsocket libdlpi libnvpair libdhcpagent \
 603  590                  libdladm libsecdb
 604  591  libiscsit:      libc libnvpair libstmf libuuid libnsl
 605  592  libkmf:         libcryptoutil pkcs11
 606  593  libnsl:         libmd5
 607  594  libmapid:       libresolv
 608  595  librdc:         libsocket libnsl libnsctl libunistat libdscfg
 609  596  libuuid:        libdlpi
 610      -$(CLOSED_BUILD)libike:  libipsecutil libxnet libcryptoutil
 611  597  libinetutil:    libsocket
 612  598  libipsecutil:   libtecla libsocket
 613  599  libinstzones:   libzonecfg libcontract
 614  600  libpkg:         libwanboot libscf libadm
 615  601  libnwam:        libscf
 616  602  libsecdb:       libnsl
 617  603  libsasl:        libgss libsocket pkcs11 libmd
 618  604  sasl_plugins:   pkcs11 libgss libsocket libsasl
 619  605  libsctp:        libsocket
 620  606  libshell:       libast libcmd libdll libsocket libsecdb
↓ open down ↓ 83 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX