9128 cw(1onbld) should be able to run multiple shadows
9129 file-locking tests shouldn't build multiple source files in one compiler invocation
9130 DTrace tst.gcc.d isn't useful
9132 cw(1onbld) shouldn't shadow pure preprocessing
Reviewed by: Andy Fiddaman <omnios@citrus-it.net>

          --- old/usr/src/test/os-tests/tests/file-locking/Makefile
          +++ new/usr/src/test/os-tests/tests/file-locking/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   13  # Copyright 2016 Joyent, Inc.
  14   14  #
  15   15  
  16   16  include $(SRC)/cmd/Makefile.cmd
  17   17  include $(SRC)/test/Makefile.com
  18   18  
  19      -UTILS = util.c
       19 +OBJECTS=util.o runtests.32.o runtests.64.o acquire-lock.32.o acquire-lock.64.o
  20   20  
  21   21  PROGS = \
  22   22          runtests \
  23   23          acquire-lock
  24   24  
  25   25  CSTD = $(CSTD_GNU99)
  26   26  
  27      -SRCS = $(PROGS:%=%.c) $(UTILS)
       27 +SRCS = $(PROGS:%=%.c) $(UTILS:%.o=%.c)
  28   28  PROGS32 = $(PROGS:%=%.32)
  29   29  PROGS64 = $(PROGS:%=%.64)
  30   30  
  31   31  LINTS = $(PROGS:%=%.ln)
  32   32  LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
  33   33  LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
  34   34  
  35   35  ROOTOPTDIR = $(ROOT)/opt/os-tests/tests/file-locking
  36   36  ROOTOPTPROGS = $(PROGS32:%=$(ROOTOPTDIR)/%) \
  37   37          $(PROGS64:%=$(ROOTOPTDIR)/%)

  38   38  
  39   39  .KEEP_STATE:
  40   40  
  41   41  install: $(ROOTOPTPROGS)
  42   42  
  43   43  all: $(PROGS32) $(PROGS64)
  44   44  
  45   45  lint: $(LINTS)
  46   46  
  47   47  clean:
  48   48          -rm $(PROGS32) $(PROGS64)
  49   49  
  50   50  $(ROOTOPTPROGS): $(PROGS32) $(PROGS64) $(ROOTOPTDIR)
  51   51  
  52   52  $(ROOTOPTDIR):
  53   53          $(INS.dir)

  54   54  
  55   55  $(ROOTOPTDIR)/%: %
  56   56          $(INS.file)
  57   57  
  58   58  $(ROOTOPTDIR)/%: %.ksh
  59   59          $(INS.rename)
  60   60  
  61   61  %.ln: %.c
  62   62          $(LINT.c) $< $(UTILS) $(LDLIBS)
  63   63  
  64      -%.64: %.c
  65      -        $(LINK64.c) -o $@ $< $(UTILS) $(LDLIBS64)
       64 +%.64.o: %.c
       65 +        $(COMPILE64.c) $< -o $@
       66 +
       67 +%.32.o: %.c
       68 +        $(COMPILE.c) $< -o $@
       69 +
       70 +%.64: %.64.o util.64.o
       71 +        $(LINK64.c) -o $@ $< util.64.o $(LDLIBS64)
  66   72          $(POST_PROCESS)
  67   73  
  68      -%.32: %.c
  69      -        $(LINK.c) -o $@ $< $(UTILS) $(LDLIBS)
       74 +%.32: %.32.o util.32.o
       75 +        $(LINK.c) -o $@ $< util.32.o $(LDLIBS)
  70   76          $(POST_PROCESS)
  71   77  
  72   78  clobber:
  73   79          $(RM) $(PROGS32) $(PROGS64)
  74   80  
  75   81  FRC:
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX