OS-1723 DTrace should speak JSON (review fixes)

          --- old/usr/src/uts/sparc/dtrace/Makefile
          +++ new/usr/src/uts/sparc/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  PLATFORM        = sun4u
  29   29  MODULE          = dtrace
  30   30  OBJECTS         = $(DTRACE_OBJS:%=$(OBJS_DIR)/%)
  31   31  LINTS           = $(DTRACE_OBJS:%.o=$(LINTS_DIR)/%.ln)
  32   32  ROOTMODULE      = $(ROOT_DRV_DIR)/$(MODULE)
  33   33  CONF_SRCDIR     = $(UTSBASE)/common/dtrace
  34   34  
  35   35  include $(UTSBASE)/sparc/Makefile.sparc
  36   36  
  37   37  #
  38   38  #       Redefine        DSF_DIR
  39   39  #
  40   40  DSF_DIR         = $(UTSBASE)/$(PLATFORM)/genassym
  41   41  
  42   42  CERRWARN        += -_gcc=-Wno-parentheses
  43   43  CERRWARN        += -_gcc=-Wno-type-limits
  44   44  CERRWARN        += -_gcc=-Wno-uninitialized

  45   45  
  46   46  ALL_TARGET      = $(BINARY) $(SRC_CONFILE)
  47   47  LINT_TARGET     = $(MODULE).lint
  48   48  INSTALL_TARGET  = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
  49   49  
  50   50  DTRACE_INC_32   = -I$(UTSBASE)/sparc/v7
  51   51  DTRACE_INC_64   = -I$(UTSBASE)/sparc/v9
  52   52  
  53   53  CFLAGS += $(CCVERBOSE)
  54   54  CPPFLAGS += $(DTRACE_INC_$(CLASS))
       55 +CPPFLAGS += -I$(SRC)/common/util
  55   56  
  56   57  DTRACE_XAS_32   = -xarch=v8plus
  57   58  DTRACE_XAS_64   = -xarch=v9
  58   59  
  59   60  AS_CPPFLAGS     += $(DTRACE_INC_64)
  60   61  ASFLAGS         += $(DTRACE_XAS_$(CLASS))
  61   62  AS_INC_PATH     += -I$(DSF_DIR)/$(OBJS_DIR)
  62   63  
  63   64  ASSYM_H         = $(DSF_DIR)/$(OBJS_DIR)/assym.h
  64   65  

  65   66  #
  66   67  # For now, disable these lint checks; maintainers should endeavor
  67   68  # to investigate and remove these for maximum lint coverage.
  68   69  # Please do not carry these forward to new Makefiles.
  69   70  #
  70   71  LINTTAGS        += -erroff=E_SUSPICIOUS_COMPARISON
  71   72  LINTTAGS        += -erroff=E_BAD_PTR_CAST_ALIGN
  72   73  LINTTAGS        += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
  73   74  LINTTAGS        += -erroff=E_STATIC_UNUSED
  74   75  LINTTAGS        += -erroff=E_PTRDIFF_OVERFLOW
  75   76  LINTTAGS        += -erroff=E_ASSIGN_NARROW_CONV
  76   77  
  77   78  .KEEP_STATE:
  78   79  
  79   80  def:            $(DEF_DEPS)
  80   81  
  81   82  all:            $(ALL_DEPS)
  82   83  
  83   84  clean:          $(CLEAN_DEPS)
  84   85  
  85   86  clobber:        $(CLOBBER_DEPS)
  86   87  
  87   88  lint:           $(LINT_DEPS)
  88   89  
  89   90  modlintlib:     $(MODLINTLIB_DEPS)
  90   91  
  91   92  clean.lint:     $(CLEAN_LINT_DEPS)
  92   93  
  93   94  install:        $(INSTALL_DEPS)
  94   95  
  95   96  $(BINARY):      $(ASSYM_H)
  96   97  
  97   98  include $(UTSBASE)/sparc/Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX