diff options
author | Martin Matuska <mm@FreeBSD.org> | 2011-12-22 08:42:07 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2011-12-22 08:42:07 +0000 |
commit | 45d3b226a6370e9c8a99d042320250d96c9daf32 (patch) | |
tree | 45fc0471cfcb1121eec518837ba50f8c9e108dbe /usr.bin/tar/Makefile | |
parent | e2ee19e346a40c3f2946b4c7424454b5a5ef5dd2 (diff) | |
download | src-45d3b226a6370e9c8a99d042320250d96c9daf32.tar.gz src-45d3b226a6370e9c8a99d042320250d96c9daf32.zip |
Use contrib sources for building libarchive, tar and cpio.
Make "make test" fully operational.
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=228797
Diffstat (limited to 'usr.bin/tar/Makefile')
-rw-r--r-- | usr.bin/tar/Makefile | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index af1fe2595294..7d3abf88eee3 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -1,8 +1,12 @@ # $FreeBSD$ .include <bsd.own.mk> +LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive + PROG= bsdtar BSDTAR_VERSION_STRING=2.8.5 + +.PATH: ${LIBARCHIVEDIR}/tar SRCS= bsdtar.c \ cmdline.c \ getdate.c \ @@ -12,7 +16,7 @@ SRCS= bsdtar.c \ util.c \ write.c -.PATH: ${.CURDIR}/../../lib/libarchive/libarchive_fe +.PATH: ${LIBARCHIVEDIR}/libarchive_fe SRCS+= err.c \ line_reader.c \ matching.c \ @@ -29,15 +33,18 @@ LDADD+= -lmd .endif CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\" -CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libarchive -CFLAGS+= -I${.CURDIR}/../../lib/libarchive/libarchive_fe +CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" +CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive +CFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe SYMLINKS= bsdtar ${BINDIR}/tar MLINKS= bsdtar.1 tar.1 DEBUG_FLAGS=-g -.PHONY: check test +.PHONY: check test clean-test check test: $(PROG) bsdtar.1.gz - cd ${.CURDIR}/test && make test + cd ${.CURDIR}/test && make obj && make test + +clean-test: + cd ${.CURDIR}/test && make clean .include <bsd.prog.mk> |