diff options
| author | dim <dim@FreeBSD.org> | 2016-02-24 21:38:51 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-02-24 21:38:51 +0000 |
| commit | 7ef26dcde64aff82cf88b8e9354f8000fdf1b1c8 (patch) | |
| tree | 093f0dab43c9b41b5442d7a487fbbf387d5e7a2c /tools | |
| parent | 234d55af8b6e6a323f480cc9c25a31d2cd7ea81d (diff) | |
| parent | c9f48b7d63385be81574c190e92e621b2b6570a3 (diff) | |
| download | FreeBSD-src-7ef26dcde64aff82cf88b8e9354f8000fdf1b1c8.zip FreeBSD-src-7ef26dcde64aff82cf88b8e9354f8000fdf1b1c8.tar.gz | |
Merge ^/head r295902 through r296006.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools/ath/ath_ee_9300_print/Makefile.depend | 2 | ||||
| -rw-r--r-- | tools/tools/net80211/w00t/Makefile.inc | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/tools/ath/ath_ee_9300_print/Makefile.depend b/tools/tools/ath/ath_ee_9300_print/Makefile.depend index f4dfeaf..cda9eb2 100644 --- a/tools/tools/ath/ath_ee_9300_print/Makefile.depend +++ b/tools/tools/ath/ath_ee_9300_print/Makefile.depend @@ -14,6 +14,4 @@ DIRDEPS = \ .if ${DEP_RELDIR} == ${_DEP_RELDIR} # local dependencies - needed for -jN in clean tree -main.o: opt_ah.h -main.po: opt_ah.h .endif diff --git a/tools/tools/net80211/w00t/Makefile.inc b/tools/tools/net80211/w00t/Makefile.inc index 11079d3..34eddd9 100644 --- a/tools/tools/net80211/w00t/Makefile.inc +++ b/tools/tools/net80211/w00t/Makefile.inc @@ -2,9 +2,10 @@ W00T= ../libw00t # NB: we get crc32 from -lz -DPADD= ${W00T}/libw00t.a ${LIBCRYPTO} ${LIBZ} +DPADD= ${W00T}/libw00t.a LDFLAGS= -L${W00T} -LDADD= -lw00t -lcrypto -lz +LDADD= -lw00t +LIBADD+= crypto z BINDIR= /usr/local/bin CFLAGS= -g -I${W00T} |
