Print this page
OS-1723 DTrace should speak JSON
Reviewed by: Bryan Cantrill <bmc@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/dtrace/test/tst/common/Makefile
          +++ new/usr/src/cmd/dtrace/test/tst/common/Makefile
↓ open down ↓ 18 lines elided ↑ open up ↑
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26   26  
  27   27  #
  28   28  # Copyright (c) 2012 by Delphix. All rights reserved.
       29 +# Copyright (c) 2012, Joyent, Inc. All rights reserved.
  29   30  #
  30   31  
  31   32  include $(SRC)/Makefile.master
  32   33  include ../Makefile.com
  33   34  
  34   35  SNOOPDIR = $(SRC)/cmd/cmd-inet/usr.sbin/snoop
  35   36  SNOOPOBJS = nfs4_xdr.o
  36   37  SNOOPSRCS = ${SNOOPOBJS:%.o=%.c}
  37   38  CLOBBERFILES += nfs/$(SNOOPOBJS)
  38   39  
↓ open down ↓ 25 lines elided ↑ open up ↑
  64   65          $(POST_PROCESS_O)
  65   66  nfs/tst.call3.exe: nfs/tst.call3.o nfs/$(RPCSVCOBJS)
  66   67          $(LINK.c) -o $@ nfs/tst.call3.o nfs/$(RPCSVCOBJS) \
  67   68          $(LDLIBS) -lnsl -lrpcsvc
  68   69          $(POST_PROCESS) ; $(STRIP_STABS)
  69   70  
  70   71  pid/tst.gcc.exe: pid/tst.gcc.c
  71   72          $(GCC) -o pid/tst.gcc.exe pid/tst.gcc.c $(LDFLAGS)
  72   73          $(POST_PROCESS) ; $(STRIP_STABS)
  73   74  
       75 +json/tst.usdt.o: json/usdt.h
       76 +
       77 +json/usdt.h: json/usdt.d
       78 +        $(DTRACE) -h -s json/usdt.d -o json/usdt.h
       79 +
       80 +json/usdt.o: json/usdt.d json/tst.usdt.o
       81 +        $(COMPILE.d) -o json/usdt.o -s json/usdt.d json/tst.usdt.o
       82 +
       83 +json/tst.usdt.exe: json/tst.usdt.o json/usdt.o
       84 +        $(LINK.c) -o json/tst.usdt.exe json/tst.usdt.o json/usdt.o $(LDLIBS)
       85 +        $(POST_PROCESS) ; $(STRIP_STABS)
       86 +
  74   87  usdt/tst.args.exe: usdt/tst.args.o usdt/args.o
  75   88          $(LINK.c) -o usdt/tst.args.exe usdt/tst.args.o usdt/args.o $(LDLIBS)
  76   89          $(POST_PROCESS) ; $(STRIP_STABS)
  77   90  
  78   91  usdt/args.o: usdt/args.d usdt/tst.args.o
  79   92          $(COMPILE.d) -o usdt/args.o -s usdt/args.d usdt/tst.args.o
  80   93  
  81   94  usdt/tst.argmap.exe: usdt/tst.argmap.o usdt/argmap.o
  82   95          $(LINK.c) -o usdt/tst.argmap.exe \
  83   96              usdt/tst.argmap.o usdt/argmap.o $(LDLIBS)
↓ open down ↓ 42 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX