diff options
author | obrien <obrien@FreeBSD.org> | 2001-04-20 17:30:12 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2001-04-20 17:30:12 +0000 |
commit | df8f79b9de28f2867173984a35133ee13e616f69 (patch) | |
tree | d94e7a5440a0fcbad9da48265849f0be03eaddf3 | |
parent | e4f51f84c06ff69eb84334792c7821eac4a1c072 (diff) | |
download | FreeBSD-src-df8f79b9de28f2867173984a35133ee13e616f69.zip FreeBSD-src-df8f79b9de28f2867173984a35133ee13e616f69.tar.gz |
Style changes. Not purfect, but closer to other Makefiles in the tree.
Approved by: fenner
-rw-r--r-- | usr.sbin/tcpdump/tcpdump/Makefile | 55 | ||||
-rw-r--r-- | usr.sbin/tcpdump/tcpslice/Makefile | 11 |
2 files changed, 35 insertions, 31 deletions
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index 132422a..7ed8dca 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -1,31 +1,37 @@ # $FreeBSD$ +TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump +.PATH: ${TCPDUMP_DISTDIR} + PROG= tcpdump -CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -SRCS = version.c tcpdump.c \ - print-arp.c print-atalk.c print-atm.c print-bootp.c \ - print-decnet.c print-domain.c print-dvmrp.c print-egp.c \ - print-ether.c print-fddi.c print-gre.c print-icmp.c print-igmp.c \ - print-igrp.c print-ip.c print-ipx.c print-isoclns.c print-krb.c \ - print-llc.c print-nfs.c print-ntp.c print-null.c print-ospf.c \ - print-pim.c print-ppp.c print-raw.c print-rip.c print-sl.c \ - print-snmp.c print-stp.c print-sunrpc.c print-tcp.c print-tftp.c \ - print-udp.c print-wb.c addrtoname.c gmt2local.c machdep.c \ - parsenfsfh.c util.c savestr.c setsignal.c \ - print-esp.c print-ah.c print-vjc.c print-isakmp.c print-chdlc.c \ - print-ipcomp.c print-mobile.c print-l2tp.c print-bgp.c print-rx.c \ - print-lane.c print-cip.c print-pppoe.c print-lcp.c \ - print-smb.c smbutil.c print-ascii.c print-telnet.c print-cnfp.c \ - print-vrrp.c print-cdp.c print-token.c print-bxxp.c print-timed.c \ - print-radius.c print-sll.c \ - print-ip6.c print-ip6opts.c print-ripng.c print-icmp6.c \ - print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c +SRCS= addrtoname.c gmt2local.c machdep.c parsenfsfh.c \ + print-ah.c print-arp.c print-ascii.c print-atalk.c \ + print-atm.c print-bgp.c print-bootp.c print-bxxp.c \ + print-cdp.c print-chdlc.c print-cip.c print-cnfp.c \ + print-decnet.c print-dhcp6.c print-domain.c print-dvmrp.c \ + print-egp.c print-esp.c print-ether.c print-fddi.c \ + print-frag6.c print-gre.c print-icmp.c print-icmp6.c \ + print-igmp.c print-igrp.c print-ip.c print-ip6.c \ + print-ip6opts.c print-ipcomp.c print-ipx.c print-isakmp.c \ + print-isoclns.c print-krb.c print-l2tp.c print-lane.c \ + print-lcp.c print-llc.c print-mobile.c print-nfs.c \ + print-ntp.c print-null.c print-ospf.c print-ospf6.c \ + print-pim.c print-ppp.c print-pppoe.c print-radius.c \ + print-raw.c print-rip.c print-ripng.c print-rt6.c \ + print-rx.c print-sl.c print-sll.c print-smb.c print-snmp.c \ + print-stp.c print-sunrpc.c print-tcp.c print-telnet.c \ + print-tftp.c print-timed.c print-token.c print-udp.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 -DPADD+= ${LIBL} ${LIBPCAP} -LDADD+= -ll -lpcap +CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR}/lbl +CFLAGS+= -DHAVE_CONFIG_H .if !defined(NOINET6) CFLAGS+= -DINET6 .endif + +DPADD+= ${LIBL} ${LIBPCAP} +LDADD+= -ll -lpcap .if exists(../../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && \ !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DISTRIBUTION=crypto @@ -34,12 +40,9 @@ LDADD+= -lcrypto CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H .endif -TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump -CFLAGS+= -I${TCPDUMP_DISTDIR}/lbl -.PATH: ${TCPDUMP_DISTDIR} - version.c: ${TCPDUMP_DISTDIR}/VERSION rm -f version.c ; \ - sed 's/.*/char version[] = "&";/' ${TCPDUMP_DISTDIR}/VERSION > version.c + sed 's/.*/char version[] = "&";/' ${TCPDUMP_DISTDIR}/VERSION \ + > version.c .include <bsd.prog.mk> diff --git a/usr.sbin/tcpdump/tcpslice/Makefile b/usr.sbin/tcpdump/tcpslice/Makefile index 3bb2950..4d996bf 100644 --- a/usr.sbin/tcpdump/tcpslice/Makefile +++ b/usr.sbin/tcpdump/tcpslice/Makefile @@ -1,19 +1,20 @@ # @(#)Makefile 0.1 (RWGrimes) 3/24/93 # $FreeBSD$ +TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump + PROG= tcpslice -CFLAGS+=-Wall -I. SRCS= gwtm2secs.c search.c tcpslice.c util.c version.c version.h -CLEANFILES+= version.c version.h +CLEANFILES= version.c version.h +CFLAGS+= -I. + DPADD+= ${LIBPCAP} LDADD+= -lpcap -TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump - .ORDER: version.c version.h version.c version.h: ${TCPDUMP_DISTDIR}/VERSION rm -f version.c ; \ - sed 's/.*/char version[] = "&";/' ${TCPDUMP_DISTDIR}/VERSION > version.c + sed 's/.*/char version[] = "&";/' ${TCPDUMP_DISTDIR}/VERSION > version.c set `sed 's/\([0-9]*\)\.\([0-9]*\).*/\1 \2/' ${TCPDUMP_DISTDIR}/VERSION` ; \ { echo '#define VERSION_MAJOR' $$1 ; \ echo '#define VERSION_MINOR' $$2 ; } > version.h |