diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-11-25 14:29:10 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-11-25 14:29:10 +0000 |
| commit | 3e11bd9e2a2b1cbd4283c87c93e3cc75e3f2dacb (patch) | |
| tree | ddfef911600b923ca0abdbed4461a288b9249837 /usr.bin/grep | |
| parent | 30fca3b0cc92ae380073c169d34b4cc3f27321e9 (diff) | |
| download | src-3e11bd9e2a2b1cbd4283c87c93e3cc75e3f2dacb.tar.gz src-3e11bd9e2a2b1cbd4283c87c93e3cc75e3f2dacb.zip | |
Convert to usr.bin/ to LIBADD
Reduce overlinking
Notes
Notes:
svn path=/head/; revision=275042
Diffstat (limited to 'usr.bin/grep')
| -rw-r--r-- | usr.bin/grep/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index 32941fd4ba4a..7dfde1409c40 100644 --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -40,12 +40,10 @@ MLINKS= grep.1 egrep.1 \ grep.1 lzfgrep.1 .endif -LDADD= -lz -DPADD= ${LIBZ} +LIBADD= z .if ${MK_LZMA_SUPPORT} != "no" -LDADD+= -llzma -DPADD+= ${LIBLZMA} +LIBADD+= lzma LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \ ${BINDIR}/${PROG} ${BINDIR}/xzegrep \ @@ -58,8 +56,7 @@ CFLAGS+= -DWITHOUT_LZMA .endif .if ${MK_BZIP2_SUPPORT} != "no" -LDADD+= -lbz2 -DPADD+= ${LIBBZ2} +LIBADD+= bz2 .if ${MK_BSD_GREP} == "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \ @@ -75,8 +72,7 @@ CFLAGS+= -DWITHOUT_BZIP2 .if ${MK_GNU_GREP_COMPAT} != "no" CFLAGS+= -I${DESTDIR}/usr/include/gnu -LDADD+= -lgnuregex -DPADD+= ${LIBGNUREGEX} +LIBADD+= gnuregex .endif .if ${MK_NLS} != "no" |