--- 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
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  
       21 +
  21   22  #
       23 +
       24 +#
  22   25  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  23   26  # Copyright 2014 Nexenta Systems, Inc. All rights reserved.
  24   27  # Copyright (c) 2011, Joyent, Inc. All rights reserved.
  25   28  #
  26   29  
  27   30  PROG= zoneadmd
  28   31  
  29   32  include ../Makefile.cmd
  30      -include ../Makefile.ctf
  31   33  
  32      -$(64ONLY)SUBDIRS= $(MACH)
  33      -$(BUILD64)SUBDIRS += $(MACH64)
       34 +ROOTCMDDIR=     $(ROOTLIB)/zones
  34   35  
  35      -all     :=      TARGET = all
  36      -install :=      TARGET = install
  37      -clean   :=      TARGET = clean
  38      -clobber :=      TARGET = clobber
  39      -lint    :=      TARGET = lint
       36 +OBJS= zoneadmd.o zcons.o vplat.o mcap.o zfd.o
       37 +SRCS = $(OBJS:.o=.c)
       38 +POFILE=zoneadmd_all.po
       39 +POFILES= $(OBJS:%.o=%.po)
  40   40  
       41 +CFLAGS += $(CCVERBOSE)
       42 +CERRWARN += -_gcc=-Wno-switch
       43 +CERRWARN += -_gcc=-Wno-parentheses
       44 +CERRWARN += -_gcc=-Wno-uninitialized
       45 +
       46 +LDLIBS += -lsocket -lzonecfg -lnsl -ldevinfo -ldevice -lnvpair \
       47 +        -lgen -lbsm -lcontract -lzfs -luuid -lbrand -ldladm -ltsnet -ltsol \
       48 +        -linetutil -lscf -lproc
  41   49  XGETFLAGS += -a -x zoneadmd.xcl
  42   50  
  43      -ROOTUSRLIBZONES                 = $(ROOT)/usr/lib/zones
  44      -
  45   51  .KEEP_STATE:
  46   52  
  47   53  .PARALLEL:
  48   54  
  49      -all: $(SUBDIRS)
       55 +all: $(PROG)
  50   56  
  51   57  $(PROG): $(OBJS)
  52   58          $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
  53   59          $(POST_PROCESS)
  54   60  
  55      -install: $(SUBDIRS)
  56      -        -$(RM) $(ROOTUSRLIBZONES)/$(PROG)
  57      -        -$(LN) $(ISAEXEC) $(ROOTUSRLIBZONES)/$(PROG)
       61 +install: all $(ROOTCMD)
  58   62  
  59      -$(POFILE):
       63 +$(POFILE): $(POFILES)
       64 +        $(RM) $@
       65 +        $(CAT) $(POFILES) > $@
  60   66  
  61      -clean clobebr lint:     $(SUBDIRS)
       67 +clean:
       68 +        $(RM) $(OBJS)
  62   69  
       70 +lint:   lint_SRCS
       71 +
  63   72  check:
  64      -        $(CSTYLE) -p -P *.c
       73 +        $(CSTYLE) -p -P $(SRCS:%=%)
  65   74  
  66      -$(SUBDIRS):     FRC
  67      -        @cd $@; pwd; $(MAKE) $(TARGET)
  68      -
  69      -FRC:
  70      -
  71   75  include ../Makefile.targ
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX