Rich's feedback

          --- old/usr/src/test/util-tests/tests/demangle/Makefile
          +++ new/usr/src/test/util-tests/tests/demangle/Makefile

   1    1  #
   2    2  # This file and its contents are supplied under the terms of the

   3    3  # Common Development and Distribution License ("CDDL"), version 1.0.
   4    4  # You may only use this file in accordance with the terms of version
   5    5  # 1.0 of the CDDL.
   6    6  #
   7    7  # A full copy of the text of the CDDL should have accompanied this
   8    8  # source.  A copy of the CDDL is also available via the Internet at
   9    9  # http://www.illumos.org/license/CDDL.
  10   10  #
  11   11  
  12   12  #
  13      -# Copyright 2017 Jason King.
       13 +# Copyright 2018 Jason King.
  14   14  #
  15   15  
  16   16  include $(SRC)/Makefile.master
  17   17  include $(SRC)/cmd/Makefile.cmd
  18   18  include $(SRC)/test/Makefile.com
  19   19  
  20   20  ROOTBINDIR = $(ROOTOPTPKG)/bin
  21   21  
  22   22  PROG = gcc-libstdc++ llvm-stdcxxabi afl-fast
  23   23  
  24   24  ROOTOPTPKG = $(ROOT)/opt/util-tests
  25   25  TESTDIR = $(ROOTOPTPKG)/tests/demangle
  26   26  
  27   27  CMDS = $(PROG:%=$(TESTDIR)/%)
  28   28  $(CMDS) := FILEMODE = 0555
  29   29  
  30   30  OBJS = $(PROG:%=%.o)
  31   31  SRCS = $(OBJS:%.o=%.c)
  32   32  
  33      -C99MODE= $(C99_ENABLE)
       33 +CSTD = $(CSTD_GNU99)
  34   34  
  35      -LDLIBS += -lsysdemangle
       35 +LDLIBS += -ldemangle-sys
  36   36  
  37   37  all: $(PROG)
  38   38  
  39   39  gcc-libstdc++: gcc-libstdc++.o
  40   40          $(LINK.c) -o $@ gcc-libstdc++.o $(LDLIBS)
  41   41          $(POST_PROCESS)
  42   42  
  43   43  llvm-stdcxxabi: llvm-stdcxxabi.o
  44   44          $(LINK.c) -o $@ llvm-stdcxxabi.o $(LDLIBS)
  45   45          $(POST_PROCESS)

  46   46  
  47   47  afl-fast: afl-fast.o
  48   48          $(LINK.c) -o $@ afl-fast.o $(LDLIBS)
  49   49          $(POST_PROCESS)
  50   50  
  51   51  install: all $(CMDS)
  52   52  
  53   53  lint:
  54   54  
  55   55  clobber: clean
  56   56          -$(RM) $(PROG)
  57   57  
  58   58  clean:
  59   59          -$(RM) $(OBJS)
  60   60  
  61   61  $(CMDS): $(TESTDIR) $(PROG)
  62   62  
  63   63  $(ROOTBINDIR):
  64   64          $(INS.dir)
  65   65  
  66   66  $(ROOTBINDIR)/%: %
  67   67          $(INS.file)
  68   68  
  69   69  $(TESTDIR):
  70   70          $(INS.dir)
  71   71  
  72   72  $(TESTDIR)/%: %
  73   73          $(INS.file)

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX