diff options
| author | bapt <bapt@FreeBSD.org> | 2014-11-25 11:07:26 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-11-25 11:07:26 +0000 |
| commit | 6adce30d288e6c89f9247b8bced6dc1382b72c8f (patch) | |
| tree | 9490af12e8dfdddce4107ac3a4cefe6c56ba0614 /lib/libarchive | |
| parent | 1578ed600d5f0f7553eff58b014cf5f74141ebcd (diff) | |
| download | FreeBSD-src-6adce30d288e6c89f9247b8bced6dc1382b72c8f.zip FreeBSD-src-6adce30d288e6c89f9247b8bced6dc1382b72c8f.tar.gz | |
Convert libraries to use LIBADD
While here reduce a bit overlinking
Diffstat (limited to 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/Makefile | 20 | ||||
| -rw-r--r-- | lib/libarchive/test/Makefile | 3 |
2 files changed, 5 insertions, 18 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index b7e9d7f..2542a20 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -4,19 +4,9 @@ LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIB= archive -DPADD= ${LIBZ} -LDADD= -lz -DPADD+= ${LIBBZ2} -LDADD+= -lbz2 -CFLAGS+= -DHAVE_BZLIB_H=1 - -DPADD+= ${LIBLZMA} -LDADD+= -llzma -CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 - -DPADD+= ${LIBBSDXML} -LDADD+= -lbsdxml +LIBADD= z bz2 lzma bsdxml +CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. @@ -27,11 +17,9 @@ CFLAGS+= -I${.OBJDIR} .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto .else -DPADD+= ${LIBMD} -LDADD+= -lmd +LIBADD+= md .endif .if ${MK_ICONV} != "no" diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile index 16a485a..80d6dd4 100644 --- a/lib/libarchive/test/Makefile +++ b/lib/libarchive/test/Makefile @@ -6,9 +6,8 @@ MAN= PROG=libarchive_test INTERNALPROG=yes # Don't install this; it's just for testing -DPADD=${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBCRYPTO} ${LIBBSDXML} LDADD= -L ${.OBJDIR}/.. -larchive -LDADD+= -lz -lbz2 -llzma -lmd -lcrypto -lbsdxml +LIBADD= z bz2 lzma md crypto bsdxml CFLAGS+= -g CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR} CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/test_utils |
