diff options
author | olah <olah@FreeBSD.org> | 1995-02-21 10:46:34 +0000 |
---|---|---|
committer | olah <olah@FreeBSD.org> | 1995-02-21 10:46:34 +0000 |
commit | f0c34d41d10477b1ce7c5b8834b8cefc27cb8e08 (patch) | |
tree | 0bd0d988a022e97c37bad26f55f2ecaa156c0c07 /lib/libpcap | |
parent | 5c36476ca09554f2bc768d78a27de52f3c2d8cbc (diff) | |
download | FreeBSD-src-f0c34d41d10477b1ce7c5b8834b8cefc27cb8e08.zip FreeBSD-src-f0c34d41d10477b1ce7c5b8834b8cefc27cb8e08.tar.gz |
Fix bogus Makefile which resulted in incompatible shared and static
libs.
Reviewed by: Michael Reifenberger <root@rz-wb.fh-sw.de>,
roberto@blaise.ibp.fr (Ollivier ROBERT)
Diffstat (limited to 'lib/libpcap')
-rw-r--r-- | lib/libpcap/Makefile | 24 | ||||
-rw-r--r-- | lib/libpcap/grammar.y | 4 |
2 files changed, 8 insertions, 20 deletions
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index 83bd2dd..9fb1c57 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -1,5 +1,5 @@ # Makefile for libpcap -# $Id: Makefile,v 1.8 1994/11/16 11:54:09 ache Exp $ +# $Id: Makefile,v 1.1.1.1 1995/01/20 04:13:07 jkh Exp $ LIB= pcap @@ -7,11 +7,11 @@ SRCS= \ pcap-bpf.c \ pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c savefile.c \ bpf_filter.c bpf_image.c \ - grammar.y \ - scanner.l + grammar.y scanner.l CLEANFILES+= lex.yy.c tokdefs.h grammar.c scanner.c -CFLAGS+=-Wall -I. -I${.CURDIR} -DFDDI +# CFLAGS+=-Wall -I. -I${.CURDIR} -DFDDI -Dyylval=pcap_lval +CFLAGS+=-DFDDI -I. -I${.CURDIR} MAN3= pcap.3 beforeinstall: @@ -22,24 +22,10 @@ beforeinstall: ( $(INSTALL) $(COPY) -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/pcap-namedb.h ${DESTDIR}/usr/include; ) - -scanner.c: scanner.l - rm -f $@ - $(LEX) -t $< > $@ - -scanner.o: scanner.c - rm -f $@; $(CC) $(CFLAGS) $(LEX_DEFINES) -c $*.c +scanner.o: tokdefs.h tokdefs.h: grammar.c - -grammar.c: grammar.y - rm -f grammar.c tokdefs.h - $(YACC) -d $< - mv y.tab.c grammar.c mv y.tab.h tokdefs.h -grammar.o: grammar.c - $(CC) -c $(CFLAGS) -Dyylval=pcap_lval grammar.c - .include <bsd.lib.mk> diff --git a/lib/libpcap/grammar.y b/lib/libpcap/grammar.y index 55fa198..4c17bdc 100644 --- a/lib/libpcap/grammar.y +++ b/lib/libpcap/grammar.y @@ -22,7 +22,7 @@ */ #ifndef lint static char rcsid[] = - "@(#) $Header: grammar.y,v 1.39 94/06/14 20:09:25 leres Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/lib/libpcap/grammar.y,v 1.1.1.1 1995/01/20 04:13:06 jkh Exp $ (LBL)"; #endif #include <sys/types.h> @@ -41,6 +41,8 @@ static char rcsid[] = #include "gencode.h" +#define yylval pcap_lval + #define QSET(q, p, d, a) (q).proto = (p),\ (q).dir = (d),\ (q).addr = (a) |