Print this page
9852 enable ld(1) guidance and deflib assertions for the illumos build

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/hal/tools/Makefile
          +++ new/usr/src/cmd/hal/tools/Makefile
↓ open down ↓ 15 lines elided ↑ open up ↑
  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      -SUBDIR =        sunos   
       26 +SUBDIR =        sunos
  27   27  
  28   28  HAL_PROG =      hal-device hal-find-by-capability hal-find-by-property \
  29   29                  hal-get-property hal-set-property lshal
  30   30  
  31   31  HAL_LIB =       hal-is-caller-privileged
  32   32  
  33   33  SCRIPT_BIN =    hal-fdi-validate
  34   34  
  35   35  SCRIPT_LIB =    hal-system-lcd-set-brightness  hal-system-lcd-get-brightness \
  36   36                  hal-system-power-hibernate hal-system-power-suspend \
↓ open down ↓ 16 lines elided ↑ open up ↑
  53   53  
  54   54  SRCS =          $(PROGSRCS) $(STORAGE_SHAREDSRCS)
  55   55  
  56   56  CLOBBERFILES += $(HAL_PROG) $(STORAGE_PROG) $(SCRIPT_BIN) $(SCRIPT_LIB) $(HAL_LIB)
  57   57  CLEANFILES += $(STORAGE_SHAREDOBJS) $(STORAGE_OBJS) hal-storage-zpool.o
  58   58  
  59   59  include ../../Makefile.cmd
  60   60  include ../Makefile.hal
  61   61  
  62   62  $(HAL_PROG) :=          LDLIBS += -lc -ldbus-1 -lhal
       63 +$(HAL_PROG) :=          ADJUNCT_LIBS = libdbus-1.so
  63   64  
  64   65  lshal :=                LDLIBS += -ldbus-glib-1 -lglib-2.0
       66 +lshal :=                ADJUNCT_LIBS = libdbus-glib-1.so libdbus-1.so libglib-2.0.so
  65   67  
  66   68  $(HAL_LIB) :=   LDLIBS += -lc -ldbus-1 -lpolkit $(ZIGNORE) -lglib-2.0
       69 +$(HAL_LIB) :=   ADJUNCT_LIBS = libdbus-1.so libglib-2.0.so
  67   70  
  68   71  $(STORAGE_PROG) :=      LDLIBS += -lc -ldbus-1 -lglib-2.0 -lhal -lhal-storage -lbsm
       72 +$(STORAGE_PROG) :=      ADJUNCT_LIBS = libdbus-1.so libglib-2.0.so
  69   73  
  70   74  $(STORAGE_METHOD_PROG) := LDLIBS += -lpolkit
  71   75  
  72   76  CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS)
  73   77  CPPFLAGS += -I$(ROOT)/usr/include/hal
  74   78  CPPFLAGS += -I$(ROOT)/usr/include/libpolkit
  75   79  CSTD = $(CSTD_GNU99)
  76   80  
  77   81  ROOTUSRSBINPROG =       $(HAL_PROG:%=$(ROOTUSRSBIN)/%) \
  78   82                          $(SCRIPT_BIN:%=$(ROOTUSRSBIN)/%)
↓ open down ↓ 92 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX