Print this page
195 Need replacement for nfs/lockd+klm
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Reviewed by: Jeremy Jones <jeremy@delphix.com>
Reviewed by: Jeff Biseda <jbiseda@delphix.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/Makefile
          +++ new/usr/src/uts/Makefile
↓ open down ↓ 127 lines elided ↑ open up ↑
 128  128  # It is done this way so as not to assume that all of the header files in
 129  129  # the architecture/machine dependent subdirectories are in completely
 130  130  # isomorphic locations.
 131  131  #
 132  132  COMMON_HDRDIRS= common/avs \
 133  133                  common/c2 \
 134  134                  common/des \
 135  135                  common/fs \
 136  136                  common/gssapi \
 137  137                  common/idmap \
      138 +                common/klm \
 138  139                  common/inet \
 139  140                  common/inet/ipf/netinet \
 140  141                  common/inet/kssl \
 141  142                  common/inet/nca \
 142  143                  common/inet/sockmods/netpacket \
 143  144                  common/io/bpf/net \
 144  145                  common/ipp \
 145  146                  common/net \
 146  147                  common/netinet \
 147  148                  common/nfs \
↓ open down ↓ 6 lines elided ↑ open up ↑
 154  155                  common/sys \
 155  156                  common/vm
 156  157  
 157  158  
 158  159  # These aren't the only headers in closed.  But the other directories
 159  160  # are simple enough that they can be driven from the src tree.
 160  161  $(CLOSED_BUILD)COMMON_HDRDIRS += $(CLOSED)/uts/common/sys
 161  162  
 162  163  #
 163  164  # Subset of COMMON_HDRDIRS in which at least one header is generated
 164      -# at runtime (e.g., rpcgen).  (This is a partial list; there are
 165      -# other directories that should be included and do not yet have the
 166      -# necessary Makefile support.  See 6414855.)
      165 +# at runtime (e.g., rpcgen), and in which "make clean" should run.
      166 +# Other directories should be included here, but do not yet have the
      167 +# necessary Makefile support (make clean).  See 6414855.
 167  168  #
 168      -DYNHDRDIRS = common/rpcsvc common/idmap common/sys
      169 +DYNHDRDIRS =    common/idmap \
      170 +                common/klm \
      171 +                common/rpcsvc \
      172 +                common/sys
 169  173  
 170  174  sparc_HDRDIRS= sun/sys
 171  175  i386_HDRDIRS= i86pc/vm i86xpv/vm
 172  176  
 173  177  HDRDIRS= $(COMMON_HDRDIRS) $($(MACH)_HDRDIRS)
 174  178  install_h check: $(HDRDIRS) $($(MACH)_ARCHITECTURES)
 175  179  
 176  180  $(HDRDIRS): FRC
 177  181          @cd $@; pwd; $(MAKE) $(TARGET)
 178  182  
 179  183  # ensures that headers made by rpcgen and others are available in uts source
 180  184  # for kernel builds to reference without building install_h
 181  185  #
 182  186  all_h: FRC
 183  187          @cd common/sys; pwd; $(MAKE) $@
 184  188          @cd common/rpc; pwd; $(MAKE) $@
 185  189          @cd common/rpcsvc; pwd; $(MAKE) $@
 186  190          @cd common/gssapi; pwd; $(MAKE) $@
 187  191          @cd common/idmap; pwd; $(MAKE) $@
      192 +        @cd common/klm; pwd; $(MAKE) $@
 188  193  
 189  194  clean clobber: $($(MACH)_ARCHITECTURES) $(DYNHDRDIRS)
 190  195          @if [ '$(PATCH_BUILD)' != '#' ] ; then \
 191  196                  echo $(RM) $(PMTMO_FILE) ; \
 192  197                  $(RM) $(PMTMO_FILE) ; \
 193  198          fi
 194  199  
 195  200  EXTRA_CLOBBER_TARGETS= common/avs/ns/rdc
 196  201  clobber: $(EXTRA_CLOBBER_TARGETS)
 197  202  
↓ open down ↓ 27 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX