From 1f187793183f3d481e685f06b9d0776d38926bf7 Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Tue, 25 Nov 2014 21:18:18 +0000
Subject: Convert to LIBADD Reduce overlinking

---
 gnu/lib/libdialog/Makefile            | 3 +--
 gnu/lib/libgcc/Makefile               | 6 ++----
 gnu/lib/libreadline/readline/Makefile | 3 +--
 gnu/lib/libstdc++/Makefile            | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'gnu/lib')

diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 3945cc0..1df11ec 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -13,8 +13,7 @@ SRCS=		argv.c arrows.c buildlist.c buttons.c calendar.c checklist.c \
 INCS=		dialog.h dlg_colors.h dlg_config.h dlg_keys.h
 MAN=		dialog.3
 
-DPADD=		${LIBNCURSESW} ${LIBM}
-LDADD=		-lncursesw -lm
+LIBADD=		ncursesw m
 
 CFLAGS+= 	-I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused
 .PATH:		${DIALOG}
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 4fd8b8d..e7d10b2 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -28,8 +28,7 @@ CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
 		-I${.CURDIR}/../../usr.bin/cc/cc_tools
 
 LDFLAGS+=	-nodefaultlibs
-DPADD+=		${LIBC}
-LDADD+=		-lc
+LIBADD+=	c
 
 OBJS=		# added to below in various ways depending on TARGET_CPUARCH
 
@@ -119,8 +118,7 @@ LIB1ASMSRC =	lib1funcs.asm
 LIB1ASMFUNCS =  _dvmd_tls _bb_init_func
 LIB2ADDEH =	unwind-arm.c libunwind.S pr-support.c unwind-c.c
 # Some compilers generate __aeabi_ functions libgcc_s is missing
-DPADD+=		${LIBCOMPILER_RT}
-LDADD+=		-lcompiler_rt
+LIBADD+=	compiler_rt
 .endif
 
 .if ${TARGET_CPUARCH} == mips
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index f09e943..2afeafc 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -23,7 +23,6 @@ ${.OBJDIR}/${_h}:	${SRCDIR}/${_h}
 	${INSTALL} ${.ALLSRC} ${.TARGET}
 .endfor
 
-DPADD=	${LIBTERMCAPW}
-LDADD=	-ltermcapw
+LIBADD=	ncursesw
 
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 98a08f4..d55b67e 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -23,8 +23,8 @@ CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
 		-Wno-deprecated
 PO_CXXFLAGS=	${CXXFLAGS:N-ffunction-sections}
 
-DPADD=		${LIBM}
-LDADD=		-lm  -Wl,-f,libsupc++.so.1
+LIBADD+=	m
+LDADD=		-Wl,-f,libsupc++.so.1
 
 # libstdc++ sources
 SRCS+=	bitmap_allocator.cc pool_allocator.cc \
-- 
cgit v1.1