summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2010-12-16 22:54:18 +0000
committerjoerg <joerg@NetBSD.org>2010-12-16 22:54:18 +0000
commit46cd0c7bb71df1dc230d1bd68a9908f593c64f07 (patch)
tree3ebf2893f180216873f5044d80cc624e82e34bb8 /gnu
parentf799f7e63b4c067b9e50181e313892e0b690a420 (diff)
Push C++ library linkage into the shared Makefile.inc fragments.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/groff/src/devices/Makefile.inc5
-rw-r--r--gnu/usr.bin/groff/src/devices/grodvi/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/devices/grohtml/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/devices/grolbp/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/devices/grolj4/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/devices/grops/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/devices/grotty/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/Makefile.inc5
-rw-r--r--gnu/usr.bin/groff/src/preproc/eqn/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/grn/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/html/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/pic/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/refer/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/preproc/soelim/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/tbl/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/roff/Makefile.inc5
-rw-r--r--gnu/usr.bin/groff/src/roff/groff/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/roff/troff/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/utils/Makefile.inc9
-rw-r--r--gnu/usr.bin/groff/src/utils/addftinfo/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/utils/hpftodit/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/utils/indxbib/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/utils/lkbib/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/utils/lookbib/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/utils/pfbtops/Makefile5
-rw-r--r--gnu/usr.bin/groff/src/utils/tfmtodit/Makefile4
26 files changed, 51 insertions, 70 deletions
diff --git a/gnu/usr.bin/groff/src/devices/Makefile.inc b/gnu/usr.bin/groff/src/devices/Makefile.inc
index 73dca148f96..ba57bfcd442 100644
--- a/gnu/usr.bin/groff/src/devices/Makefile.inc
+++ b/gnu/usr.bin/groff/src/devices/Makefile.inc
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.3 2003/06/30 18:47:47 wiz Exp $
+# $NetBSD: Makefile.inc,v 1.4 2010/12/16 22:54:18 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile.inc,v 1.1 2001/04/17 12:37:02 ru Exp $
+DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
+
.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
index ae34229e765..b99f29ff7a9 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:53 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:18 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/devices/grodvi
PROG= grodvi
SRCS= dvi.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
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 92a4a4474c4..6ff8e4a6588 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/10/09 08:32:53 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/16 22:54:19 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.5 2003/05/01 13:22:18 ru Exp $
@@ -7,8 +7,6 @@ DIST_SUBDIR= src/devices/grohtml
PROG= post-grohtml
MAN= grohtml.1
SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${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 acaae51ac8e..16fda4d1d59 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/02/26 03:20:07 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/16 22:54:19 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/devices/grolbp
PROG= grolbp
SRCS= lbp.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
USETBL=
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
index bba929eae61..c62fe6d456c 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/16 22:54:19 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $
@@ -7,8 +7,6 @@ DIST_SUBDIR= src/devices/grolj4
PROG= grolj4
SRCS= lj4.cpp
MAN= grolj4.1 lj4_font.5
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
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 36ed923febf..795ec32e306 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:19 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grops/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/devices/grops
PROG= grops
SRCS= ps.cpp psrm.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
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 f9ea1869297..973b605d1b8 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:19 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grotty/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/devices/grotty
PROG= grotty
SRCS= tty.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile.inc b/gnu/usr.bin/groff/src/preproc/Makefile.inc
index 1bb51abf29e..e7c1a4c8651 100644
--- a/gnu/usr.bin/groff/src/preproc/Makefile.inc
+++ b/gnu/usr.bin/groff/src/preproc/Makefile.inc
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.3 2003/06/30 18:47:51 wiz Exp $
+# $NetBSD: Makefile.inc,v 1.4 2010/12/16 22:54:20 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/Makefile.inc,v 1.1 2001/04/17 12:37:09 ru Exp $
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
+
.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
index fff1f2cbea2..00882e6d38f 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2010/12/16 22:54:20 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
@@ -10,8 +10,6 @@ SRCS= main.cpp lex.cpp \
script.cpp mark.cpp other.cpp delim.cpp sqrt.cpp pile.cpp special.cpp
GROFFYSRCS= eqn.y
CFLAGS+= -I${DIST_DIR} -I.
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
SCRIPTS= neqn
MAN= eqn.1 neqn.1
CLEANFILES= ${SCRIPTS} ${MAN}
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile
index 06467789269..579a1f2c398 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/02/26 03:20:07 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/16 22:54:20 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/preproc/grn
PROG= grn
SRCS= hdb.cpp hpoint.cpp hgraph.cpp main.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
USETBL=
diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile
index a9495effb2f..2e15caa2292 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:20 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/html/Makefile,v 1.5 2003/05/01 13:22:20 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/preproc/html
PROG= pre-grohtml
SRCS= pre-html.cpp pushback.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
NOMAN= YES
.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 aabff3bb485..8b762396033 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/16 22:54:20 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
@@ -9,8 +9,6 @@ SRCS= lex.cpp main.cpp object.cpp \
common.cpp troff.cpp tex.cpp
GROFFYSRCS= pic.y
CFLAGS+= -I${DIST_DIR} -I.
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index 74650293ab6..b8aa746ae0f 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/16 22:54:21 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
@@ -8,8 +8,8 @@ PROG= refer
SRCS= command.cpp ref.cpp refer.cpp token.cpp
GROFFYSRCS= label.y
CFLAGS+= -I${DIST_DIR}
-DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBBIB} ${LIBGROFF} -lm -lsupc++
+DPADD+= ${LIBBIB}
+LDADD+= ${LIBBIB}
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
index 3f8ce7da73e..229a6f185fb 100644
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:21 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/soelim/Makefile,v 1.3 2003/05/01 13:22:20 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/preproc/soelim
PROG= soelim
SRCS= soelim.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.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 f61febf8506..4a5b4a1a549 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:21 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/preproc/tbl
PROG= tbl
SRCS= main.cpp table.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/Makefile.inc b/gnu/usr.bin/groff/src/roff/Makefile.inc
index ac0829e9abd..4f05773d2b3 100644
--- a/gnu/usr.bin/groff/src/roff/Makefile.inc
+++ b/gnu/usr.bin/groff/src/roff/Makefile.inc
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.3 2003/06/30 18:47:53 wiz Exp $
+# $NetBSD: Makefile.inc,v 1.4 2010/12/16 22:54:21 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile.inc,v 1.1 2001/04/17 12:37:12 ru Exp $
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
+
.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
index 34d97daba21..dc59b3002b4 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:21 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.7 2003/05/01 13:22:20 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/roff/groff
PROG= groff
SRCS= groff.cpp pipeline.c
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
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 093731f55ca..bbdcf7b1fd1 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/10/25 22:27:35 apb Exp $
+# $NetBSD: Makefile,v 1.11 2010/12/16 22:54:22 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
@@ -7,8 +7,6 @@ DIST_SUBDIR= src/roff/troff
PROG= troff
SRCS= dictionary.cpp div.cpp env.cpp input.cpp \
majorminor.cpp mtsm.cpp node.cpp number.cpp reg.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= majorminor.cpp ${MAN}
USETBL=
diff --git a/gnu/usr.bin/groff/src/utils/Makefile.inc b/gnu/usr.bin/groff/src/utils/Makefile.inc
index 03725c6235c..2482afad4ee 100644
--- a/gnu/usr.bin/groff/src/utils/Makefile.inc
+++ b/gnu/usr.bin/groff/src/utils/Makefile.inc
@@ -1,5 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.3 2003/06/30 18:47:55 wiz Exp $
+# $NetBSD: Makefile.inc,v 1.4 2010/12/16 22:54:22 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile.inc,v 1.1 2001/04/17 12:37:15 ru Exp $
+DPADD+= ${LIBGROFF}
+LDADD+= ${LIBGROFF}
+.if ${LIBGROFF_ONLY:Uno} != "yes"
+DPADD+= ${LIBM} ${LIBSUPCXX}
+LDADD+= -lm -lsupc++
+.endif
+
.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
index 279d1d1472c..b13928595d4 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:22 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/utils/addftinfo
PROG= addftinfo
SRCS= addftinfo.cpp guess.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${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 1491e612e84..5227d284166 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/16 22:54:22 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/utils/hpftodit
PROG= hpftodit
SRCS= hpftodit.cpp hpuni.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
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 1d239ce03ed..81a74aeceaf 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/10/22 17:54:23 hannken Exp $
+# $NetBSD: Makefile,v 1.7 2010/12/16 22:54:22 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.7 2003/05/01 13:22:21 ru Exp $
@@ -6,8 +6,8 @@ DIST_SUBDIR= src/utils/indxbib
PROG= indxbib
SRCS= indxbib.cpp signal.c
-DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBBIB} ${LIBGROFF} -lm -lsupc++
+DPADD+= ${LIBBIB}
+LDADD+= ${LIBBIB}
CLEANFILES= ${MAN}
.include <bsd.own.mk>
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
index 1804c8c4609..cbfbf8491d1 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:22 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
@@ -6,8 +6,8 @@ DIST_SUBDIR= src/utils/lkbib
PROG= lkbib
SRCS= lkbib.cpp
-DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBBIB} ${LIBGROFF} -lm -lsupc++
+DPADD+= ${LIBBIB}
+LDADD+= ${LIBBIB}
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 b15fd3b41ef..d0176ca8c7e 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:55 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:23 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
@@ -6,8 +6,8 @@ DIST_SUBDIR= src/utils/lookbib
PROG= lookbib
SRCS= lookbib.cpp
-DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBBIB} ${LIBGROFF} -lm -lsupc++
+DPADD+= ${LIBBIB}
+LDADD+= ${LIBBIB}
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
index ca652880371..bdbbb1002da 100644
--- a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
+++ b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/12/16 22:54:23 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile,v 1.1 2001/04/17 12:37:17 ru Exp $
DIST_SUBDIR= src/utils/pfbtops
PROG= pfbtops
-DPADD+= ${LIBGROFF}
-LDADD+= ${LIBGROFF}
+LIBGROFF_ONLY= yes
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 bffd2b969a2..e8c30bfe341 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:55 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:23 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
@@ -6,8 +6,6 @@ DIST_SUBDIR= src/utils/tfmtodit
PROG= tfmtodit
SRCS= tfmtodit.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>