Make libxo depend on libutil because it uses humanize_number after r287111

Remove overlinking in lib/libxo/tests, sbin/savecore, and
usr.bin/{iscsictl,wc,xo}

PR: 203673
Sponsored by: EMC / Isilon Storage Division

diff --git a/bin/ps/Makefile b/bin/ps/Makefile
index 5177832131a57f2efa47237d2a2c45e71b9393d8..79e9fc6cf0ec6219ea14d2006ff97eab5929b08d 100644 (file)
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -11,6 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps.c
 # on large systems.
 #
 CFLAGS+=-DLAZY_PS
-LIBADD=        m kvm jail xo util
+LIBADD=        m kvm jail xo
 
 .include <bsd.prog.mk>

diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile
index d854a4c1d3c2d4095202edf5afe2868ca2818b3d..f8453f405282f60c3e3c0ad917877e3e998b93c6 100644 (file)
--- a/lib/libxo/Makefile
+++ b/lib/libxo/Makefile
@@ -19,6 +19,8 @@ CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\"
 INCS=  xo.h xo_encoder.h
 INCSDIR=${INCLUDEDIR}/libxo
 
+LIBADD=        util
+
 WARNS?= 5
 
 MAN+=  libxo.3

diff --git a/lib/libxo/tests/Makefile b/lib/libxo/tests/Makefile
index 2a4a99cac1dcc79c206e9a9477f92db9daa0eabe..1a0f7c69cfee004a4ad982cbeadff87613b9df7d 100644 (file)
--- a/lib/libxo/tests/Makefile
+++ b/lib/libxo/tests/Makefile
@@ -242,8 +242,7 @@ PROGS+= test_11
 
 CFLAGS+=       -I${LIBXOSRC}/libxo
 
-DPADD=         ${LIBXO} ${LIBUTIL}
-LDADD=         -lxo -lutil
+LIBADD=                xo
 
 SUBDIR+=       encoder
 

diff --git a/lib/libxo/tests/encoder/Makefile b/lib/libxo/tests/encoder/Makefile
index 2cd86b917855bc1f8ba46a040289d18d677f6d6c..2fe42457f2e827df43d000518a985838eaf6b139 100644 (file)
--- a/lib/libxo/tests/encoder/Makefile
+++ b/lib/libxo/tests/encoder/Makefile
@@ -14,7 +14,6 @@ SRCS=         enc_test.c
 
 CFLAGS+=       -I${LIBXOSRC}/libxo
 
-DPADD+=                ${LIBXO}
-LDADD+=                -lxo
+LIBADD=                xo
 
 .include <bsd.lib.mk>

diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile
index e46496f49c98a5eba6fdbaee2081d19fc84844ed..5134e4c546a7821556062b277e6196b10961608d 100644 (file)
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=  savecore
-LIBADD=        z xo util
+LIBADD=        z xo
 MAN=   savecore.8
 
 .include <bsd.prog.mk>

diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index e3d5baecaa29d27a07357851985ec784e3f577d5..06e451bdfa2282949614a9798a4954a12a8e5bd5 100644 (file)
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -239,6 +239,7 @@ _DP_vmmapi= util
 _DP_ctf=       z
 _DP_proc=      rtld_db util
 _DP_dtrace=    rtld_db pthread
+_DP_xo=                util
 
 # Define spacial cases
 LDADD_supcplusplus=    -lsupc++

diff --git a/usr.bin/iscsictl/Makefile b/usr.bin/iscsictl/Makefile
index 9b2e1f17587ecda7c84eb12a94f78f65fa20eea5..4437e2d1e3cad0dae6e00158b723824e28950fbd 100644 (file)
--- a/usr.bin/iscsictl/Makefile
+++ b/usr.bin/iscsictl/Makefile
@@ -6,7 +6,7 @@ CFLAGS+=        -I${.CURDIR}
 CFLAGS+=       -I${.CURDIR}/../../sys/dev/iscsi
 MAN=           iscsi.conf.5 iscsictl.8
 
-LIBADD=                xo util
+LIBADD=                xo
 
 YFLAGS+=       -v
 LFLAGS+=       -i

diff --git a/usr.bin/wc/Makefile b/usr.bin/wc/Makefile
index 6fa21fa6975578e3a86440a1ae526d3eac2fdb83..540e33d15c9266002e3e2b89cab4232c75edf605 100644 (file)
--- a/usr.bin/wc/Makefile
+++ b/usr.bin/wc/Makefile
@@ -2,6 +2,6 @@
 # $FreeBSD$
 
 PROG=  wc
-LIBADD=        xo util
+LIBADD=        xo
 
 .include <bsd.prog.mk>

diff --git a/usr.bin/xo/Makefile b/usr.bin/xo/Makefile
index 92692e550cf8f5e3ca3b57153d37ab9b55fe8428..0773987d6ab17dfdf6060fe4a3db9327df865e01 100644 (file)
--- a/usr.bin/xo/Makefile
+++ b/usr.bin/xo/Makefile
@@ -12,7 +12,7 @@ MAN=  xo.1
 # XXX For xoversion.h
 CFLAGS+=-I${LIBXOSRC}/libxo
 
-LIBADD=        xo util
+LIBADD=        xo
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=       tests