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

@@ -24,10 +24,11 @@
 # Use is subject to license terms.
 #
 
 #
 # Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, Joyent, Inc. All rights reserved.
 #
 
 include $(SRC)/Makefile.master
 include ../Makefile.com
 

@@ -69,10 +70,22 @@
 
 pid/tst.gcc.exe: pid/tst.gcc.c
         $(GCC) -o pid/tst.gcc.exe pid/tst.gcc.c $(LDFLAGS)
         $(POST_PROCESS) ; $(STRIP_STABS)
 
+json/tst.usdt.o: json/usdt.h
+
+json/usdt.h: json/usdt.d
+        $(DTRACE) -h -s json/usdt.d -o json/usdt.h
+
+json/usdt.o: json/usdt.d json/tst.usdt.o
+        $(COMPILE.d) -o json/usdt.o -s json/usdt.d json/tst.usdt.o
+
+json/tst.usdt.exe: json/tst.usdt.o json/usdt.o
+        $(LINK.c) -o json/tst.usdt.exe json/tst.usdt.o json/usdt.o $(LDLIBS)
+        $(POST_PROCESS) ; $(STRIP_STABS)
+
 usdt/tst.args.exe: usdt/tst.args.o usdt/args.o
         $(LINK.c) -o usdt/tst.args.exe usdt/tst.args.o usdt/args.o $(LDLIBS)
         $(POST_PROCESS) ; $(STRIP_STABS)
 
 usdt/args.o: usdt/args.d usdt/tst.args.o