diff options
| author | bapt <bapt@FreeBSD.org> | 2014-11-25 11:23:12 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-11-25 11:23:12 +0000 |
| commit | 6fdc031751627af3f5480588e8fd097c3a683ff6 (patch) | |
| tree | 69f31f17bfe80e77e4f38188819e4e69f11b9f25 /sbin/ipf | |
| parent | b3accf4c8d5ec1d17667ddf40509a48d41bc2d91 (diff) | |
| download | FreeBSD-src-6fdc031751627af3f5480588e8fd097c3a683ff6.zip FreeBSD-src-6fdc031751627af3f5480588e8fd097c3a683ff6.tar.gz | |
Convert sbin/ to LIBADD
Reduce overlinking
Diffstat (limited to 'sbin/ipf')
| -rw-r--r-- | sbin/ipf/Makefile.inc | 4 | ||||
| -rw-r--r-- | sbin/ipf/ipf/Makefile | 3 | ||||
| -rw-r--r-- | sbin/ipf/ipfstat/Makefile | 3 | ||||
| -rw-r--r-- | sbin/ipf/ipsend/Makefile | 3 |
4 files changed, 4 insertions, 9 deletions
diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc index 2d7d7b1..79bdb8e 100644 --- a/sbin/ipf/Makefile.inc +++ b/sbin/ipf/Makefile.inc @@ -18,9 +18,7 @@ CFLAGS+= -DUSE_INET6 CFLAGS+= -DNOINET6 .endif -LIBIPF= ${.OBJDIR}/../libipf/libipf.a -DPADD+= ${LIBIPF} ${LIBKVM} -LDADD+= ${LIBIPF} -lkvm +LIBADD+= ipf CLEANFILES+= y.tab.c y.tab.h diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile index c3938c6..3ffd2b2 100644 --- a/sbin/ipf/ipf/Makefile +++ b/sbin/ipf/ipf/Makefile @@ -35,8 +35,7 @@ ipf_l.h: lexer.h LIBIPF_SRCS!= cd ${.CURDIR}/../libipf && ${MAKE} -V SRCS SRCS+= ${LIBIPF_SRCS} .else -DPADD+= ${LIBPCAP} -LDADD+= -lpcap +LIBADD+= pcap .endif .include <bsd.prog.mk> diff --git a/sbin/ipf/ipfstat/Makefile b/sbin/ipf/ipfstat/Makefile index a33c5df..14823cf 100644 --- a/sbin/ipf/ipfstat/Makefile +++ b/sbin/ipf/ipfstat/Makefile @@ -5,7 +5,6 @@ NOGCCERROR= # defined PROG= ipfstat SRCS= ipfstat.c MAN= ipfstat.8 -DPADD+= ${LIBCURSES} -LDADD+= -lcurses +LIBADD+= ncursesw .include <bsd.prog.mk> diff --git a/sbin/ipf/ipsend/Makefile b/sbin/ipf/ipsend/Makefile index 4ae4c34..176cb10 100644 --- a/sbin/ipf/ipsend/Makefile +++ b/sbin/ipf/ipsend/Makefile @@ -8,8 +8,7 @@ PROG= ipsend SRCS= ipsend.c ip.c ipsopt.c iplang_y.c iplang_l.l sbpf.c \ sock.c 44arp.c MAN= ipsend.1 ipsend.5 -DPADD+= ${LIBL} -LDADD+= -ll +LIBADD+= l CFLAGS+= -I${NETBSDSRCDIR}/dist/ipf/ipsend CFLAGS+= -I${NETBSDSRCDIR}/dist/ipf/iplang |
