diff options
| author | Tim Kientzle <kientzle@FreeBSD.org> | 2004-04-12 00:13:23 +0000 |
|---|---|---|
| committer | Tim Kientzle <kientzle@FreeBSD.org> | 2004-04-12 00:13:23 +0000 |
| commit | 4cbbc3a35ef8331ff37baa7e8fbc32724d90fa9a (patch) | |
| tree | bf4de47c60d80eedfd0fe3d8c295f182d11a0bbb /usr.bin | |
| parent | 445d3a34a6c8841fc0844d05d201ded42725eeaf (diff) | |
Notes
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tar/Makefile | 14 | ||||
| -rw-r--r-- | usr.bin/tar/bsdtar.c | 3 | ||||
| -rw-r--r-- | usr.bin/tar/matching.c | 3 | ||||
| -rw-r--r-- | usr.bin/tar/read.c | 3 | ||||
| -rw-r--r-- | usr.bin/tar/write.c | 3 |
5 files changed, 2 insertions, 24 deletions
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index 5679f3d4b2e22..811efc48dbcbb 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -1,21 +1,11 @@ -# Makefile for bsdtar -# # $FreeBSD$ -# -DEBUG_FLAGS= -g PROG= bsdtar SRCS= bsdtar.c matching.c read.c util.c write.c -MAN = bsdtar.1 -BINDIR?= /usr/bin WARNS?= 6 -LDADD += -larchive -lz -lbz2 - -.if defined(DMALLOC) -CFLAGS += -DDMALLOC -I/usr/local/include -LDADD += -L/usr/local/lib -ldmalloc -.endif +LDADD+= -larchive -lbz2 -lz +DPADD+= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} .include <bsd.prog.mk> diff --git a/usr.bin/tar/bsdtar.c b/usr.bin/tar/bsdtar.c index f85a1474d2460..528a6dd5f46fa 100644 --- a/usr.bin/tar/bsdtar.c +++ b/usr.bin/tar/bsdtar.c @@ -32,9 +32,6 @@ __FBSDID("$FreeBSD$"); #include <archive.h> #include <archive_entry.h> #include <dirent.h> -#ifdef DMALLOC -#include <dmalloc.h> -#endif #include <errno.h> #include <fcntl.h> #include <fnmatch.h> diff --git a/usr.bin/tar/matching.c b/usr.bin/tar/matching.c index 36c73ce137cf7..9b4e7255ae9a4 100644 --- a/usr.bin/tar/matching.c +++ b/usr.bin/tar/matching.c @@ -27,9 +27,6 @@ #include "bsdtar_platform.h" __FBSDID("$FreeBSD$"); -#ifdef DMALLOC -#include <dmalloc.h> -#endif #include <errno.h> #include <fnmatch.h> #include <stdlib.h> diff --git a/usr.bin/tar/read.c b/usr.bin/tar/read.c index 481238d78d744..684a7ae822511 100644 --- a/usr.bin/tar/read.c +++ b/usr.bin/tar/read.c @@ -32,9 +32,6 @@ __FBSDID("$FreeBSD$"); #include <archive.h> #include <archive_entry.h> -#ifdef DMALLOC -#include <dmalloc.h> -#endif #include <errno.h> #include <grp.h> #include <limits.h> diff --git a/usr.bin/tar/write.c b/usr.bin/tar/write.c index 5bf9884e86917..d2eed4bf4d239 100644 --- a/usr.bin/tar/write.c +++ b/usr.bin/tar/write.c @@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$"); #endif #include <archive.h> #include <archive_entry.h> -#ifdef DMALLOC -#include <dmalloc.h> -#endif #include <errno.h> #include <fcntl.h> #include <fnmatch.h> |