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 /lib | |
| 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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libxo/Makefile | 2 | ||||
| -rw-r--r-- | lib/libxo/tests/Makefile | 3 | ||||
| -rw-r--r-- | lib/libxo/tests/encoder/Makefile | 3 |
3 files changed, 4 insertions, 4 deletions
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> |
