OS-1723 DTrace should speak JSON (review fixes)

          --- old/usr/src/uts/intel/dtrace/Makefile
          +++ new/usr/src/uts/intel/dtrace/Makefile

   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  
  26   26  UTSBASE = ../..
  27   27  
  28   28  MODULE          = dtrace
  29   29  OBJECTS         = $(DTRACE_OBJS:%=$(OBJS_DIR)/%)
  30   30  LINTS           = $(DTRACE_OBJS:%.o=$(LINTS_DIR)/%.ln)
  31   31  ROOTMODULE      = $(ROOT_DRV_DIR)/$(MODULE)
  32   32  CONF_SRCDIR     = $(UTSBASE)/common/dtrace
  33   33  
  34   34  include $(UTSBASE)/intel/Makefile.intel
  35   35  
  36   36  #
  37   37  # For now, disable these lint checks; maintainers should endeavor
  38   38  # to investigate and remove these for maximum lint coverage.
  39   39  # Please do not carry these forward to new Makefiles.
  40   40  #
  41   41  LINTTAGS        += -erroff=E_SUSPICIOUS_COMPARISON

  42   42  LINTTAGS        += -erroff=E_BAD_PTR_CAST_ALIGN
  43   43  LINTTAGS        += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
  44   44  LINTTAGS        += -erroff=E_STATIC_UNUSED
  45   45  LINTTAGS        += -erroff=E_PTRDIFF_OVERFLOW
  46   46  LINTTAGS        += -erroff=E_ASSIGN_NARROW_CONV
  47   47  
  48   48  CERRWARN        += -_gcc=-Wno-parentheses
  49   49  CERRWARN        += -_gcc=-Wno-type-limits
  50   50  CERRWARN        += -_gcc=-Wno-uninitialized
  51   51  
       52 +CPPFLAGS        += -I$(SRC)/common/util
       53 +
  52   54  ALL_TARGET      = $(BINARY) $(SRC_CONFILE)
  53   55  LINT_TARGET     = $(MODULE).lint
  54   56  INSTALL_TARGET  = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
  55   57  AS_INC_PATH     += -I$(DSF_DIR)/$(OBJS_DIR)
  56   58  
  57   59  ASSYM_H         = $(DSF_DIR)/$(OBJS_DIR)/assym.h
  58   60  
  59   61  .KEEP_STATE:
  60   62  
  61   63  def:            $(DEF_DEPS)

  62   64  
  63   65  all:            $(ALL_DEPS)
  64   66  
  65   67  clean:          $(CLEAN_DEPS)
  66   68  
  67   69  clobber:        $(CLOBBER_DEPS)
  68   70  
  69   71  lint:           $(LINT_DEPS)
  70   72  
  71   73  modlintlib:     $(MODLINTLIB_DEPS)
  72   74  
  73   75  clean.lint:     $(CLEAN_LINT_DEPS)
  74   76  
  75   77  install:        $(INSTALL_DEPS)
  76   78  
  77   79  $(BINARY):      $(ASSYM_H)
  78   80  
  79   81  include $(UTSBASE)/intel/Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX