[src/trunk]: src - Change LDADD/DPADD in library dependencies to LIBDPLIBS

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src - Change LDADD/DPADD in library dependencies to LIBDPLIBS
From: christos <christos%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 19:50:50 +0000
details:   https://anonhg.NetBSD.org/src/rev/a98652eda8d0
branches:  trunk
changeset: 342693:a98652eda8d0
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jan 05 13:07:46 2016 +0000

description:
- Change LDADD/DPADD in library dependencies to LIBDPLIBS
- Fix some LDADD abuse and remove useless dependencies
- include <bsd.init.mk> in the right place where appropriate
>From Rin Okuyama

diffstat:

 external/bsd/blacklist/lib/Makefile             |   7 ++++---
 external/bsd/elftoolchain/lib/libdwarf/Makefile |   3 +--
 external/bsd/fetch/lib/Makefile                 |   4 +---
 external/bsd/libc++/lib/Makefile                |   4 ++--
 external/gpl2/lvm2/lib/liblvm/Makefile          |   4 +---
 external/gpl3/gcc.old/lib/libtsan/Makefile      |   6 +++---
 external/gpl3/gcc/lib/libtsan/Makefile          |   6 +++---
 external/mit/xorg/lib/libfontenc/Makefile       |   5 ++---
 external/mit/xorg/lib/libglut/Makefile          |   5 ++---
 external/mit/xorg/lib/libpciaccess/Makefile     |  12 +++++-------
 external/public-domain/xz/lib/Makefile          |   8 ++++----
 lib/libnpf/Makefile                             |   4 +---
 sys/rump/kern/lib/libsljit/Makefile             |   6 ++++--
 13 files changed, 33 insertions(+), 41 deletions(-)

diffs (263 lines):

diff -r 8fd107c57d61 -r a98652eda8d0 external/bsd/blacklist/lib/Makefile
--- a/external/bsd/blacklist/lib/Makefile       Tue Jan 05 13:00:29 2016 +0000
+++ b/external/bsd/blacklist/lib/Makefile       Tue Jan 05 13:07:46 2016 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2015/12/30 17:57:20 christos Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/05 13:07:46 christos Exp $
+
+.include <bsd.own.mk>
 
 USE_SHLIBDIR=   yes
 
 CPPFLAGS+=-D_REENTRANT
-DPADD+=${LIBPTHREAD}
-LDADD+=-lpthread
+LIBDPLIBS+=pthread ${NETBSDSRCDIR}/lib/libpthread
 LIB=blacklist
 SRCS=bl.c blacklist.c
 MAN=libblacklist.3
diff -r 8fd107c57d61 -r a98652eda8d0 external/bsd/elftoolchain/lib/libdwarf/Makefile
--- a/external/bsd/elftoolchain/lib/libdwarf/Makefile   Tue Jan 05 13:00:29 2016 +0000
+++ b/external/bsd/elftoolchain/lib/libdwarf/Makefile   Tue Jan 05 13:07:46 2016 +0000
@@ -84,8 +84,7 @@
 CLEANFILES=    ${GENSRCS}
 CPPFLAGS+=     -I. -I${SRCDIR} -I${TOP}/common -I${TOP}/libelf
 
-LDADD+=                -lelf
-DPADD+=                ${LIBELF}
+LIBDPLIBS+=    elf ${.CURDIR}/../libelf
 
 SHLIB_MAJOR=   1
 SHLIB_MINOR=   0
diff -r 8fd107c57d61 -r a98652eda8d0 external/bsd/fetch/lib/Makefile
--- a/external/bsd/fetch/lib/Makefile   Tue Jan 05 13:00:29 2016 +0000
+++ b/external/bsd/fetch/lib/Makefile   Tue Jan 05 13:07:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/17 09:20:14 christos Exp $
+# $NetBSD: Makefile,v 1.9 2016/01/05 13:07:46 christos Exp $
 
 LIB=           fetch
 SRCS=          fetch.c common.c ftp.c http.c file.c
@@ -18,8 +18,6 @@
 .if (${MKCRYPTO} != "no")
 CPPFLAGS+=     -DWITH_SSL
 
-LDADD=         -lssl -lcrypto
-
 LIBDPLIBS+=    ssl     ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl \
                crypto  ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
 .endif
diff -r 8fd107c57d61 -r a98652eda8d0 external/bsd/libc++/lib/Makefile
--- a/external/bsd/libc++/lib/Makefile  Tue Jan 05 13:00:29 2016 +0000
+++ b/external/bsd/libc++/lib/Makefile  Tue Jan 05 13:07:46 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2014/08/20 15:19:39 joerg Exp $
+#      $NetBSD: Makefile,v 1.8 2016/01/05 13:07:46 christos Exp $
 
 LIB=           c++
 WARNS=         4
@@ -44,6 +44,6 @@
 CWARNFLAGS.clang+=     -Wno-error=missing-field-initializers -Wno-error=switch
 CWARNFLAGS.clang+=     -Wno-error=implicit-exception-spec-mismatch
 
-LDADD+=        -Wl,-z,defs
+LDFLAGS+=      -Wl,-z,defs
 
 .include <bsd.lib.mk>
diff -r 8fd107c57d61 -r a98652eda8d0 external/gpl2/lvm2/lib/liblvm/Makefile
--- a/external/gpl2/lvm2/lib/liblvm/Makefile    Tue Jan 05 13:00:29 2016 +0000
+++ b/external/gpl2/lvm2/lib/liblvm/Makefile    Tue Jan 05 13:07:46 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2014/01/14 19:58:19 christos Exp $
+#      $NetBSD: Makefile,v 1.8 2016/01/05 13:07:46 christos Exp $
 
 LIBISPRIVATE=  yes
 
@@ -43,8 +43,6 @@
                filter_netbsd.c snapshot.c mirrored.c dev_manager.c fs.c dev.c \
                lvm-globals.c
 
-LDADD+=                -lprop
-
 .PATH: ${LVM2_DISTDIR}/lib/
 .PATH: ${LVM2_DISTDIR}/lib/activate
 .PATH: ${LVM2_DISTDIR}/lib/cache
diff -r 8fd107c57d61 -r a98652eda8d0 external/gpl3/gcc.old/lib/libtsan/Makefile
--- a/external/gpl3/gcc.old/lib/libtsan/Makefile        Tue Jan 05 13:00:29 2016 +0000
+++ b/external/gpl3/gcc.old/lib/libtsan/Makefile        Tue Jan 05 13:07:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2015/09/23 03:03:39 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/05 13:07:46 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -61,7 +61,7 @@
 SRCS=  ${TSAN_SRCS} ${INTERCEPTION_SRCS} ${SANITIZER_SRCS}
 CPPFLAGS+=-I${TSAN}/include -I${TSAN}
 
-LDADD+=        -lstdc++ -lpthread
-DPADD+= ${LIBSTDCXX} ${LIBPTHREAD}
+LIBDPLIBS+=    stdc++  ${.CURDIR}/../libstdc++-v3 \
+               pthread ${NETBSDSRCDIR}/lib/libpthread
 
 .include <bsd.lib.mk>
diff -r 8fd107c57d61 -r a98652eda8d0 external/gpl3/gcc/lib/libtsan/Makefile
--- a/external/gpl3/gcc/lib/libtsan/Makefile    Tue Jan 05 13:00:29 2016 +0000
+++ b/external/gpl3/gcc/lib/libtsan/Makefile    Tue Jan 05 13:07:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/01/07 03:49:13 christos Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/05 13:07:46 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -61,7 +61,7 @@
 SRCS=  ${TSAN_SRCS} ${INTERCEPTION_SRCS} ${SANITIZER_SRCS}
 CPPFLAGS+=-I${TSAN}/include -I${TSAN}
 
-LDADD+=        -lstdc++ -lpthread
-DPADD+= ${LIBSTDCXX} ${LIBPTHREAD}
+LIBDPLIBS+=    stdc++  ${.CURDIR}/../libstdc++-v3 \
+               pthread ${NETBSDSRCDIR}/lib/libpthread
 
 .include <bsd.lib.mk>
diff -r 8fd107c57d61 -r a98652eda8d0 external/mit/xorg/lib/libfontenc/Makefile
--- a/external/mit/xorg/lib/libfontenc/Makefile Tue Jan 05 13:00:29 2016 +0000
+++ b/external/mit/xorg/lib/libfontenc/Makefile Tue Jan 05 13:07:46 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2008/09/13 04:32:31 cube Exp $
+#      $NetBSD: Makefile,v 1.3 2016/01/05 13:07:46 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -15,8 +15,7 @@
 CPPFLAGS+=     -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\"
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/fonts
 
-LDADD+=        -lz
-DPADD+=        ${LIBZ}
+LIBDPLIBS+=    z ${NETBSDSRCDIR}/lib/libz
 
 PKGCONFIG=     fontenc
 
diff -r 8fd107c57d61 -r a98652eda8d0 external/mit/xorg/lib/libglut/Makefile
--- a/external/mit/xorg/lib/libglut/Makefile    Tue Jan 05 13:00:29 2016 +0000
+++ b/external/mit/xorg/lib/libglut/Makefile    Tue Jan 05 13:07:46 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2010/11/22 21:05:29 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2016/01/05 13:07:47 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -69,8 +69,7 @@
                GL      ${.CURDIR}/../libGL \
                GLU     ${.CURDIR}/../libGLU
 
-LDADD+=                -lm
-DPADD+=                ${LIBM}
+LIBDPLIBS+=    m ${NETBSDSRCDIR}/lib/libm
 
 PKGCONFIG=     glut
 PKGDIST.glut=  ${X11SRCDIR.MesaGLUT}/src/glut/glx
diff -r 8fd107c57d61 -r a98652eda8d0 external/mit/xorg/lib/libpciaccess/Makefile
--- a/external/mit/xorg/lib/libpciaccess/Makefile       Tue Jan 05 13:00:29 2016 +0000
+++ b/external/mit/xorg/lib/libpciaccess/Makefile       Tue Jan 05 13:07:46 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2015/06/24 22:20:25 matt Exp $
+#      $NetBSD: Makefile,v 1.8 2016/01/05 13:07:47 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -30,21 +30,19 @@
 
 PKGDIST=       ${LIB}
 
-LDADD+=        -lpci -lz
-DPADD+=        ${LIBPCI} ${LIBZ}
+LIBDPLIBS+=    pci     ${NETBSDSRCDIR}/lib/libpci \
+               z       ${NETBSDSRCDIR}/lib/libz
 
 .if ${XORG_MACHINE_ARCH} == "i386" || ${XORG_MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=     -DHAVE_MTRR
 .endif
 
 .if ${XORG_MACHINE_ARCH} == "i386"
-LDADD+=        -li386
-DPADD+=        ${LIBI386}
+LIBDPLIBS+=    i386 ${NETBSDSRCDIR}/lib/libarch
 .endif
 
 .if ${XORG_MACHINE_ARCH} == "x86_64"
-LDADD+=        -lx86_64
-DPADD+=        ${LIBX86_64}
+LIBDPLIBS+=    x86_64 ${NETBSDSRCDIR}/lib/libarch
 .endif
 
 .include <bsd.x11.mk>
diff -r 8fd107c57d61 -r a98652eda8d0 external/public-domain/xz/lib/Makefile
--- a/external/public-domain/xz/lib/Makefile    Tue Jan 05 13:00:29 2016 +0000
+++ b/external/public-domain/xz/lib/Makefile    Tue Jan 05 13:07:46 2016 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2015/04/17 20:12:45 christos Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/05 13:07:47 christos Exp $
+
+.include <bsd.init.mk>
 
 LIB=           lzma
 USE_SHLIBDIR=  yes
 NOLINT=                yes
 
-.include <bsd.init.mk>
 
 .PATH: ${XZSRCDIR}/src/liblzma/api ${XZSRCDIR}/src/liblzma/api/lzma
 INCS+= base.h bcj.h block.h check.h container.h delta.h \
@@ -85,7 +86,6 @@
 
 CLEANFILES+=   liblzma.pc
 
-LDADD+=        -lpthread
-DPADD+=        ${LIBPTHREAD}
+LIBDPLIBS+=    pthread ${NETBSDSRCDIR}/lib/libpthread
 
 .include <bsd.lib.mk>
diff -r 8fd107c57d61 -r a98652eda8d0 lib/libnpf/Makefile
--- a/lib/libnpf/Makefile       Tue Jan 05 13:00:29 2016 +0000
+++ b/lib/libnpf/Makefile       Tue Jan 05 13:07:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/07/22 22:28:47 christos Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/05 13:07:47 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -13,8 +13,6 @@
 INCSDIR=       /usr/include
 
 LIBDPLIBS+=    prop ${.CURDIR}/../libprop
-LDADD+=                -lprop
-DPADD+=                ${LIBPROP}
 
 WARNS=         5
 NOLINT=                # disabled deliberately
diff -r 8fd107c57d61 -r a98652eda8d0 sys/rump/kern/lib/libsljit/Makefile
--- a/sys/rump/kern/lib/libsljit/Makefile       Tue Jan 05 13:00:29 2016 +0000
+++ b/sys/rump/kern/lib/libsljit/Makefile       Tue Jan 05 13:07:46 2016 +0000
@@ -1,8 +1,10 @@
-#      $NetBSD: Makefile,v 1.4 2015/10/19 16:16:37 pooka Exp $
+#      $NetBSD: Makefile,v 1.5 2016/01/05 13:07:47 christos Exp $
 #
 # Public Domain.
 #
 
+.include <bsd.init.mk>
+
 .PATH: ${.CURDIR}/../../../../external/bsd/sljit/sljit \
        ${.CURDIR}/../../../../external/bsd/sljit/dist/sljit_src
 
@@ -33,7 +35,7 @@
 RUMPCOMP_USER_CPPFLAGS=-I${RUMPCOMP_INCS_DIR}
 
 # Link to libarm to get arm_sync_icache(2)
-LDADD+=        -larm
+LIBDPLIBS+=    arm ${NETBSDSRCDIR}/lib/libarch
 .endif
 
 .include <bsd.lib.mk>
Prev by Date: [src/trunk]: src/share/man/man4 Add Mt macro.
Next by Date: [src/trunk]: src/sys/dev/raidframe revert bp->b_error checking; biowait() is ...
Previous by Thread: [src/trunk]: src/share/man/man4 Add Mt macro.
Next by Thread: [src/trunk]: src/sys/dev/raidframe revert bp->b_error checking; biowait() is ...
Indexes:
Home | Main Index | Thread Index | Old Index