d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bogus Makefile which resulted in incompatible shared and static

Browse Source 
libs.

Reviewed by:	Michael Reifenberger <root@rz-wb.fh-sw.de>,
		roberto@blaise.ibp.fr (Ollivier ROBERT)
This commit is contained in:
Andras Olah 1995-02-21 10:46:34 +00:00
parent 0e13d5af6f
commit 8a695f765c
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/libpcap/Makefile
View File

@ -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>

4
lib/libpcap/grammar.y
View File

@ -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)