diff options
Diffstat (limited to 'usr.sbin/tcpdump')
| -rw-r--r-- | usr.sbin/tcpdump/Makefile.inc | 4 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/tcpdump/Makefile | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/usr.sbin/tcpdump/Makefile.inc b/usr.sbin/tcpdump/Makefile.inc index abbdc366c6a0..454f1869508d 100644 --- a/usr.sbin/tcpdump/Makefile.inc +++ b/usr.sbin/tcpdump/Makefile.inc @@ -1,3 +1,3 @@ -BINDIR?= /usr/sbin - WARNS?= 3 + +.include "../Makefile.inc" diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index bfbe750c25be..21c5f9ac7fdf 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -186,9 +186,9 @@ SRCS= addrtoname.c \ print-unsupported.c \ print-vsock.c \ print-whois.c \ - print-zep.c \ - version.c -CLEANFILES+= version.c ${MAN} + print-zep.c + +CLEANFILES+= ${MAN} CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR} CFLAGS+= -DHAVE_CONFIG_H @@ -197,9 +197,6 @@ CFLAGS+= -D_U_="__attribute__((unused))" .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 -DHAVE_OS_IPV6_SUPPORT .endif -.if ${MACHINE_CPUARCH} != "i386" -CFLAGS+= -DLBL_ALIGN -.endif LIBADD= pcap .if ${MK_CASPER} != "no" @@ -220,11 +217,6 @@ SRCS+= print-pflog.c \ CFLAGS+= -DHAVE_NET_PFVAR_H -DHAVE_NET_IF_PFLOG_H .endif -version.c: ${TCPDUMP_DISTDIR}/VERSION - rm -f version.c ; \ - sed 's/.*/char version[] = "&";/' ${TCPDUMP_DISTDIR}/VERSION \ - > version.c - .include <bsd.prog.mk> .for mp in ${MAN} |