mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-30 08:19:09 +00:00
Code Issues Releases Activity

Make libxo depend on libutil because it uses humanize_number after r287111

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

PR: 203673
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2015-10-18 07:30:50 +00:00
parent fb9fb4d390
commit 550d2b80ec
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=289490
9 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ps/Makefile
View File

@ -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>

2
lib/libxo/Makefile
View File

@ -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

3
lib/libxo/tests/Makefile
View File

@ -242,8 +242,7 @@ PROGS+= test_11
CFLAGS+= -I${LIBXOSRC}/libxo
DPADD= ${LIBXO} ${LIBUTIL}
LDADD= -lxo -lutil
LIBADD= xo
SUBDIR+= encoder

3
lib/libxo/tests/encoder/Makefile
View File

@ -14,7 +14,6 @@ SRCS= enc_test.c
CFLAGS+= -I${LIBXOSRC}/libxo
DPADD+= ${LIBXO}
LDADD+= -lxo
LIBADD= xo
.include <bsd.lib.mk>

2
sbin/savecore/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PROG= savecore
LIBADD= z xo util
LIBADD= z xo
MAN= savecore.8
.include <bsd.prog.mk>

1
share/mk/src.libnames.mk
View File

@ -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++

2
usr.bin/iscsictl/Makefile
View File

@ -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

2
usr.bin/wc/Makefile
View File

@ -2,6 +2,6 @@
# $FreeBSD$
PROG= wc
LIBADD= xo util
LIBADD= xo
.include <bsd.prog.mk>

2
usr.bin/xo/Makefile
View File

@ -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