From owner-svn-src-all@FreeBSD.ORG Tue Nov 25 11:07:43 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2005FEA0; Tue, 25 Nov 2014 11:07:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09D577F0; Tue, 25 Nov 2014 11:07:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPB7hkY091668; Tue, 25 Nov 2014 11:07:43 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPB7RUq091572; Tue, 25 Nov 2014 11:07:27 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201411251107.sAPB7RUq091572@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 25 Nov 2014 11:07:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r275024 - in head/lib: atf/libatf-c++ libarchive libarchive/test libbsnmp/libbsnmp libc libc++ libcam libcapsicum libcasper libcrypt/tests libcuse libdevstat libdpv libdwarf libedit lib... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 11:07:43 -0000 Author: bapt Date: Tue Nov 25 11:07:26 2014 New Revision: 275024 URL: https://svnweb.freebsd.org/changeset/base/275024 Log: Convert libraries to use LIBADD While here reduce a bit overlinking Modified: head/lib/atf/libatf-c++/Makefile head/lib/libarchive/Makefile head/lib/libarchive/test/Makefile head/lib/libbsnmp/libbsnmp/Makefile head/lib/libc++/Makefile head/lib/libc/Makefile head/lib/libcam/Makefile head/lib/libcapsicum/Makefile head/lib/libcasper/Makefile head/lib/libcrypt/tests/Makefile head/lib/libcuse/Makefile head/lib/libdevstat/Makefile head/lib/libdpv/Makefile head/lib/libdwarf/Makefile head/lib/libedit/Makefile head/lib/libexecinfo/Makefile head/lib/libfetch/Makefile head/lib/libgeom/Makefile head/lib/libldns/Makefile head/lib/libmagic/Makefile head/lib/libmemstat/Makefile head/lib/libmp/Makefile head/lib/libmp/tests/Makefile head/lib/libnv/tests/Makefile head/lib/libopie/Makefile head/lib/libpam/modules/Makefile.inc head/lib/libpam/modules/pam_krb5/Makefile head/lib/libpam/modules/pam_ksu/Makefile head/lib/libpam/modules/pam_nologin/Makefile head/lib/libpam/modules/pam_opie/Makefile head/lib/libpam/modules/pam_opieaccess/Makefile head/lib/libpam/modules/pam_passwdqc/Makefile head/lib/libpam/modules/pam_radius/Makefile head/lib/libpam/modules/pam_ssh/Makefile head/lib/libpam/modules/pam_tacplus/Makefile head/lib/libpam/modules/pam_unix/Makefile head/lib/libpjdlog/Makefile head/lib/libproc/Makefile head/lib/libprocstat/Makefile head/lib/libradius/Makefile head/lib/librpcsec_gss/Makefile head/lib/librt/Makefile head/lib/librt/tests/Makefile head/lib/libsmb/Makefile head/lib/libsqlite3/Makefile head/lib/libstdthreads/Makefile head/lib/libtacplus/Makefile head/lib/libulog/Makefile head/lib/libunbound/Makefile head/lib/libusb/Makefile head/lib/libutil/tests/Makefile head/lib/msun/tests/Makefile head/lib/ncurses/form/Makefile head/lib/ncurses/menu/Makefile head/lib/ncurses/panel/Makefile Modified: head/lib/atf/libatf-c++/Makefile ============================================================================== --- head/lib/atf/libatf-c++/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/atf/libatf-c++/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -33,8 +33,7 @@ PRIVATELIB= true SHLIB_MAJOR= 2 # libatf-c++ depends on the C version of the ATF library to build. -DPADD= ${LIBATF_C} -LDADD= -latf-c +LIBADD+= atf_c LDFLAGS+= -L${.OBJDIR}/../libatf-c Modified: head/lib/libarchive/Makefile ============================================================================== --- head/lib/libarchive/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libarchive/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -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" Modified: head/lib/libarchive/test/Makefile ============================================================================== --- head/lib/libarchive/test/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libarchive/test/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -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 Modified: head/lib/libbsnmp/libbsnmp/Makefile ============================================================================== --- head/lib/libbsnmp/libbsnmp/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libbsnmp/libbsnmp/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -15,8 +15,7 @@ CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES .if ${MK_OPENSSL} != "no" CFLAGS+= -DHAVE_LIBCRYPTO -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD= crypto .endif SRCS= asn1.c snmp.c snmpagent.c snmpclient.c snmpcrypto.c support.c Modified: head/lib/libc++/Makefile ============================================================================== --- head/lib/libc++/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libc++/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -62,8 +62,7 @@ CFLAGS+= -I${HDRDIR} -I${LIBCXXRTDIR} -n CXXFLAGS+= -std=c++11 .endif -DPADD= ${LIBCXXRT} -LDADD= -lcxxrt +LIBADD+= cxxrt LDFLAGS+= --verbose INCSGROUPS= STD EXP EXT Modified: head/lib/libc/Makefile ============================================================================== --- head/lib/libc/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libc/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -44,13 +44,11 @@ CFLAGS+=${CANCELPOINTS_CFLAGS} # # Link with static libcompiler_rt.a. # -DPADD+= ${LIBCOMPILER_RT} LDFLAGS+= -nodefaultlibs -LDADD+= -lcompiler_rt +LIBADD+= compiler_rt .if ${MK_SSP} != "no" -DPADD+= ${LIBSSP_NONSHARED} -LDADD+= -lssp_nonshared +LIBADD+= ssp_nonshared .endif # Extras that live in either libc.a or libc_nonshared.a Modified: head/lib/libcam/Makefile ============================================================================== --- head/lib/libcam/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libcam/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -6,8 +6,7 @@ SRCS= camlib.c scsi_cmdparse.c scsi_all ata_all.c smp_all.c INCS= camlib.h -DPADD= ${LIBSBUF} -LDADD= -lsbuf +LIBADD= sbuf MAN= cam.3 cam_cdbparse.3 Modified: head/lib/libcapsicum/Makefile ============================================================================== --- head/lib/libcapsicum/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libcapsicum/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -21,8 +21,7 @@ INCS+= libcapsicum_random.h INCS+= libcapsicum_service.h INCS+= libcapsicum_sysctl.h -DPADD= ${LIBNV} -LDADD= -lnv +LIBADD= nv CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../libnv Modified: head/lib/libcasper/Makefile ============================================================================== --- head/lib/libcasper/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libcasper/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -8,8 +8,7 @@ SHLIBDIR?= /lib SRCS= libcasper.c INCS= libcasper.h -DPADD= ${LIBCAPSICUM} ${LIBNV} ${LIBPJDLOG} -LDADD= -lcapsicum -lnv -lpjdlog +LIBADD= capsicum nv pjdlog CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../libpjdlog Modified: head/lib/libcrypt/tests/Makefile ============================================================================== --- head/lib/libcrypt/tests/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libcrypt/tests/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -7,7 +7,6 @@ TESTSDIR= ${TESTSBASE}/lib/libcrypt ATF_TESTS_C= crypt_tests CFLAGS+= -I${.CURDIR:H} -DPADD+= ${LIBCRYPT} -LDADD+= -lcrypt +LIBADD= crypt .include Modified: head/lib/libcuse/Makefile ============================================================================== --- head/lib/libcuse/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libcuse/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -30,14 +30,12 @@ SHLIB_MINOR= 0 SRCS= cuse_lib.c INCS= cuse.h MAN= cuse.3 -PTHREAD_LIBS?= -lpthread CFLAGS+= -D_GNU_SOURCE .if defined(HAVE_DEBUG) CFLAGS+= -g CFLAGS+= -DHAVE_DEBUG .endif -DPADD+= ${LIBPTHREAD} -LDADD+= ${PTHREAD_LIBS} +LIBADD= pthread MLINKS= MLINKS+= cuse.3 cuse_alloc_unit_number.3 Modified: head/lib/libdevstat/Makefile ============================================================================== --- head/lib/libdevstat/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libdevstat/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -7,8 +7,7 @@ SHLIB_MAJOR= 7 SRCS= devstat.c INCS= devstat.h -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm MAN= devstat.3 Modified: head/lib/libdpv/Makefile ============================================================================== --- head/lib/libdpv/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libdpv/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -6,8 +6,7 @@ INCS= dpv.h MAN= dpv.3 MLINKS= dpv.3 dpv_free.3 -DPADD= ${LIBDIALOG} ${LIBFIGPAR} ${LIBNCURSESW} ${LIBUTIL} -LDADD= -ldialog -lfigpar -lncursesw -lutil +LIBADD= dialog figpar util ncursesw SRCS= dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c Modified: head/lib/libdwarf/Makefile ============================================================================== --- head/lib/libdwarf/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libdwarf/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -96,8 +96,7 @@ sys/elf32.h sys/elf64.h sys/elf_common.h mkdir -p ${.OBJDIR}/sys ln -sf ${.CURDIR}/../../sys/${.TARGET} ${.TARGET} -LDADD+= -lelf -DPADD+= ${LIBELF} +LIBADD+= elf SHLIB_MAJOR= 4 Modified: head/lib/libedit/Makefile ============================================================================== --- head/lib/libedit/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libedit/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -10,8 +10,7 @@ OSRCS= chared.c common.c el.c emacs.c fc hist.c key.c map.c \ parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c -DPADD= ${LIBNCURSESW} -LDADD= -lncursesw +LIBADD= ncursesw MAN= editline.3 editrc.5 Modified: head/lib/libexecinfo/Makefile ============================================================================== --- head/lib/libexecinfo/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libexecinfo/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -10,8 +10,7 @@ SHLIB_MAJOR= 1 INCS= execinfo.h SRCS= backtrace.c symtab.c unwind.c -DPADD= ${LIBELF} -LDADD= -lelf +LIBADD= elf MAN= backtrace.3 Modified: head/lib/libfetch/Makefile ============================================================================== --- head/lib/libfetch/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libfetch/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -16,11 +16,9 @@ CFLAGS+= -DINET6 .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_SSL -DPADD= ${LIBSSL} ${LIBCRYPTO} -LDADD= -lssl -lcrypto +LIBADD+= ssl crypto .else -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD+= md .endif CFLAGS+= -DFTP_COMBINE_CWDS Modified: head/lib/libgeom/Makefile ============================================================================== --- head/lib/libgeom/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libgeom/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -13,8 +13,7 @@ CFLAGS += -I${.CURDIR} WARNS?= 3 -DPADD= ${LIBBSDXML} ${LIBSBUF} -LDADD= -lbsdxml -lsbuf +LIBADD+= bsdxml sbuf MAN= libgeom.3 Modified: head/lib/libldns/Makefile ============================================================================== --- head/lib/libldns/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libldns/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -18,8 +18,7 @@ SRCS= buffer.c dane.c dname.c dnssec.c d SRCS+= b64_ntop.c b64_pton.c -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD= crypto WARNS ?= 3 Modified: head/lib/libmagic/Makefile ============================================================================== --- head/lib/libmagic/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libmagic/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -7,8 +7,7 @@ CONTRDIR= ${.CURDIR}/../../contrib/file LIB= magic SHLIB_MAJOR= 4 -DPADD= ${LIBZ} -LDADD= -lz +LIBADD= z MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \ Modified: head/lib/libmemstat/Makefile ============================================================================== --- head/lib/libmemstat/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libmemstat/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -3,8 +3,7 @@ WARNS?= 3 LIB= memstat SHLIB_MAJOR= 3 -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD+= kvm SRCS+= memstat.c SRCS+= memstat_all.c SRCS+= memstat_malloc.c Modified: head/lib/libmp/Makefile ============================================================================== --- head/lib/libmp/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libmp/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -4,8 +4,7 @@ LIB= mp SHLIB_MAJOR= 7 -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto MAN= libmp.3 INCS= mp.h SRCS= mpasbn.c Modified: head/lib/libmp/tests/Makefile ============================================================================== --- head/lib/libmp/tests/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libmp/tests/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -4,7 +4,6 @@ TESTSDIR= ${TESTSBASE}/lib/libmp TAP_TESTS_C+= legacy_test -DPADD+= ${LIBCRYPTO} ${LIBMP} -LDADD+= -lcrypto -lmp +LIBADD+= mp .include Modified: head/lib/libnv/tests/Makefile ============================================================================== --- head/lib/libnv/tests/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libnv/tests/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -9,8 +9,7 @@ TAP_TESTS_C+= nvlist_get_test TAP_TESTS_C+= nvlist_move_test TAP_TESTS_C+= nvlist_send_recv_test -DPADD+= ${LIBNV} -LDADD+= -lnv +LIBADD+= nv WARNS?= 6 Modified: head/lib/libopie/Makefile ============================================================================== --- head/lib/libopie/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libopie/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -27,8 +27,7 @@ CFLAGS+= -DINSECURE_OVERRIDE -DPATH_ACCE WARNS?= 0 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md MAN= ${OPIE_DIST}/opie.4 ${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5 Modified: head/lib/libpam/modules/Makefile.inc ============================================================================== --- head/lib/libpam/modules/Makefile.inc Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpam/modules/Makefile.inc Tue Nov 25 11:07:26 2014 (r275024) @@ -14,8 +14,7 @@ CFLAGS+= -I${PAMDIR}/include -I${.CURDIR NO_PIC= .else SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} -DPADD+= ${LIBPAM} -LDADD+= -lpam +LIBADD+= pam .endif .include "../Makefile.inc" Modified: head/lib/libpam/modules/pam_krb5/Makefile ============================================================================== --- head/lib/libpam/modules/pam_krb5/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpam/modules/pam_krb5/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -32,7 +32,6 @@ CFLAGS+=-D_FREEFALL_CONFIG WARNS?= 3 .endif -DPADD= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} -LDADD= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto +LIBADD+= krb5 .include Modified: head/lib/libpam/modules/pam_ksu/Makefile ============================================================================== --- head/lib/libpam/modules/pam_ksu/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpam/modules/pam_ksu/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -28,7 +28,6 @@ LIB= pam_ksu SRCS= pam_ksu.c MAN= pam_ksu.8 -DPADD= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} -LDADD= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto +LIBADD+= krb5 .include Modified: head/lib/libpam/modules/pam_nologin/Makefile ============================================================================== --- head/lib/libpam/modules/pam_nologin/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpam/modules/pam_nologin/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -28,7 +28,6 @@ LIB= pam_nologin SRCS= pam_nologin.c MAN= pam_nologin.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD+= util .include Modified: head/lib/libpam/modules/pam_opie/Makefile ============================================================================== --- head/lib/libpam/modules/pam_opie/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpam/modules/pam_opie/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -29,7 +29,6 @@ LIB= pam_opie SRCS= pam_opie.c MAN= pam_opie.8 -DPADD= ${LIBOPIE} -LDADD= -lopie +LIBADD+= opie .include Modified: head/lib/libpam/modules/pam_opieaccess/Makefile ============================================================================== --- head/lib/libpam/modules/pam_opieaccess/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpam/modules/pam_opieaccess/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -4,7 +4,6 @@ LIB= pam_opieaccess SRCS= ${LIB}.c MAN= pam_opieaccess.8 -DPADD= ${LIBOPIE} -LDADD= -lopie +LIBADD+= opie .include Modified: head/lib/libpam/modules/pam_passwdqc/Makefile ============================================================================== --- head/lib/libpam/modules/pam_passwdqc/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpam/modules/pam_passwdqc/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -10,8 +10,7 @@ MAN= pam_passwdqc.8 WARNS?= 2 CFLAGS+= -I${SRCDIR} -DPADD= ${LIBCRYPT} -LDADD= -lcrypt +LIBADD+= crypt .include Modified: head/lib/libpam/modules/pam_radius/Makefile ============================================================================== --- head/lib/libpam/modules/pam_radius/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpam/modules/pam_radius/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -29,7 +29,6 @@ SRCS= pam_radius.c MAN= pam_radius.8 WARNS?= 3 -DPADD= ${LIBRADIUS} -LDADD= -lradius +LIBADD+= radius .include Modified: head/lib/libpam/modules/pam_ssh/Makefile ============================================================================== --- head/lib/libpam/modules/pam_ssh/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpam/modules/pam_ssh/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -13,9 +13,7 @@ SRCS+= roaming_dummy.c WARNS?= 3 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h -DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} -LDADD= ${LDSSH} -lcrypto -lcrypt -USEPRIVATELIB= ssh +LIBADD= ssh .include Modified: head/lib/libpam/modules/pam_tacplus/Makefile ============================================================================== --- head/lib/libpam/modules/pam_tacplus/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpam/modules/pam_tacplus/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -28,7 +28,6 @@ LIB= pam_tacplus SRCS= pam_tacplus.c MAN= pam_tacplus.8 -DPADD= ${LIBTACPLUS} -LDADD= -ltacplus +LIBADD+= tacplus .include Modified: head/lib/libpam/modules/pam_unix/Makefile ============================================================================== --- head/lib/libpam/modules/pam_unix/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpam/modules/pam_unix/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -41,13 +41,11 @@ LIB= pam_unix SRCS= pam_unix.c MAN= pam_unix.8 -DPADD+= ${LIBUTIL} ${LIBCRYPT} -LDADD+= -lutil -lcrypt +LIBADD+= util crypt .if ${MK_NIS} != "no" CFLAGS+= -DYP -DPADD+= ${LIBYPCLNT} -LDADD+= -lypclnt +LIBADD+= ypclnt .endif .include Modified: head/lib/libpjdlog/Makefile ============================================================================== --- head/lib/libpjdlog/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libpjdlog/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -13,8 +13,7 @@ SHLIB_MAJOR= 0 CFLAGS+=-I${.CURDIR} -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 6 Modified: head/lib/libproc/Makefile ============================================================================== --- head/lib/libproc/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libproc/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -18,16 +18,13 @@ CFLAGS+= -I${.CURDIR} .if ${MK_CXX} == "no" CFLAGS+= -DNO_CXA_DEMANGLE .elif ${MK_LIBCPLUSPLUS} != "no" -LDADD+= -lcxxrt -DPADD+= ${LIBCXXRT} +LIBADD+= cxxrt .else -LDADD+= -lsupc++ -DPADD+= ${LIBSTDCPLUSPLUS} +LIBADD+= supcplusplus .endif .if ${MK_CDDL} != "no" -LDADD+= -lctf -DPADD+= ${LIBCTF} +LIBADD+= ctf IGNORE_PRAGMA= YES CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \ -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \ Modified: head/lib/libprocstat/Makefile ============================================================================== --- head/lib/libprocstat/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libprocstat/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -19,8 +19,7 @@ INCS= libprocstat.h CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE SHLIB_MAJOR= 1 -DPADD= ${LIBELF} ${LIBKVM} ${LIBUTIL} -LDADD= -lelf -lkvm -lutil +LIBADD= elf kvm util MAN= libprocstat.3 Modified: head/lib/libradius/Makefile ============================================================================== --- head/lib/libradius/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libradius/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -70,13 +70,11 @@ MLINKS+=libradius.3 rad_acct_open.3 \ WARNS?= 3 -.if ${MK_OPENSSL} == "no" -DPADD= ${LIBMD} -LDADD= -lmd -.else -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +.if ${MK_OPENSSL} != "no" +LIBADD+= crypto CFLAGS+= -DWITH_SSL +.else +LIBADD+= md .endif .include Modified: head/lib/librpcsec_gss/Makefile ============================================================================== --- head/lib/librpcsec_gss/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/librpcsec_gss/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -5,8 +5,7 @@ SHLIB_MAJOR= 1 SRCS+= rpcsec_gss.c rpcsec_gss_prot.c rpcsec_gss_conf.c rpcsec_gss_misc.c \ svc_rpcsec_gss.c -DPADD+= ${LIBGSSAPI} -LDADD+= -lgssapi +LIBADD= gssapi VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map Modified: head/lib/librt/Makefile ============================================================================== --- head/lib/librt/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/librt/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -9,8 +9,7 @@ CFLAGS+=-I${.CURDIR}/../libc/include -I$ CFLAGS+=-fexceptions .endif CFLAGS+=-Winline -Wall -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread WARNS?= 2 Modified: head/lib/librt/tests/Makefile ============================================================================== --- head/lib/librt/tests/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/librt/tests/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -6,8 +6,7 @@ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/ TESTSDIR= ${TESTSBASE}/lib/librt -DPADD+= ${LIBRT} -LDADD+= -lrt +LIBADD= rt NETBSD_ATF_TESTS_C= sched_test NETBSD_ATF_TESTS_C+= sem_test Modified: head/lib/libsmb/Makefile ============================================================================== --- head/lib/libsmb/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libsmb/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -7,8 +7,7 @@ CONTRIBDIR= ${.CURDIR}/../../contrib/smb LIB= smb SHLIB_MAJOR= 4 -DPADD= ${LIBKICONV} -LDADD= -lkiconv +LIBADD= kiconv SRCS= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \ print.c \ Modified: head/lib/libsqlite3/Makefile ============================================================================== --- head/lib/libsqlite3/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libsqlite3/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -3,6 +3,7 @@ PRIVATELIB= yes LIB= sqlite3 SHLIB_MAJOR?= 0 +LIBADD+= pthreads SRCS= sqlite3.c Modified: head/lib/libstdthreads/Makefile ============================================================================== --- head/lib/libstdthreads/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libstdthreads/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -32,8 +32,7 @@ MLINKS= thrd_create.3 call_once.3 \ thrd_create.3 tss_get.3 \ thrd_create.3 tss_set.3 -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map Modified: head/lib/libtacplus/Makefile ============================================================================== --- head/lib/libtacplus/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libtacplus/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -28,8 +28,7 @@ LIB= tacplus SRCS= taclib.c INCS= taclib.h CFLAGS+= -Wall -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md SHLIB_MAJOR= 5 MAN= libtacplus.3 tacplus.conf.5 Modified: head/lib/libulog/Makefile ============================================================================== --- head/lib/libulog/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libulog/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -19,8 +19,7 @@ MLINKS+=ulog_login.3 ulog_login_pseudo.3 utempter_remove_added_record.3 removeFromUtmp.3 \ utempter_remove_record.3 removeLineFromUtmp.3 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map Modified: head/lib/libunbound/Makefile ============================================================================== --- head/lib/libunbound/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libunbound/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -28,8 +28,7 @@ SRCS= alloc.c autotrust.c config_file.c WARNS?= 3 -DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD+= -lssl -lcrypto -lpthread +LIBADD= ssl crypto pthread # Misnamed file in upstream source configlexer.l: configlexer.lex Modified: head/lib/libusb/Makefile ============================================================================== --- head/lib/libusb/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libusb/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -19,8 +19,7 @@ PTHREAD_LIBS?= -lpthread WARNS?= 2 -DPADD= ${LIBPTHREAD} -LDADD= ${PTHREAD_LIBS} +LIBADD= pthread MLINKS+= libusb.3 usb.3 Modified: head/lib/libutil/tests/Makefile ============================================================================== --- head/lib/libutil/tests/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/libutil/tests/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -9,7 +9,6 @@ TAP_TESTS_C+= pidfile_test TAP_TESTS_C+= trimdomain_test TAP_TESTS_C+= trimdomain-nodomain_test -DPADD+= ${LIBUTIL} -LDADD+= -lutil +LIBADD+= util .include Modified: head/lib/msun/tests/Makefile ============================================================================== --- head/lib/msun/tests/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/msun/tests/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -41,8 +41,7 @@ NETBSD_ATF_TESTS_C+= tanh_test CSTD= c99 -LDADD+= -lm -DPADD+= ${LIBM} +LIBADD+= m #COPTS+= -Wfloat-equal # Copied from lib/msun/Makefile Modified: head/lib/ncurses/form/Makefile ============================================================================== --- head/lib/ncurses/form/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/ncurses/form/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -54,8 +54,7 @@ CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} CFLAGS+= -I${NCURSES_DIR}/menu -DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} -LDADD= -lncurses${LIB_SUFFIX} +LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= form.h Modified: head/lib/ncurses/menu/Makefile ============================================================================== --- head/lib/ncurses/menu/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/ncurses/menu/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -40,8 +40,7 @@ CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} -DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} -LDADD= -lncurses${LIB_SUFFIX} +LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= menu.h eti.h Modified: head/lib/ncurses/panel/Makefile ============================================================================== --- head/lib/ncurses/panel/Makefile Tue Nov 25 11:07:03 2014 (r275023) +++ head/lib/ncurses/panel/Makefile Tue Nov 25 11:07:26 2014 (r275024) @@ -29,8 +29,7 @@ CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} -DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} -LDADD= -lncurses${LIB_SUFFIX} +LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= panel.h