Print this page
    
7945 simplify bootadm_digest.c
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
    
      
        | Split | 
	Close | 
      
      | Expand all | 
      | Collapse all | 
    
    
          --- old/usr/src/cmd/boot/bootadm/Makefile
          +++ new/usr/src/cmd/boot/bootadm/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 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  # Copyright 2016 Toomas Soome <tsoome@me.com>
  26   26  # Copyright 2016 Nexenta Systems, Inc.
  27   27  #
  28   28  
  29   29  PROG= bootadm
  30   30  
  31   31  SBINLINKS= $(PROG)
  32   32  
  33   33  OBJS= bootadm.o bootadm_upgrade.o bootadm_hyper.o bootadm_digest.o \
  34   34          bootadm_loader.o
  
    | 
      ↓ open down ↓ | 
    34 lines elided | 
    
      ↑ open up ↑ | 
  
  35   35  SRCS = $(OBJS:.o=.c)
  36   36  POFILES= $(OBJS:%.o=%.po)
  37   37  
  38   38  include ../Makefile.com
  39   39  
  40   40  POFILE= bootadm_cmd.po
  41   41  
  42   42  .KEEP_STATE:
  43   43  
  44   44  LDLIBS_i386= -lfdisk
  45      -LDLIBS += -lficl-sys -lpkcs11 -lcryptoutil -lnvpair -lgen -ladm -lefi
       45 +LDLIBS += -lficl-sys -lmd -lcryptoutil -lnvpair -lgen -ladm -lefi
  46   46  LDLIBS += -lz -lbe -lzfs $(LDLIBS_$(MACH))
  47   47  
  48   48  # Writing into string literals is incorrect.  We need to match gcc's
  49   49  # behavior, which causes us to take SIGSEGV on such a write.
  50   50  CFLAGS +=       $(XSTRCONST)
  51   51  CPPFLAGS +=     -D_FILE_OFFSET_BITS=64
  52   52  CPPFLAGS +=     -I$(SRC)/uts/common -I$(SRC)/common -I$(SRC)/common/ficl
  53   53  
  54   54  C99MODE=        $(C99_ENABLE)
  55   55  
  56   56  LINTFLAGS += -erroff=E_INCONS_ARG_DECL2
  57   57  LINTFLAGS += -erroff=E_INCONS_VAL_TYPE_DECL2
  58   58  LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
  59   59  
  60   60  all: $(PROG)
  61   61  
  62   62  $(PROG): $(OBJS) bootadm.h
  63   63          $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
  64   64          $(POST_PROCESS)
  65   65  
  66   66  install: all $(ROOTSBINPROG) .WAIT $(ROOTUSRSBINLINKS)
  67   67  
  68   68  $(POFILE): $(POFILES)
  69   69          $(RM) $@
  70   70          $(CAT) $(POFILES) > $@
  71   71  
  72   72  clean:
  73   73          -$(RM) $(OBJS) $(POFILE) $(POFILES)
  74   74  
  75   75  lint:   lint_SRCS
  76   76  
  77   77  include ../Makefile.targ
  
    | 
      ↓ open down ↓ | 
    22 lines elided | 
    
      ↑ open up ↑ | 
  
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX