From 1191adc9970ad945f698cd83c11c8cad8650656e Mon Sep 17 00:00:00 2001 From: ache Date: Wed, 11 Jan 1995 04:18:38 +0000 Subject: Remove regex code, use -lgnuregex instead --- gnu/usr.bin/tar/Makefile | 5 ++++- gnu/usr.bin/tar/buffer.c | 2 +- gnu/usr.bin/tar/tar.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/usr.bin/tar') diff --git a/gnu/usr.bin/tar/Makefile b/gnu/usr.bin/tar/Makefile index cab7e00..8311bea 100644 --- a/gnu/usr.bin/tar/Makefile +++ b/gnu/usr.bin/tar/Makefile @@ -1,7 +1,7 @@ PROG= tar SRCS= buffer.c create.c diffarch.c extract.c fnmatch.c getdate.y \ getoldopt.c getopt.c getopt1.c gnu.c list.c mangle.c names.c port.c \ - regex.c rtapelib.c tar.c update.c version.c + rtapelib.c tar.c update.c version.c CFLAGS+= -DRETSIGTYPE=void -DDIRENT=1 -DHAVE_SYS_MTIO_H=1 -DHAVE_UNISTD_H=1 CFLAGS+= -DHAVE_GETGRGID=1 -DHAVE_GETPWUID=1 -DHAVE_STRING_H=1 CFLAGS+= -DHAVE_LIMITS_H=1 -DHAVE_STRSTR=1 -DHAVE_VALLOC=1 -DHAVE_MKDIR=1 @@ -12,5 +12,8 @@ CLEANFILES+=y.tab.h NOMAN=noman NOSHARED=yes +DPADD+= ${LIBGNUREGEX} +LDADD+= -lgnuregex + .include .include "../../usr.bin/Makefile.inc" diff --git a/gnu/usr.bin/tar/buffer.c b/gnu/usr.bin/tar/buffer.c index e0ffc2d..eb7e3ef 100644 --- a/gnu/usr.bin/tar/buffer.c +++ b/gnu/usr.bin/tar/buffer.c @@ -57,7 +57,7 @@ time_t time (); #include "tar.h" #include "port.h" #include "rmt.h" -#include "regex.h" +#include "gnuregex.h" /* Either stdout or stderr: The thing we write messages (standard msgs, not errors) to. Stdout unless we're writing a pipe, in which case stderr */ diff --git a/gnu/usr.bin/tar/tar.c b/gnu/usr.bin/tar/tar.c index ec2c3d1..33604bf 100644 --- a/gnu/usr.bin/tar/tar.c +++ b/gnu/usr.bin/tar/tar.c @@ -35,7 +35,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "tar.h" #include "port.h" -#include "regex.h" +#include "gnuregex.h" #include "fnmatch.h" /* -- cgit v1.1