Print this page
    
Add zfd.c to zoneadmd's Makefile, a bit more not-yet ifdef-out.
OS-11 rcapd behaves poorly when under extreme load
    
      
        | Split | 
	Close | 
      
      | Expand all | 
      | Collapse all | 
    
    
          --- old/usr/src/cmd/zoneadmd/Makefile
          +++ new/usr/src/cmd/zoneadmd/Makefile
   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  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
  
    | 
      ↓ open down ↓ | 
    16 lines elided | 
    
      ↑ open up ↑ | 
  
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  
  21   21  
  22   22  #
  23   23  
  24   24  #
  25   25  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  26   26  # Copyright 2014 Nexenta Systems, Inc. All rights reserved.
       27 +# Copyright (c) 2011, Joyent, Inc. All rights reserved.
  27   28  #
  28   29  
  29   30  PROG= zoneadmd
  30   31  
  31   32  include ../Makefile.cmd
  32   33  
  33   34  ROOTCMDDIR=     $(ROOTLIB)/zones
  34   35  
  35      -OBJS= zoneadmd.o zcons.o vplat.o
       36 +OBJS= zoneadmd.o zcons.o vplat.o mcap.o zfd.o
  36   37  SRCS = $(OBJS:.o=.c)
  37   38  POFILE=zoneadmd_all.po
  38   39  POFILES= $(OBJS:%.o=%.po)
  39   40  
  40   41  CFLAGS += $(CCVERBOSE)
  41   42  CERRWARN += -_gcc=-Wno-switch
  42   43  CERRWARN += -_gcc=-Wno-parentheses
  43   44  CERRWARN += -_gcc=-Wno-uninitialized
  44   45  
  45   46  LDLIBS += -lsocket -lzonecfg -lnsl -ldevinfo -ldevice -lnvpair \
  46   47          -lgen -lbsm -lcontract -lzfs -luuid -lbrand -ldladm -ltsnet -ltsol \
  47      -        -linetutil -lscf
       48 +        -linetutil -lscf -lproc
  48   49  XGETFLAGS += -a -x zoneadmd.xcl
  49   50  
  50   51  .KEEP_STATE:
  51   52  
  52   53  .PARALLEL:
  53   54  
  54   55  all: $(PROG)
  55   56  
  56   57  $(PROG): $(OBJS)
  57   58          $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
  58   59          $(POST_PROCESS)
  59   60  
  60   61  install: all $(ROOTCMD)
  61   62  
  62   63  $(POFILE): $(POFILES)
  63   64          $(RM) $@
  64   65          $(CAT) $(POFILES) > $@
  65   66  
  66   67  clean:
  67   68          $(RM) $(OBJS)
  68   69  
  69   70  lint:   lint_SRCS
  70   71  
  71   72  check:
  72   73          $(CSTYLE) -p -P $(SRCS:%=%)
  73   74  
  74   75  include ../Makefile.targ
  
    | 
      ↓ open down ↓ | 
    17 lines elided | 
    
      ↑ open up ↑ | 
  
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX