summaryrefslogtreecommitdiffstats
path: root/usr.sbin/tcpdump
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-07-20 06:20:32 +0000
committerobrien <obrien@FreeBSD.org>2001-07-20 06:20:32 +0000
commit9c97c8f02d579c6988b1d150fd1c0fa8dacf2e87 (patch)
treefb97d8f0fea8f93b6e8bb70b86e003cf5cbc2b79 /usr.sbin/tcpdump
parentd3d1b151d3f3f67385b5e5adbbafd20527daa156 (diff)
downloadFreeBSD-src-9c97c8f02d579c6988b1d150fd1c0fa8dacf2e87.zip
FreeBSD-src-9c97c8f02d579c6988b1d150fd1c0fa8dacf2e87.tar.gz
Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they are orders of orders of magnitude more consistent style-wise than before.
Diffstat (limited to 'usr.sbin/tcpdump')
-rw-r--r--usr.sbin/tcpdump/Makefile1
-rw-r--r--usr.sbin/tcpdump/Makefile.inc1
-rw-r--r--usr.sbin/tcpdump/tcpdump/Makefile8
-rw-r--r--usr.sbin/tcpdump/tcpslice/Makefile5
4 files changed, 10 insertions, 5 deletions
diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile
index 0a1f253..c549530 100644
--- a/usr.sbin/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/Makefile
@@ -1,4 +1,5 @@
# @(#)Makefile 0.1 (RGrimes) 4/4/93
+# $FreeBSD$
SUBDIR= tcpdump tcpslice
diff --git a/usr.sbin/tcpdump/Makefile.inc b/usr.sbin/tcpdump/Makefile.inc
index 26c6f1c..1e4d46f 100644
--- a/usr.sbin/tcpdump/Makefile.inc
+++ b/usr.sbin/tcpdump/Makefile.inc
@@ -1,3 +1,4 @@
# @(#)Makefile.inc 5.1 (Berkeley) 5/11/90
+# $FreeBSD$
BINDIR?= /usr/sbin
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 1101aec..05f9253 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -24,16 +24,18 @@ SRCS= addrtoname.c gmt2local.c machdep.c parsenfsfh.c \
print-vjc.c print-vrrp.c print-wb.c \
savestr.c setsignal.c smbutil.c tcpdump.c util.c version.c
CLEANFILES+= version.c
+
CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR}/lbl
CFLAGS+= -DHAVE_CONFIG_H
+
.if !defined(NOINET6)
-CFLAGS+= -DINET6
SRCS+= print-ip6.c print-ip6opts.c print-ripng.c print-icmp6.c \
print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c
+CFLAGS+= -DINET6
.endif
-DPADD+= ${LIBL} ${LIBPCAP}
-LDADD+= -ll -lpcap
+DPADD= ${LIBL} ${LIBPCAP}
+LDADD= -ll -lpcap
.if exists(../../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && \
!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DISTRIBUTION=crypto
diff --git a/usr.sbin/tcpdump/tcpslice/Makefile b/usr.sbin/tcpdump/tcpslice/Makefile
index 4d996bf..2c44459 100644
--- a/usr.sbin/tcpdump/tcpslice/Makefile
+++ b/usr.sbin/tcpdump/tcpslice/Makefile
@@ -6,10 +6,11 @@ TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump
PROG= tcpslice
SRCS= gwtm2secs.c search.c tcpslice.c util.c version.c version.h
CLEANFILES= version.c version.h
+
CFLAGS+= -I.
-DPADD+= ${LIBPCAP}
-LDADD+= -lpcap
+DPADD= ${LIBPCAP}
+LDADD= -lpcap
.ORDER: version.c version.h
version.c version.h: ${TCPDUMP_DISTDIR}/VERSION
OpenPOWER on IntegriCloud