17 files changed, 51 insertions, 34 deletions

diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
index 37454406520a4..948e9fa8b0e6d 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	grodvi
 SRCS=		dvi.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
index 321f1c87c822d..5b55436ca91ef 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	post-grohtml
 SRCS=		post-html.cpp html-table.cpp html-text.cpp output.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 MAN=
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
index 85a41c169b953..23a3161b872df 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	grolbp
 SRCS=		lbp.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
index bb3f9e4f62d38..eeaeca92ae3be 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -3,8 +3,9 @@
 PROG_CXX=	grolj4
 MAN=		grolj4.1 lj4_font.5
 SRCS=		lj4.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile
index 4511f69b152e4..8c83acd149103 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	grops
 SRCS=		ps.cpp psrm.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile
index d15ee8bf62319..c4de8f4c433ae 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	grotty
 SRCS=		tty.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile
index 58309d2a5eb80..7f2e3018fc1a5 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	grn
 SRCS=		hdb.cpp hpoint.cpp hgraph.cpp main.cpp
-DPADD=	 	${LIBGROFF} ${LIBM}
-LDADD=	 	${LIBGROFF} -lm
+DPADD=	 	${LIBGROFF}
+LDADD=	 	${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile
index 3b5939c3bff16..18a2cd916ee6f 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -4,8 +4,9 @@ PROG_CXX=	pic
 SRCS=		lex.cpp main.cpp object.cpp pic.cpp pic_tab.h \
 		common.cpp troff.cpp tex.cpp
 CFLAGS+=	-I${DIST_DIR} -I.
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN} pic.cpp pic_tab.h y.tab.c y.tab.h
 
 pic_tab.h: pic.cpp
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index 8a18f6f7987c1..78fc96b2bce27 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -3,8 +3,9 @@
 PROG_CXX=	refer
 SRCS=		command.cpp label.cpp ref.cpp refer.cpp token.cpp
 CFLAGS+=	-I${DIST_DIR}
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF}
+LDADD=		${LIBBIB} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	label.cpp label_tab.h ${MAN} y.tab.c y.tab.h
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
index 29e7ac238f895..5bf1980af6ba1 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	tbl
 SRCS=		main.cpp table.cpp
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
index 2ae541bbb5024..54d80102dfa04 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	groff
 SRCS=		groff.cpp pipeline.c
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index 802af2b6be097..9108ab4374f14 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -3,8 +3,9 @@
 PROG_CXX=	troff
 SRCS=		dictionary.cpp div.cpp env.cpp input.cpp \
 		majorminor.cpp mtsm.cpp node.cpp number.cpp reg.cpp
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	majorminor.cpp ${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
index 1376702a9a831..d3ca4f516e789 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	hpftodit
 SRCS=		hpftodit.cpp hpuni.cpp
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index 048fed0ed4a05..b9667fdff8a4b 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	indxbib
 SRCS=		indxbib.cpp signal.c
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF}
+LDADD=		${LIBBIB} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 FILES=		${DIST_DIR}/eign
 FILESDIR=	${SHAREDIR}/dict/
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
index f30dc56cbb8f2..3a95268f9d10c 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	lkbib
 SRCS=		lkbib.cpp
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF}
+LDADD=		${LIBBIB} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
index 18834a7432d3c..b12f7b7c7191c 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	lookbib
 SRCS=		lookbib.cpp
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF}
+LDADD=		${LIBBIB} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
index ba3bbc54646ff..03f51bdae8528 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	tfmtodit
 SRCS=		tfmtodit.cpp
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>