Author: ngie
Date: Sun Oct 18 07:30:50 2015
New Revision: 289490
URL: https://svnweb.freebsd.org/changeset/base/289490
Log:
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
Modified:
head/bin/ps/Makefile
head/lib/libxo/Makefile
head/lib/libxo/tests/Makefile
head/lib/libxo/tests/encoder/Makefile
head/sbin/savecore/Makefile
head/share/mk/src.libnames.mk
head/usr.bin/iscsictl/Makefile
head/usr.bin/wc/Makefile
head/usr.bin/xo/Makefile
Directory Properties:
head/ (props changed)
head/sbin/ (props changed)
head/share/ (props changed)
Modified: head/bin/ps/Makefile
==============================================================================
--- head/bin/ps/Makefile Sun Oct 18 06:53:31 2015 (r289489)
+++ head/bin/ps/Makefile Sun Oct 18 07:30:50 2015 (r289490)
@@ -11,6 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps
# on large systems.
#
CFLAGS+=-DLAZY_PS
-LIBADD= m kvm jail xo util
+LIBADD= m kvm jail xo
.include <bsd.prog.mk>
Modified: head/lib/libxo/Makefile
==============================================================================
--- head/lib/libxo/Makefile Sun Oct 18 06:53:31 2015 (r289489)
+++ head/lib/libxo/Makefile Sun Oct 18 07:30:50 2015 (r289490)
@@ -19,6 +19,8 @@ CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo
INCS= xo.h xo_encoder.h
INCSDIR=${INCLUDEDIR}/libxo
+LIBADD= util
+
WARNS?= 5
MAN+= libxo.3
Modified: head/lib/libxo/tests/Makefile
==============================================================================
--- head/lib/libxo/tests/Makefile Sun Oct 18 06:53:31 2015
(r289489)
+++ head/lib/libxo/tests/Makefile Sun Oct 18 07:30:50 2015
(r289490)
@@ -242,8 +242,7 @@ PROGS+= test_11
CFLAGS+= -I${LIBXOSRC}/libxo
-DPADD= ${LIBXO} ${LIBUTIL}
-LDADD= -lxo -lutil
+LIBADD= xo
SUBDIR+= encoder
Modified: head/lib/libxo/tests/encoder/Makefile
==============================================================================
--- head/lib/libxo/tests/encoder/Makefile Sun Oct 18 06:53:31 2015
(r289489)
+++ head/lib/libxo/tests/encoder/Makefile Sun Oct 18 07:30:50 2015
(r289490)
@@ -14,7 +14,6 @@ SRCS= enc_test.c
CFLAGS+= -I${LIBXOSRC}/libxo
-DPADD+= ${LIBXO}
-LDADD+= -lxo
+LIBADD= xo
.include <bsd.lib.mk>
Modified: head/sbin/savecore/Makefile
==============================================================================
--- head/sbin/savecore/Makefile Sun Oct 18 06:53:31 2015 (r289489)
+++ head/sbin/savecore/Makefile Sun Oct 18 07:30:50 2015 (r289490)
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= savecore
-LIBADD= z xo util
+LIBADD= z xo
MAN= savecore.8
.include <bsd.prog.mk>
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Sun Oct 18 06:53:31 2015
(r289489)
+++ head/share/mk/src.libnames.mk Sun Oct 18 07:30:50 2015
(r289490)
@@ -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++
Modified: head/usr.bin/iscsictl/Makefile
==============================================================================
--- head/usr.bin/iscsictl/Makefile Sun Oct 18 06:53:31 2015
(r289489)
+++ head/usr.bin/iscsictl/Makefile Sun Oct 18 07:30:50 2015
(r289490)
@@ -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
Modified: head/usr.bin/wc/Makefile
==============================================================================
--- head/usr.bin/wc/Makefile Sun Oct 18 06:53:31 2015 (r289489)
+++ head/usr.bin/wc/Makefile Sun Oct 18 07:30:50 2015 (r289490)
@@ -2,6 +2,6 @@
# $FreeBSD$
PROG= wc
-LIBADD= xo util
+LIBADD= xo
.include <bsd.prog.mk>
Modified: head/usr.bin/xo/Makefile
==============================================================================
--- head/usr.bin/xo/Makefile Sun Oct 18 06:53:31 2015 (r289489)
+++ head/usr.bin/xo/Makefile Sun Oct 18 07:30:50 2015 (r289490)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
