diff options
author | ngie <ngie@FreeBSD.org> | 2015-10-18 07:30:50 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-10-18 07:30:50 +0000 |
commit | 5c0da1966cae498c05787547279f17707ffb1967 (patch) | |
tree | 691f050874a085a5e28852b358e2b9a9aa0d575d | |
parent | bac9b01be8903ec374282900a1218b1535072ab5 (diff) | |
download | FreeBSD-src-5c0da1966cae498c05787547279f17707ffb1967.zip FreeBSD-src-5c0da1966cae498c05787547279f17707ffb1967.tar.gz |
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
-rw-r--r-- | bin/ps/Makefile | 2 | ||||
-rw-r--r-- | lib/libxo/Makefile | 2 | ||||
-rw-r--r-- | lib/libxo/tests/Makefile | 3 | ||||
-rw-r--r-- | lib/libxo/tests/encoder/Makefile | 3 | ||||
-rw-r--r-- | sbin/savecore/Makefile | 2 | ||||
-rw-r--r-- | share/mk/src.libnames.mk | 1 | ||||
-rw-r--r-- | usr.bin/iscsictl/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/wc/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/xo/Makefile | 2 |
9 files changed, 10 insertions, 9 deletions
diff --git a/bin/ps/Makefile b/bin/ps/Makefile index 5177832..79e9fc6 100644 --- 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 d854a4c..f8453f4 100644 --- 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 2a4a99c..1a0f7c6 100644 --- 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 2cd86b9..2fe4245 100644 --- 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 e46496f..5134e4c 100644 --- 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 e3d5bae..06e451b 100644 --- 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 9b2e1f1..4437e2d 100644 --- 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 6fa21fa..540e33d 100644 --- 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 92692e5..0773987 100644 --- 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 |