7491 usr/src/lib/libfru is a mess
Reviewed by: Robert Mustacchi <rm@joyent.com>

*** 72,81 ****
--- 72,82 ----
          c_synonyms      \
          cfgadm_plugins  \
          crypt_modules   \
          extendedFILE    \
          fm              \
+         fru             \
          getloginx       \
          gss_mechs/mech_dh       \
          gss_mechs/mech_dummy    \
          gss_mechs/mech_krb5     \
          gss_mechs/mech_spnego   \
*** 125,136 ****
          libexacct       \
          libexacct/demo  \
          libfakekernel   \
          libfcoe         \
          libficl         \
-         libfru          \
-         libfruutils     \
          libfsmgt        \
          libfstyp        \
          libgen          \
          libgrubmgmt     \
          libgss          \
--- 126,135 ----
*** 366,375 ****
--- 365,375 ----
  
  HDRSUBDIRS=                             \
          ../cmd/sendmail/libmilter       \
          auditd_plugins  \
          fm              \
+         fru             \
          hal             \
          hbaapi          \
          libads          \
          libast          \
          libbrand        \
*** 399,409 ****
          libdtrace_jni   \
          libelfsign      \
          libeti          \
          libfakekernel   \
          libfcoe         \
-         libfru          \
          libfstyp        \
          libgen          \
          libgrubmgmt     \
          libidmap        \
          libilb          \
--- 399,408 ----
*** 577,586 ****
--- 576,586 ----
  brand:          libzonecfg libmapmalloc
  cfgadm_plugins: libdevice libdevinfo libhotplug librcm hbaapi libkstat libscf
  fm:             libexacct libipmi libzfs scsi libdevinfo libdevid libcfgadm \
                  libcontract libsysevent ../cmd/sgs/libelf libdladm
  $(SPARC_BLD)fm: libpri
+ $(SPARC_BLD)fru: libpicl
  gss_mechs/mech_dh: libgss
  gss_mechs/mech_dummy: libgss
  gss_mechs/mech_krb5: libgss libresolv2 pkcs11 libkstat
  gss_mechs/mech_spnego: gss_mechs/mech_krb5
  hal:            dbusdeps
*** 613,623 ****
  libeti:         libcurses
  libexacct/demo: libexacct libproject
  libfakekernel:  libumem libcryptoutil
  libfcoe:        libdladm
  libficl:        libuuid libumem
- libfru:         libfruutils
  libfsmgt:       libkstat
  libgrubmgmt:    libdevinfo libzfs libfstyp libefi
  $(INTEL_BLD)libgrubmgmt: libfdisk
  libidmap:       libavl libuutil
  libinetsvc:     libscf
--- 613,622 ----
*** 695,705 ****
  pysolaris:      libsec libidmap
  pyzfs:          libzfs
  raidcfg_plugins: libraidcfg librcm libcfgadm libpicl libpicltree
  rpcsec_gss:     libgss
  sasl_plugins:   pkcs11 libgss libsasl
! scsi:           libfru libumem libdevid libdevinfo
  smbsrv:         libxnet libpthread librt libshare libidmap pkcs11 libsqlite \
                  libcryptoutil libreparse libcmdutils libresolv2 libsmbfs \
                  libuuid libfakekernel libads libgss libldap5 krb5
  storage:        libdevice libdevinfo libdevid
  sun_fc:         libdevinfo libsysevent
--- 694,704 ----
  pysolaris:      libsec libidmap
  pyzfs:          libzfs
  raidcfg_plugins: libraidcfg librcm libcfgadm libpicl libpicltree
  rpcsec_gss:     libgss
  sasl_plugins:   pkcs11 libgss libsasl
! scsi:           fru libumem libdevid libdevinfo
  smbsrv:         libxnet libpthread librt libshare libidmap pkcs11 libsqlite \
                  libcryptoutil libreparse libcmdutils libresolv2 libsmbfs \
                  libuuid libfakekernel libads libgss libldap5 krb5
  storage:        libdevice libdevinfo libdevid
  sun_fc:         libdevinfo libsysevent