Module Name: src
Committed By: christos
Date: Tue Jan 5 13:07:47 UTC 2016
Modified Files:
src/external/bsd/blacklist/lib: Makefile
src/external/bsd/elftoolchain/lib/libdwarf: Makefile
src/external/bsd/fetch/lib: Makefile
src/external/bsd/libc++/lib: Makefile
src/external/gpl2/lvm2/lib/liblvm: Makefile
src/external/gpl3/gcc.old/lib/libtsan: Makefile
src/external/gpl3/gcc/lib/libtsan: Makefile
src/external/mit/xorg/lib/libfontenc: Makefile
src/external/mit/xorg/lib/libglut: Makefile
src/external/mit/xorg/lib/libpciaccess: Makefile
src/external/public-domain/xz/lib: Makefile
src/lib/libnpf: Makefile
src/sys/rump/kern/lib/libsljit: Makefile
Log Message:
- 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
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/blacklist/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftoolchain/lib/libdwarf/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/fetch/lib/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libc++/lib/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl2/lvm2/lib/liblvm/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc.old/lib/libtsan/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libtsan/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libfontenc/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libglut/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libpciaccess/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/xz/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/lib/libnpf/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/kern/lib/libsljit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/blacklist/lib/Makefile
diff -u src/external/bsd/blacklist/lib/Makefile:1.5 src/external/bsd/blacklist/lib/Makefile:1.6
--- src/external/bsd/blacklist/lib/Makefile:1.5 Wed Dec 30 12:57:20 2015
+++ src/external/bsd/blacklist/lib/Makefile Tue Jan 5 08:07:46 2016
@@ -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
Index: src/external/bsd/elftoolchain/lib/libdwarf/Makefile
diff -u src/external/bsd/elftoolchain/lib/libdwarf/Makefile:1.2 src/external/bsd/elftoolchain/lib/libdwarf/Makefile:1.3
--- src/external/bsd/elftoolchain/lib/libdwarf/Makefile:1.2 Sun Mar 9 14:11:37 2014
+++ src/external/bsd/elftoolchain/lib/libdwarf/Makefile Tue Jan 5 08:07:46 2016
@@ -84,8 +84,7 @@ GENSRCS= dwarf_pubnames.c dwarf_pubtypes
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
Index: src/external/bsd/fetch/lib/Makefile
diff -u src/external/bsd/fetch/lib/Makefile:1.8 src/external/bsd/fetch/lib/Makefile:1.9
--- src/external/bsd/fetch/lib/Makefile:1.8 Wed Aug 17 05:20:14 2011
+++ src/external/bsd/fetch/lib/Makefile Tue Jan 5 08:07:46 2016
@@ -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 @@ CPPFLAGS+= -DINET6
.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
Index: src/external/bsd/libc++/lib/Makefile
diff -u src/external/bsd/libc++/lib/Makefile:1.7 src/external/bsd/libc++/lib/Makefile:1.8
--- src/external/bsd/libc++/lib/Makefile:1.7 Wed Aug 20 11:19:39 2014
+++ src/external/bsd/libc++/lib/Makefile Tue Jan 5 08:07:46 2016
@@ -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-pr
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>
Index: src/external/gpl2/lvm2/lib/liblvm/Makefile
diff -u src/external/gpl2/lvm2/lib/liblvm/Makefile:1.7 src/external/gpl2/lvm2/lib/liblvm/Makefile:1.8
--- src/external/gpl2/lvm2/lib/liblvm/Makefile:1.7 Tue Jan 14 14:58:19 2014
+++ src/external/gpl2/lvm2/lib/liblvm/Makefile Tue Jan 5 08:07:46 2016
@@ -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 @@ SRCS+= activate.c lvmcache.c toolcontex
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
Index: src/external/gpl3/gcc.old/lib/libtsan/Makefile
diff -u src/external/gpl3/gcc.old/lib/libtsan/Makefile:1.1.1.1 src/external/gpl3/gcc.old/lib/libtsan/Makefile:1.2
--- src/external/gpl3/gcc.old/lib/libtsan/Makefile:1.1.1.1 Tue Sep 22 23:03:39 2015
+++ src/external/gpl3/gcc.old/lib/libtsan/Makefile Tue Jan 5 08:07:46 2016
@@ -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 @@ LIB= tsan
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>
Index: src/external/gpl3/gcc/lib/libtsan/Makefile
diff -u src/external/gpl3/gcc/lib/libtsan/Makefile:1.2 src/external/gpl3/gcc/lib/libtsan/Makefile:1.3
--- src/external/gpl3/gcc/lib/libtsan/Makefile:1.2 Tue Jan 6 22:49:13 2015
+++ src/external/gpl3/gcc/lib/libtsan/Makefile Tue Jan 5 08:07:46 2016
@@ -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 @@ LIB= tsan
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>
Index: src/external/mit/xorg/lib/libfontenc/Makefile
diff -u src/external/mit/xorg/lib/libfontenc/Makefile:1.2 src/external/mit/xorg/lib/libfontenc/Makefile:1.3
--- src/external/mit/xorg/lib/libfontenc/Makefile:1.2 Sat Sep 13 00:32:31 2008
+++ src/external/mit/xorg/lib/libfontenc/Makefile Tue Jan 5 08:07:46 2016
@@ -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+= -DFONTENC_NO_LIBFONT
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
Index: src/external/mit/xorg/lib/libglut/Makefile
diff -u src/external/mit/xorg/lib/libglut/Makefile:1.7 src/external/mit/xorg/lib/libglut/Makefile:1.8
--- src/external/mit/xorg/lib/libglut/Makefile:1.7 Mon Nov 22 16:05:29 2010
+++ src/external/mit/xorg/lib/libglut/Makefile Tue Jan 5 08:07:47 2016
@@ -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 @@ LIBDPLIBS= Xi ${.CURDIR}/../libXi \
GL ${.CURDIR}/../libGL \
GLU ${.CURDIR}/../libGLU
-LDADD+= -lm
-DPADD+= ${LIBM}
+LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
PKGCONFIG= glut
PKGDIST.glut= ${X11SRCDIR.MesaGLUT}/src/glut/glx
Index: src/external/mit/xorg/lib/libpciaccess/Makefile
diff -u src/external/mit/xorg/lib/libpciaccess/Makefile:1.7 src/external/mit/xorg/lib/libpciaccess/Makefile:1.8
--- src/external/mit/xorg/lib/libpciaccess/Makefile:1.7 Wed Jun 24 18:20:25 2015
+++ src/external/mit/xorg/lib/libpciaccess/Makefile Tue Jan 5 08:07:47 2016
@@ -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 @@ INCSDIR=${X11INCDIR}
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>
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.5 src/external/public-domain/xz/lib/Makefile:1.6
--- src/external/public-domain/xz/lib/Makefile:1.5 Fri Apr 17 16:12:45 2015
+++ src/external/public-domain/xz/lib/Makefile Tue Jan 5 08:07:47 2016
@@ -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 @@ liblzma.pc: ${XZSRCDIR}/src/liblzma/libl
CLEANFILES+= liblzma.pc
-LDADD+= -lpthread
-DPADD+= ${LIBPTHREAD}
+LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
.include <bsd.lib.mk>
Index: src/lib/libnpf/Makefile
diff -u src/lib/libnpf/Makefile:1.5 src/lib/libnpf/Makefile:1.6
--- src/lib/libnpf/Makefile:1.5 Tue Jul 22 18:28:47 2014
+++ src/lib/libnpf/Makefile Tue Jan 5 08:07:47 2016
@@ -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 @@ INCS= npf.h
INCSDIR= /usr/include
LIBDPLIBS+= prop ${.CURDIR}/../libprop
-LDADD+= -lprop
-DPADD+= ${LIBPROP}
WARNS= 5
NOLINT= # disabled deliberately
Index: src/sys/rump/kern/lib/libsljit/Makefile
diff -u src/sys/rump/kern/lib/libsljit/Makefile:1.4 src/sys/rump/kern/lib/libsljit/Makefile:1.5
--- src/sys/rump/kern/lib/libsljit/Makefile:1.4 Mon Oct 19 12:16:37 2015
+++ src/sys/rump/kern/lib/libsljit/Makefile Tue Jan 5 08:07:47 2016
@@ -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_INCS_DIR:= ${.PARSEDIR}
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>
