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

@@ -72,10 +72,11 @@
         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,12 +126,10 @@
         libexacct       \
         libexacct/demo  \
         libfakekernel   \
         libfcoe         \
         libficl         \
-        libfru          \
-        libfruutils     \
         libfsmgt        \
         libfstyp        \
         libgen          \
         libgrubmgmt     \
         libgss          \

@@ -366,10 +365,11 @@
 
 HDRSUBDIRS=                             \
         ../cmd/sendmail/libmilter       \
         auditd_plugins  \
         fm              \
+        fru             \
         hal             \
         hbaapi          \
         libads          \
         libast          \
         libbrand        \

@@ -399,11 +399,10 @@
         libdtrace_jni   \
         libelfsign      \
         libeti          \
         libfakekernel   \
         libfcoe         \
-        libfru          \
         libfstyp        \
         libgen          \
         libgrubmgmt     \
         libidmap        \
         libilb          \

@@ -577,10 +576,11 @@
 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,11 +613,10 @@
 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

@@ -695,11 +694,11 @@
 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
+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