Print this page
9674 Let's scrap AVS/sdbc

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/Makefile
          +++ new/usr/src/uts/Makefile
↓ open down ↓ 10 lines elided ↑ open up ↑
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  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  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  23      -# Copyright 2012 Nexenta Systems, Inc. All rights reserved.
       24 +# Copyright 2018 Nexenta Systems, Inc.
  24   25  #
  25      -# include global definitions
       26 +
  26   27  include ../Makefile.master
  27   28  
  28   29  #
  29   30  # List of architectures to build as part of the standard build.
  30   31  #
  31   32  # Some of these architectures are built in parallel (see i386_PARALLEL and
  32   33  # sparc_PARALLEL). This requires building some parts first before parallel build
  33   34  # can start. Platform make files know what should be built as a prerequisite for
  34   35  # the parallel build to work. The i386_PREREQ and sparc_PREREQ variables tell
  35   36  # which platform directory to enter to start making prerequisite dependencies.
↓ open down ↓ 88 lines elided ↑ open up ↑
 124  125  # The following is the list of directories which contain Makefiles with
 125  126  # targets to install header file. The machine independent headers are
 126  127  # installed by invoking the Makefile in the directory containing the
 127  128  # header files. Machine and architecture dependent headers are installed
 128  129  # by invoking the main makefile for that architecture/machine which,
 129  130  # in turn, is responsible for invoking the Makefiles which install headers.
 130  131  # It is done this way so as not to assume that all of the header files in
 131  132  # the architecture/machine dependent subdirectories are in completely
 132  133  # isomorphic locations.
 133  134  #
 134      -COMMON_HDRDIRS= common/avs \
 135      -                common/c2 \
      135 +COMMON_HDRDIRS= common/c2 \
 136  136                  common/des \
 137  137                  common/fs \
 138  138                  common/gssapi \
 139  139                  common/idmap \
 140  140                  common/klm \
 141  141                  common/inet \
 142  142                  common/inet/ipf/netinet \
 143  143                  common/inet/kssl \
 144  144                  common/inet/nca \
 145  145                  common/inet/sockmods/netpacket \
↓ open down ↓ 10 lines elided ↑ open up ↑
 156  156                  common/smb \
 157  157                  common/smbsrv \
 158  158                  common/sys \
 159  159                  common/vm
 160  160  
 161  161  
 162  162  #
 163  163  # Subset of COMMON_HDRDIRS in which at least one header is generated
 164  164  # at runtime (e.g., rpcgen), and in which "make clean" should run.
 165  165  # Other directories should be included here, but do not yet have the
 166      -# necessary Makefile support (make clean).  See 6414855.
      166 +# necessary Makefile support (make clean).
 167  167  #
 168      -DYNHDRDIRS =    common/avs \
 169      -                common/gssapi \
      168 +DYNHDRDIRS =    common/gssapi \
 170  169                  common/idmap \
 171  170                  common/io/fibre-channel/fca/qlc \
 172  171                  common/klm \
 173  172                  common/rpc \
 174  173                  common/rpcsvc \
 175  174                  common/sys
 176  175  
 177  176  sparc_HDRDIRS= sun/sys
 178  177  i386_HDRDIRS= i86pc/vm i86xpv/vm
 179  178  
↓ open down ↓ 44 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX