OS-4361 libzonecfg should be aware of branded zone native root
Reviewed by: Robert Mustacchi <rm@joyent.com>

          --- old/usr/src/lib/libzonecfg/Makefile.com
          +++ new/usr/src/lib/libzonecfg/Makefile.com

   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   22  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       23 +# Copyright 2015 Joyent, Inc.
  23   24  #
  24   25  
  25   26  LIBRARY=        libzonecfg.a
  26   27  VERS=           .1
  27      -OBJECTS=        libzonecfg.o getzoneent.o scratchops.o
       28 +LIB_OBJS=       libzonecfg.o getzoneent.o scratchops.o
       29 +XML_OBJS=       os_dtd.o
       30 +OBJECTS=        $(LIB_OBJS) $(XML_OBJS)
  28   31  
  29   32  include ../../Makefile.lib
  30   33  
  31   34  LIBS =          $(DYNLIB) $(LINTLIB)
  32   35  LDLIBS +=       -lc -lsocket -lnsl -luuid -lnvpair -lsysevent -lsec -lbrand \
  33   36                  -lpool -lscf -lproc -luutil -lbsm -lsecdb
  34   37  # DYNLIB libraries do not have lint libs and are not linted
  35   38  $(DYNLIB) :=    LDLIBS += -lxml2
  36   39  
  37   40  SRCDIR =        ../common
       41 +
       42 +XMLDIR =        $(SRC)/lib/xml
       43 +SRCS = \
       44 +                $(LIB_OBJS:%.o=$(SRCDIR)/%.c) \
       45 +                $(XML_OBJS:%.o=$(XMLDIR)/%.c) \
       46 +
  38   47  CPPFLAGS +=     -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
  39   48  CERRWARN +=     -_gcc=-Wno-uninitialized
  40   49  CERRWARN +=     -_gcc=-Wno-parentheses
  41   50  $(LINTLIB) := SRCS=     $(SRCDIR)/$(LINTSRC)
  42   51  
       52 +CPPFLAGS +=     -I$(XMLDIR)
       53 +
  43   54  .KEEP_STATE:
  44   55  
  45   56  all:    $(LIBS)
  46   57  
  47   58  lint:   lintcheck
  48   59  
       60 +pics/%.o: $(XMLDIR)/%.c
       61 +        $(COMPILE.c) -o $@ $<
       62 +        $(POST_PROCESS_O)
       63 +
  49   64  include ../../Makefile.targ
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX