summaryrefslogtreecommitdiffstats
path: root/usr.bin/xz
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2015-05-27 01:19:58 +0000
committersjg <sjg@FreeBSD.org>2015-05-27 01:19:58 +0000
commit65145fa4c81da358fcbc3b650156dab705dfa34e (patch)
tree55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /usr.bin/xz
parent60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff)
parente6b664c390af88d4a87208bc042ce503da664c3b (diff)
downloadFreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip
FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz
Merge sync of head
Diffstat (limited to 'usr.bin/xz')
-rw-r--r--usr.bin/xz/Makefile4
-rw-r--r--usr.bin/xz/Makefile.depend1
2 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile
index 13703fd..7894174 100644
--- a/usr.bin/xz/Makefile
+++ b/usr.bin/xz/Makefile
@@ -22,6 +22,7 @@ SRCS= args.c \
list.c \
main.c \
message.c \
+ mytime.c \
options.c \
signals.c \
suffix.c \
@@ -42,7 +43,6 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMALIBDIR} \
-I${XZDIR}/common
-DPADD= ${LIBLZMA}
-LDADD= -llzma
+LIBADD= lzma
.include <bsd.prog.mk>
diff --git a/usr.bin/xz/Makefile.depend b/usr.bin/xz/Makefile.depend
index b7653d1..4915738 100644
--- a/usr.bin/xz/Makefile.depend
+++ b/usr.bin/xz/Makefile.depend
@@ -11,6 +11,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/liblzma \
+ lib/libthr \
.include <dirdeps.mk>
OpenPOWER on IntegriCloud