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

          --- old/usr/src/cmd/hal/hald/Makefile
          +++ new/usr/src/cmd/hal/hald/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 2008 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  
  26   26  SUBDIRS =       solaris
  27   27  
  28   28  PROG =          hald
  29   29  OBJS =          hald_marshal.o device.o device_info.o device_store.o hald.o \
  30   30                  hald_dbus.o hald_runner.o ids.o logger.o property.o util.o \
  31   31                  util_helper.o util_pm.o
  32   32  OBJS_SOL =      devinfo.o devinfo_ieee1394.o devinfo_misc.o devinfo_pci.o devinfo_storage.o \
  33   33                  devinfo_usb.o hotplug.o osspec.o sysevent.o devinfo_acpi.o \
  34   34                  devinfo_cpu.o

  35   35  OBJS_ALL =      $(OBJS) $(OBJS_SOL:%=solaris/%)
  36   36  SRCS =          $(OBJS:%.o=%.c)
  37   37  
  38   38  include ../../Makefile.cmd
  39   39  include ../Makefile.hal
  40   40  
  41   41  ROOTCMDDIR =    $(ROOTLIB_HAL)
  42   42  
  43   43  LDLIBS +=       -lc -lm -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lgobject-2.0 \
  44   44                  -ldevinfo -lsysevent -lnvpair -lkstat -lcfgadm
       45 +ADJUNCT_LIBS =  libdbus-1.so libdbus-glib-1.so libglib-2.0.so libgobject-2.0.so
       46 +
  45   47  
  46   48  all install $(PROG) :=  LDLIBS += -lexpat
       49 +all install $(PROG) :=  ADJUNCT_LIBS += libexpat.so
  47   50  
  48   51  CPPFLAGS +=     $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS)
  49   52  CSTD =  $(CSTD_GNU99)
  50   53  
  51   54  CLOBBERFILES += hald_marshal.c hald_marshal.h
  52   55  
  53   56  all :=          TARGET= all
  54   57  install :=      TARGET= install
  55   58  clean :=        TARGET= clean
  56   59  clobber :=      TARGET= clobber

  57   60  $(PROG) :=      TARGET= all
  58   61  
  59   62  .KEEP_STATE:
  60   63  
  61   64  all: $(SUBDIRS) .WAIT $(PROG)
  62   65  
  63   66  hald_marshal.o: hald_marshal.h hald_marshal.c
  64   67  
  65   68  hald_marshal.h: hald_marshal.list
  66   69          glib-genmarshal --prefix=hald_marshal hald_marshal.list --header >> xgen-gmh \
  67   70          && (cmp -s xgen-gmh hald_marshal.h || cp xgen-gmh hald_marshal.h) \
  68   71          && rm -f xgen-gmh xgen-gmh~
  69   72  
  70   73  hald_marshal.c: hald_marshal.list
  71   74          glib-genmarshal --prefix=hald_marshal hald_marshal.list --body >> xgen-gmc \
  72   75          && (cmp -s xgen-gmc hald_marshal.c || cp xgen-gmc hald_marshal.c) \
  73   76          && rm -f xgen-gmc xgen-gmc~
  74   77  
  75   78  $(PROG): $(SUBDIRS) .WAIT $(OBJS_ALL)
  76   79          $(LINK.c) -o $@ $(OBJS_ALL) $(LDLIBS)
  77   80          $(POST_PROCESS)
  78   81  
  79   82  install: all $(ROOTCMD) $(SUBDIRS)
  80   83  
  81   84  clean: $(SUBDIRS)
  82   85          $(RM) $(OBJS) $(OBJS_SOL)
  83   86  
  84   87  $(SUBDIRS): FRC
  85   88          @cd $@; pwd; $(MAKE) $(TARGET)
  86   89  
  87   90  FRC:
  88   91  
  89   92  include ../../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX