Use -lgnuregex
Tune for 8bit ctype
This commit is contained in:
parent
712624913e
commit
e82aeeb5ef
@ -1,13 +1,12 @@
|
||||
PROG= awk
|
||||
SRCS= main.c eval.c builtin.c msg.c iop.c io.c field.c getopt1.c \
|
||||
getopt.c array.c \
|
||||
node.c version.c re.c awk.c regex.c dfa.c
|
||||
DPADD= ${LIBM}
|
||||
LDADD= -lm
|
||||
node.c version.c re.c awk.c dfa.c
|
||||
CFLAGS+=-I${.CURDIR} -DGAWK
|
||||
CLEANFILES+=awk.c y.tab.h
|
||||
|
||||
MAN1= awk.1
|
||||
DPADD+= ${LIBGNUREGEX} ${LIBM}
|
||||
LDADD+= -lgnuregex -lm
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
#.include "../../usr.bin/Makefile.inc"
|
||||
|
@ -173,7 +173,7 @@ extern int getpgrp P((void));
|
||||
|
||||
#define GNU_REGEX
|
||||
#ifdef GNU_REGEX
|
||||
#include "regex.h"
|
||||
#include "gnuregex.h"
|
||||
#include "dfa.h"
|
||||
typedef struct Regexp {
|
||||
struct re_pattern_buffer pat;
|
||||
|
@ -51,19 +51,6 @@ extern void free();
|
||||
#define isgraph(C) (isprint(C) && !isspace(C))
|
||||
#endif
|
||||
|
||||
#ifdef isascii
|
||||
#define ISALPHA(C) (isascii(C) && isalpha(C))
|
||||
#define ISUPPER(C) (isascii(C) && isupper(C))
|
||||
#define ISLOWER(C) (isascii(C) && islower(C))
|
||||
#define ISDIGIT(C) (isascii(C) && isdigit(C))
|
||||
#define ISXDIGIT(C) (isascii(C) && isxdigit(C))
|
||||
#define ISSPACE(C) (isascii(C) && isspace(C))
|
||||
#define ISPUNCT(C) (isascii(C) && ispunct(C))
|
||||
#define ISALNUM(C) (isascii(C) && isalnum(C))
|
||||
#define ISPRINT(C) (isascii(C) && isprint(C))
|
||||
#define ISGRAPH(C) (isascii(C) && isgraph(C))
|
||||
#define ISCNTRL(C) (isascii(C) && iscntrl(C))
|
||||
#else
|
||||
#define ISALPHA(C) isalpha(C)
|
||||
#define ISUPPER(C) isupper(C)
|
||||
#define ISLOWER(C) islower(C)
|
||||
@ -75,9 +62,8 @@ extern void free();
|
||||
#define ISPRINT(C) isprint(C)
|
||||
#define ISGRAPH(C) isgraph(C)
|
||||
#define ISCNTRL(C) iscntrl(C)
|
||||
#endif
|
||||
|
||||
#include "regex.h"
|
||||
#include "gnuregex.h"
|
||||
#include "dfa.h"
|
||||
|
||||
#ifdef __STDC__
|
||||
|
Loading…
Reference in New Issue
Block a user