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/cpio | |
| 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/cpio')
| -rw-r--r-- | usr.bin/cpio/Makefile | 10 | ||||
| -rw-r--r-- | usr.bin/cpio/test/Makefile | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index 16446c4b4def..72a0e2bd25a1 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -23,15 +23,7 @@ CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe # statically linked, cannot use -lcrypto, and are size sensitive. CFLAGS+= -DSMALLER .endif -DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBBSDXML} -LDADD= -larchive -lz -lbz2 -llzma -lbsdxml -.if ${MK_OPENSSL} != "no" -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto -.else -DPADD+= ${LIBMD} -LDADD+= -lmd -.endif +LIBADD= archive .if ${MK_ICONV} != "no" CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const diff --git a/usr.bin/cpio/test/Makefile b/usr.bin/cpio/test/Makefile index 13293b0b00ee..77c73d7274bb 100644 --- a/usr.bin/cpio/test/Makefile +++ b/usr.bin/cpio/test/Makefile @@ -67,10 +67,9 @@ CLEANFILES+= list.h bsdcpio_test MAN= PROG=bsdcpio_test -DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd.h\" CFLAGS+= -I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR} -LDADD= -larchive -lz -lbz2 -llzma +LIBADD= archive #CFLAGS+= -static -g -O2 -Wall CFLAGS+= -g -O2 -Wall CFLAGS+= -I${.OBJDIR} |