Print this page
293 useradd/del/mod should be ZFS-aware

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/oamuser/user/Makefile
          +++ new/usr/src/cmd/oamuser/user/Makefile
↓ open down ↓ 42 lines elided ↑ open up ↑
  43   43  #
  44   44  #       Removing sysadm: deleted $(SYSADMPROG) from this target.
  45   45  #
  46   46  PROG=           $(SBINPROG)
  47   47  PRODUCT=        $(PROG)
  48   48  
  49   49  ADD_OBJ=        useradd.o     homedir.o        groups.o     call_pass.o \
  50   50                  userdefs.o    messages.o       val_lgrp.o   funcs.o \
  51   51                  val_lprj.o    proj.o
  52   52  
  53      -DEL_OBJ=        userdel.o     call_pass.o      rmfiles.o    isbusy.o \
       53 +DEL_OBJ=        userdel.o     call_pass.o      homedir.o    isbusy.o \
  54   54                  groups.o      messages.o       funcs.o      proj.o
  55   55  
  56      -MOD_OBJ=        usermod.o     movedir.o        groups.o     rmfiles.o \
  57      -                call_pass.o   isbusy.o         homedir.o    userdefs.o \
       56 +MOD_OBJ=        usermod.o     movedir.o        groups.o     homedir.o \
       57 +                call_pass.o   isbusy.o         userdefs.o \
  58   58                  messages.o    val_lgrp.o       funcs.o      val_lprj.o \
  59   59                  proj.o
  60   60  
  61   61  OBJECTS=        $(ADD_OBJ)     $(DEL_OBJ)    $(MOD_OBJ)
  62   62  
  63   63  SRCS=           $(OBJECTS:.o=.c)
  64   64  
  65   65  LIBDIR=         ../lib
  66   66  LIBUSRGRP=      $(LIBDIR)/lib.a
  67   67  LIBADM=         -ladm
↓ open down ↓ 15 lines elided ↑ open up ↑
  83   83  $(USERADD) :=   OBJS = $(ADD_OBJ)
  84   84  $(USERADD) :=   LIBS = $(LIBUSRGRP)
  85   85  $(USERADD) :=   LDLIBS += -lcmdutils
  86   86  
  87   87  $(USERDEL) :=   OBJS = $(DEL_OBJ)
  88   88  $(USERDEL) :=   LIBS = $(LIBUSRGRP)
  89   89  
  90   90  $(USERMOD) :=   OBJS = $(MOD_OBJ)
  91   91  $(USERMOD) :=   LIBS = $(LIBUSRGRP)
  92   92  
  93      -LDLIBS +=       -lbsm -lnsl -lsecdb -lproject -ltsol
       93 +LDLIBS +=       -lbsm -lnsl -lsecdb -lproject -lzfs -ltsol
  94   94  
  95   95  .PARALLEL: $(OBJECTS)
  96   96  
  97   97  all:            $(PRODUCT)
  98   98  
  99   99  $(PROG):        $$(OBJS) $$(LIBS)
 100  100          $(LINK.c) $(OBJS) -o $@ $(LIBS) $(LDLIBS)
 101  101          $(POST_PROCESS)
 102  102  
 103  103  $(USERADD):     $(ADD_OBJ)
↓ open down ↓ 18 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX