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/cmd/fs.d/nfs/Makefile
          +++ new/usr/src/cmd/fs.d/nfs/Makefile
↓ open down ↓ 26 lines elided ↑ open up ↑
  27   27  #
  28   28  #  cmd/fs.d/nfs is the directory of all nfs specific commands
  29   29  #  whose executable reside in $(INSDIR1) and $(INSDIR2).
  30   30  #
  31   31  
  32   32  include $(SRC)/Makefile.master
  33   33  
  34   34  SUBDIR1=        exportfs nfsd rquotad \
  35   35                  statd nfsstat mountd dfshares \
  36   36                  nfsfind nfs4cbd share
  37      -SUBDIR2=        clear_locks umount showmount \
       37 +
       38 +# These do "make catalog"
       39 +SUBDIR2=        clear_locks lockd umount showmount \
  38   40                  mount dfmounts nfslog nfsmapid \
  39   41                  nfsref rp_basic
  40   42  
  41   43  SUBDIR3=        etc svc
  42   44  SUBDIRS=        $(SUBDIR1) $(SUBDIR2) $(SUBDIR3)
  43   45  
  44   46  # for messaging catalog files
  45   47  #
  46   48  POFILES=        $(SUBDIR2:%=%/%.po)
  47   49  POFILE=         nfs.po
  48   50  
  49      -LOCKD=          $(CLOSED)/cmd/fs.d/nfs/lockd
  50      -$(CLOSED_BUILD)CLOSED_SUBDIR2=  $(LOCKD)
  51      -$(CLOSED_BUILD)POFILES +=       $(LOCKD)/lockd.po
  52      -$(CLOSED_BUILD)SUBDIRS +=       $(CLOSED_SUBDIR2)
  53      -
  54   51  all:=           TARGET= all
  55   52  install:=       TARGET= install
  56   53  clean:=         TARGET= clean
  57   54  clobber:=       TARGET= clobber
  58   55  lint:=          TARGET= lint
  59   56  catalog:=       TARGET= catalog
  60   57  
  61   58  .KEEP_STATE:
  62   59  
  63   60  .PARALLEL:      $(SUBDIRS)
  64   61  
  65   62  all install clean clobber lint: $(SUBDIRS)
  66   63  
  67      -catalog: $(SUBDIR2) $(CLOSED_SUBDIR2)
       64 +catalog: $(SUBDIR2)
  68   65          $(RM) $(POFILE)
  69   66          cat $(POFILES) > $(POFILE)
  70   67  
  71   68  $(SUBDIRS): FRC
  72   69          @cd $@; pwd; $(MAKE) $(TARGET)
  73   70  
  74   71  FRC:
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX