summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libpcap/Makefile12
-rw-r--r--lib/libpcap/scanner.l4
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 82b7e4c87f4..3a5746c5d2d 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2016/03/30 06:38:42 jmc Exp $
+# $OpenBSD: Makefile,v 1.26 2017/07/09 15:32:09 espie Exp $
# $NetBSD: Makefile,v 1.3 1996/05/10 21:54:24 cgd Exp $
LIB= pcap
@@ -16,14 +16,10 @@ SRCS= pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \
pcap-bpf.c version.c fad-getad.c
.PATH: ${.CURDIR}/../../sys/net
-CLEANFILES+= grammar.c scanner.c grammar.tab.h version.c
+YFLAGS = -ppcap_yy -d
+LFLAGS = -Ppcap_yy
-grammar.c: grammar.y
- ${YACC.y} -ppcap_yy -b ${.TARGET:R} ${.ALLSRC}
- mv ${.TARGET:R}.tab.c ${.TARGET}
-
-scanner.c: scanner.l grammar.c
- ${LEX.l} -Ppcap_yy -o${.TARGET} ${.CURDIR}/scanner.l
+CLEANFILES+= version.c
version.c: ${.CURDIR}/VERSION
@rm -f $@
diff --git a/lib/libpcap/scanner.l b/lib/libpcap/scanner.l
index 9fe0a954d46..9ef4f41679e 100644
--- a/lib/libpcap/scanner.l
+++ b/lib/libpcap/scanner.l
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: scanner.l,v 1.23 2015/11/17 21:39:23 mmcc Exp $ */
+/* $OpenBSD: scanner.l,v 1.24 2017/07/09 15:32:09 espie Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -44,7 +44,7 @@
#include "os-proto.h"
#endif
-#include "grammar.tab.h"
+#include "grammar.h"
static int stoi(char *);
static inline int xdtoi(int);