diff options
-rw-r--r-- | gnu/usr.bin/tar/Makefile | 22 | ||||
-rw-r--r-- | gnu/usr.bin/tar/Makefile.inc | 12 | ||||
-rw-r--r-- | gnu/usr.bin/tar/doc/Makefile | 5 | ||||
-rw-r--r-- | gnu/usr.bin/tar/lib/Makefile | 17 |
4 files changed, 23 insertions, 33 deletions
diff --git a/gnu/usr.bin/tar/Makefile b/gnu/usr.bin/tar/Makefile index c839cd4..6afb9cc 100644 --- a/gnu/usr.bin/tar/Makefile +++ b/gnu/usr.bin/tar/Makefile @@ -1,5 +1,23 @@ # $FreeBSD$ -SUBDIR= lib tar doc +TARDIR= ${.CURDIR}/../../../contrib/tar +.PATH: ${TARDIR}/lib ${TARDIR}/src -.include <bsd.subdir.mk> +PROG= tar + +SUBDIR+= doc + +# libtar SRCS +SRCS= addext.c argmatch.c backupfile.c basename.c dirname.c error.c \ + exclude.c full-write.c getdate.c getline.c getopt.c getopt1.c \ + getstr.c hash.c human.c mktime.c modechange.c prepargs.c \ + print-copyr.c quotearg.c safe-read.c save-cwd.c savedir.c unicodeio.c \ + xgetcwd.c xmalloc.c xstrdup.c xstrtoul.c xstrtoumax.c +SRCS+= buffer.c compare.c create.c delete.c extract.c incremen.c list.c \ + mangle.c misc.c names.c rtapelib.c tar.c update.c + +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} -I${TARDIR}/lib -I${TARDIR}/src + +NOSHARED?= YES + +.include <bsd.prog.mk> diff --git a/gnu/usr.bin/tar/Makefile.inc b/gnu/usr.bin/tar/Makefile.inc deleted file mode 100644 index 42dcec2..0000000 --- a/gnu/usr.bin/tar/Makefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -TARDIR= ${.CURDIR}/../../../../contrib/tar -TARCFLAGS= -DHAVE_CONFIG_H -I${.CURDIR}/.. -I${TARDIR}/lib - -# Inherit BINDIR from one level up. -.if !target(__foobar__) -__foobar__: -.if exists(../Makefile.inc) -.include "../Makefile.inc" -.endif -.endif diff --git a/gnu/usr.bin/tar/doc/Makefile b/gnu/usr.bin/tar/doc/Makefile index abe0b93..6f59f98 100644 --- a/gnu/usr.bin/tar/doc/Makefile +++ b/gnu/usr.bin/tar/doc/Makefile @@ -1,8 +1,9 @@ # $FreeBSD$ +TARDIR= ${.CURDIR}/../../../../contrib/tar +.PATH: ${TARDIR}/doc + INFO= tar MAKEINFOFLAGS= -I${TARDIR}/doc .include <bsd.info.mk> - -.PATH: ${TARDIR}/doc diff --git a/gnu/usr.bin/tar/lib/Makefile b/gnu/usr.bin/tar/lib/Makefile deleted file mode 100644 index c896a53..0000000 --- a/gnu/usr.bin/tar/lib/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ - -LIB= tar -INTERNALLIB= YES - -SRCS= addext.c argmatch.c backupfile.c basename.c dirname.c error.c \ - exclude.c full-write.c getdate.c getopt.c getopt1.c getstr.c \ - getline.c hash.c human.c mktime.c modechange.c msleep.c prepargs.c \ - print-copyr.c quote.c quotearg.c safe-read.c save-cwd.c savedir.c \ - unicodeio.c xgetcwd.c xmalloc.c xstrdup.c \ - xstrtoimax.c xstrtoul.c xstrtoumax.c - -CFLAGS+= ${TARCFLAGS} - -.include <bsd.lib.mk> - -.PATH: ${TARDIR}/lib |