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

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libnvpair/Makefile.com
          +++ new/usr/src/lib/libnvpair/Makefile.com
↓ open down ↓ 15 lines elided ↑ open up ↑
  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  
↓ open down ↓ 27 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX