OS-1840 fmdump shall emit JSON (copyright fixes)
OS-1840 fmdump shall emit JSON (nvlist_print_json)

          --- old/usr/src/lib/libnvpair/Makefile.com
          +++ new/usr/src/lib/libnvpair/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 2008 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  # Copyright (c) 2012 by Delphix. All rights reserved.
       26 +# Copyright (c) 2013, Joyent, Inc. All rights reserved.
  26   27  #
  27   28  
  28   29  LIBRARY=        libnvpair.a
  29   30  VERS=           .1
  30   31  
  31   32  OBJECTS=        libnvpair.o \
  32   33                  nvpair_alloc_system.o \
  33   34                  nvpair_alloc_fixed.o \
  34   35                  nvpair.o \
  35      -                fnvpair.o
       36 +                fnvpair.o \
       37 +                nvpair_json.o
  36   38  
  37   39  include ../../Makefile.lib
  38   40  include ../../Makefile.rootfs
  39   41  
  40   42  SRCS=           ../libnvpair.c \
  41   43                  ../nvpair_alloc_system.c \
       44 +                ../nvpair_json.c \
  42   45                  $(SRC)/common/nvpair/nvpair_alloc_fixed.c \
  43   46                  $(SRC)/common/nvpair/nvpair.c \
  44   47                  $(SRC)/common/nvpair/fnvpair.c
  45   48  
  46   49  #
  47   50  # Libraries added to the next line must be present in miniroot
  48   51  #
  49   52  LDLIBS +=       -lc -lnsl
  50   53  LIBS =          $(DYNLIB) $(LINTLIB)
  51   54  

  52   55  # turn off ptr-cast warnings
  53   56  LINTFLAGS64 +=  -erroff=E_BAD_PTR_CAST_ALIGN
  54   57  
  55   58  # turn off warning caused by lint bug: not understanding SCNi8 "hhi"
  56   59  LINTFLAGS +=    -erroff=E_BAD_FORMAT_STR2
  57   60  LINTFLAGS64 +=  -erroff=E_BAD_FORMAT_STR2
  58   61  
  59   62  CERRWARN +=     -_gcc=-Wno-type-limits
  60   63  CERRWARN +=     -_gcc=-Wno-parentheses
  61   64  CERRWARN +=     -_gcc=-Wno-uninitialized
  62   65  
  63   66  CFLAGS +=       $(CCVERBOSE)
  64   67  CPPFLAGS +=     -D_REENTRANT
  65   68  
  66   69  $(LINTLIB) :=   SRCS = $(SRCDIR)/$(LINTSRC)
  67   70  
  68   71  .KEEP_STATE:
  69   72  
  70   73  all: $(LIBS)
  71   74  
  72   75  lint: lintcheck
  73   76  
  74   77  include ../../Makefile.targ
  75   78  
  76   79  pics/%.o: $(SRC)/common/nvpair/%.c
  77   80          $(COMPILE.c) -o $@ $<
  78   81          $(POST_PROCESS_O)

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX