Print this page
3748 zfs headers should be C++ compatible
Submitted by:   Justin Gibbs <justing@spectralogic.com>
Submitted by:   Will Andrews <willa@spectralogic.com>
Reviewed by:    Matthew Ahrens <mahrens@delphix.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/ztest/Makefile.com
          +++ new/usr/src/cmd/ztest/Makefile.com
↓ open down ↓ 16 lines elided ↑ open up ↑
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23  # Copyright (c) 2012 by Delphix. All rights reserved.
  24   24  #
  25   25  
  26   26  PROG= ztest
  27      -OBJS= $(PROG).o
  28      -SRCS= $(OBJS:%.o=../%.c)
       27 +OBJS= $(PROG).o ztest_util.o
       28 +SRCS= $(OBJS:%.o=../%.c) ztest_util.cpp
  29   29  
  30   30  include ../../Makefile.cmd
  31   31  include ../../Makefile.ctf
  32   32  
  33   33  INCS += -I../../../lib/libzpool/common
  34   34  INCS += -I../../../uts/common/fs/zfs
  35   35  INCS += -I../../../common/zfs
  36   36  
  37   37  LDLIBS += -lumem -lzpool -lcmdutils -lm -lnvpair
  38   38  
↓ open down ↓ 16 lines elided ↑ open up ↑
  55   55  $(PROG): $(OBJS)
  56   56          $(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS)
  57   57          $(POST_PROCESS)
  58   58  
  59   59  clean:
  60   60  
  61   61  lint:   lint_SRCS
  62   62  
  63   63  include ../../Makefile.targ
  64   64  
       65 +%.o: ../%.cpp
       66 +        $(COMPILE.cc) $<
       67 +        $(POST_PROCESS_O)
       68 +
  65   69  %.o: ../%.c
  66   70          $(COMPILE.c) $<
  67   71          $(POST_PROCESS_O)
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX