Unbreak buildworld due to the libpcap import.
authorPeter Avalos <pavalos@dragonflybsd.org>
Mon, 23 Jan 2012 08:30:48 +0000 (00:30 -0800)
committerPeter Avalos <pavalos@dragonflybsd.org>
Mon, 23 Jan 2012 08:30:48 +0000 (00:30 -0800)
lib/libpcap/Makefile
usr.sbin/802_11/wpa_supplicant/Packet32.c
usr.sbin/pflogd/Makefile
usr.sbin/pppd/Makefile

index 8f14d6f..e515fa4 100644 (file)
@@ -6,7 +6,8 @@ SRCS=   pcap-bpf.c \
        pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \
        savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
        bpf_image.c bpf_dump.c \
-       scanner.l grammar.y bpf_filter.c version.c
+       scanner.l grammar.y bpf_filter.c version.c \
+       version.h tokdefs.h
 
 INCS=  pcap.h \
        pcap-bpf.h \
@@ -100,7 +101,7 @@ WARNS?=     2
 
 LFLAGS+=-Ppcap_
 YFLAGS+=-p pcap_
-CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}
+CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -I${.OBJDIR}
 CFLAGS+=-D_U_="__attribute__((unused))" -DYYBISON
 CFLAGS+=-DHAVE_STRUCT_ETHER_ADDR -DHAVE_NET_PFVAR_H
 .if !defined(NOINET6)
@@ -127,9 +128,6 @@ version.h: VERSION
 tokdefs.h: grammar.h
        ${LN} -sf grammar.h tokdefs.h
 
-pcap.o:        version.h
-scanner.o: scanner.c tokdefs.h
-
 #
 # Magic to convert the man pages to something non Solarish
 #
index ac7c9f4..9e4f459 100644 (file)
@@ -55,6 +55,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <net/bpf.h>
 #include <net/route.h>
 
 #include <netproto/802_11/ieee80211_ioctl.h>
index 54ad7a5..c789b0d 100644 (file)
@@ -2,7 +2,8 @@
 
 LDADD+= -lpcap -lutil
 DPADD+=        ${LIBPCAP} ${LIBUTIL}
-CFLAGS+= -DHAVE_SNPRINTF
+CFLAGS+= -DHAVE_SNPRINTF -I${.CURDIR}/../../contrib/libpcap
+WARNS?=        4
 
 PROG=  pflogd
 SRCS=  pflogd.c privsep.c privsep_fdpass.c
index b383785..15b813e 100644 (file)
@@ -24,7 +24,7 @@ CFLAGS+=-DCBCP_SUPPORT
 SRCS+= cbcp.c
 
 # Filter support
-CFLAGS+=-DPPP_FILTER
+CFLAGS+=-DPPP_FILTER -I${.CURDIR}/../../contrib/libpcap
 LDADD+=        -lpcap
 DPADD+=        ${LIBPCAP}