Module Name: src
Committed By: joerg
Date: Thu Dec 16 22:54:23 UTC 2010
Modified Files:
src/gnu/usr.bin/groff/src/devices: Makefile.inc
src/gnu/usr.bin/groff/src/devices/grodvi: Makefile
src/gnu/usr.bin/groff/src/devices/grohtml: Makefile
src/gnu/usr.bin/groff/src/devices/grolbp: Makefile
src/gnu/usr.bin/groff/src/devices/grolj4: Makefile
src/gnu/usr.bin/groff/src/devices/grops: Makefile
src/gnu/usr.bin/groff/src/devices/grotty: Makefile
src/gnu/usr.bin/groff/src/preproc: Makefile.inc
src/gnu/usr.bin/groff/src/preproc/eqn: Makefile
src/gnu/usr.bin/groff/src/preproc/grn: Makefile
src/gnu/usr.bin/groff/src/preproc/html: Makefile
src/gnu/usr.bin/groff/src/preproc/pic: Makefile
src/gnu/usr.bin/groff/src/preproc/refer: Makefile
src/gnu/usr.bin/groff/src/preproc/soelim: Makefile
src/gnu/usr.bin/groff/src/preproc/tbl: Makefile
src/gnu/usr.bin/groff/src/roff: Makefile.inc
src/gnu/usr.bin/groff/src/roff/groff: Makefile
src/gnu/usr.bin/groff/src/roff/troff: Makefile
src/gnu/usr.bin/groff/src/utils: Makefile.inc
src/gnu/usr.bin/groff/src/utils/addftinfo: Makefile
src/gnu/usr.bin/groff/src/utils/hpftodit: Makefile
src/gnu/usr.bin/groff/src/utils/indxbib: Makefile
src/gnu/usr.bin/groff/src/utils/lkbib: Makefile
src/gnu/usr.bin/groff/src/utils/lookbib: Makefile
src/gnu/usr.bin/groff/src/utils/pfbtops: Makefile
src/gnu/usr.bin/groff/src/utils/tfmtodit: Makefile
Log Message:
Push C++ library linkage into the shared Makefile.inc fragments.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/src/devices/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/devices/grodvi/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grohtml/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grolbp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grolj4/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/devices/grops/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/devices/grotty/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/src/preproc/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/gnu/usr.bin/groff/src/preproc/eqn/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/preproc/grn/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/preproc/html/Makefile
cvs rdiff -u -r1.9 -r1.10 src/gnu/usr.bin/groff/src/preproc/pic/Makefile
cvs rdiff -u -r1.9 -r1.10 src/gnu/usr.bin/groff/src/preproc/refer/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/preproc/soelim/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/preproc/tbl/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/src/roff/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/roff/groff/Makefile
cvs rdiff -u -r1.10 -r1.11 src/gnu/usr.bin/groff/src/roff/troff/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/src/utils/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
cvs rdiff -u -r1.6 -r1.7 src/gnu/usr.bin/groff/src/utils/indxbib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/utils/lkbib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/utils/lookbib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/groff/src/devices/Makefile.inc
diff -u src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.3 src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.4
--- src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.3 Mon Jun 30 18:47:47 2003
+++ src/gnu/usr.bin/groff/src/devices/Makefile.inc Thu Dec 16 22:54:18 2010
@@ -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"
Index: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grodvi/Makefile:1.4 src/gnu/usr.bin/groff/src/devices/grodvi/Makefile:1.5
--- src/gnu/usr.bin/groff/src/devices/grodvi/Makefile:1.4 Mon Oct 9 08:32:53 2006
+++ src/gnu/usr.bin/groff/src/devices/grodvi/Makefile Thu Dec 16 22:54:18 2010
@@ -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 @@
PROG= grodvi
SRCS= dvi.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Index: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grohtml/Makefile:1.5 src/gnu/usr.bin/groff/src/devices/grohtml/Makefile:1.6
--- src/gnu/usr.bin/groff/src/devices/grohtml/Makefile:1.5 Mon Oct 9 08:32:53 2006
+++ src/gnu/usr.bin/groff/src/devices/grohtml/Makefile Thu Dec 16 22:54:19 2010
@@ -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 @@
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>
Index: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grolbp/Makefile:1.5 src/gnu/usr.bin/groff/src/devices/grolbp/Makefile:1.6
--- src/gnu/usr.bin/groff/src/devices/grolbp/Makefile:1.5 Tue Feb 26 03:20:07 2008
+++ src/gnu/usr.bin/groff/src/devices/grolbp/Makefile Thu Dec 16 22:54:19 2010
@@ -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 @@
PROG= grolbp
SRCS= lbp.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
USETBL=
Index: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grolj4/Makefile:1.5 src/gnu/usr.bin/groff/src/devices/grolj4/Makefile:1.6
--- src/gnu/usr.bin/groff/src/devices/grolj4/Makefile:1.5 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/devices/grolj4/Makefile Thu Dec 16 22:54:19 2010
@@ -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 @@
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>
Index: src/gnu/usr.bin/groff/src/devices/grops/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grops/Makefile:1.4 src/gnu/usr.bin/groff/src/devices/grops/Makefile:1.5
--- src/gnu/usr.bin/groff/src/devices/grops/Makefile:1.4 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/devices/grops/Makefile Thu Dec 16 22:54:19 2010
@@ -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 @@
PROG= grops
SRCS= ps.cpp psrm.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Index: src/gnu/usr.bin/groff/src/devices/grotty/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grotty/Makefile:1.4 src/gnu/usr.bin/groff/src/devices/grotty/Makefile:1.5
--- src/gnu/usr.bin/groff/src/devices/grotty/Makefile:1.4 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/devices/grotty/Makefile Thu Dec 16 22:54:19 2010
@@ -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 @@
PROG= grotty
SRCS= tty.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Index: src/gnu/usr.bin/groff/src/preproc/Makefile.inc
diff -u src/gnu/usr.bin/groff/src/preproc/Makefile.inc:1.3 src/gnu/usr.bin/groff/src/preproc/Makefile.inc:1.4
--- src/gnu/usr.bin/groff/src/preproc/Makefile.inc:1.3 Mon Jun 30 18:47:51 2003
+++ src/gnu/usr.bin/groff/src/preproc/Makefile.inc Thu Dec 16 22:54:20 2010
@@ -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"
Index: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/eqn/Makefile:1.8 src/gnu/usr.bin/groff/src/preproc/eqn/Makefile:1.9
--- src/gnu/usr.bin/groff/src/preproc/eqn/Makefile:1.8 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/preproc/eqn/Makefile Thu Dec 16 22:54:20 2010
@@ -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 @@
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}
Index: src/gnu/usr.bin/groff/src/preproc/grn/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/grn/Makefile:1.5 src/gnu/usr.bin/groff/src/preproc/grn/Makefile:1.6
--- src/gnu/usr.bin/groff/src/preproc/grn/Makefile:1.5 Tue Feb 26 03:20:07 2008
+++ src/gnu/usr.bin/groff/src/preproc/grn/Makefile Thu Dec 16 22:54:20 2010
@@ -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 @@
PROG= grn
SRCS= hdb.cpp hpoint.cpp hgraph.cpp main.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
USETBL=
Index: src/gnu/usr.bin/groff/src/preproc/html/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/html/Makefile:1.4 src/gnu/usr.bin/groff/src/preproc/html/Makefile:1.5
--- src/gnu/usr.bin/groff/src/preproc/html/Makefile:1.4 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/preproc/html/Makefile Thu Dec 16 22:54:20 2010
@@ -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 @@
PROG= pre-grohtml
SRCS= pre-html.cpp pushback.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
NOMAN= YES
.include <bsd.prog.mk>
Index: src/gnu/usr.bin/groff/src/preproc/pic/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/pic/Makefile:1.9 src/gnu/usr.bin/groff/src/preproc/pic/Makefile:1.10
--- src/gnu/usr.bin/groff/src/preproc/pic/Makefile:1.9 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/preproc/pic/Makefile Thu Dec 16 22:54:20 2010
@@ -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 @@
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>
Index: src/gnu/usr.bin/groff/src/preproc/refer/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/refer/Makefile:1.9 src/gnu/usr.bin/groff/src/preproc/refer/Makefile:1.10
--- src/gnu/usr.bin/groff/src/preproc/refer/Makefile:1.9 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/preproc/refer/Makefile Thu Dec 16 22:54:21 2010
@@ -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 @@
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>
Index: src/gnu/usr.bin/groff/src/preproc/soelim/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/soelim/Makefile:1.4 src/gnu/usr.bin/groff/src/preproc/soelim/Makefile:1.5
--- src/gnu/usr.bin/groff/src/preproc/soelim/Makefile:1.4 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/preproc/soelim/Makefile Thu Dec 16 22:54:21 2010
@@ -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 @@
PROG= soelim
SRCS= soelim.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Index: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/tbl/Makefile:1.4 src/gnu/usr.bin/groff/src/preproc/tbl/Makefile:1.5
--- src/gnu/usr.bin/groff/src/preproc/tbl/Makefile:1.4 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/preproc/tbl/Makefile Thu Dec 16 22:54:21 2010
@@ -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 @@
PROG= tbl
SRCS= main.cpp table.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Index: src/gnu/usr.bin/groff/src/roff/Makefile.inc
diff -u src/gnu/usr.bin/groff/src/roff/Makefile.inc:1.3 src/gnu/usr.bin/groff/src/roff/Makefile.inc:1.4
--- src/gnu/usr.bin/groff/src/roff/Makefile.inc:1.3 Mon Jun 30 18:47:53 2003
+++ src/gnu/usr.bin/groff/src/roff/Makefile.inc Thu Dec 16 22:54:21 2010
@@ -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"
Index: src/gnu/usr.bin/groff/src/roff/groff/Makefile
diff -u src/gnu/usr.bin/groff/src/roff/groff/Makefile:1.4 src/gnu/usr.bin/groff/src/roff/groff/Makefile:1.5
--- src/gnu/usr.bin/groff/src/roff/groff/Makefile:1.4 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/roff/groff/Makefile Thu Dec 16 22:54:21 2010
@@ -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 @@
PROG= groff
SRCS= groff.cpp pipeline.c
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Index: src/gnu/usr.bin/groff/src/roff/troff/Makefile
diff -u src/gnu/usr.bin/groff/src/roff/troff/Makefile:1.10 src/gnu/usr.bin/groff/src/roff/troff/Makefile:1.11
--- src/gnu/usr.bin/groff/src/roff/troff/Makefile:1.10 Sat Oct 25 22:27:35 2008
+++ src/gnu/usr.bin/groff/src/roff/troff/Makefile Thu Dec 16 22:54:22 2010
@@ -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 @@
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=
Index: src/gnu/usr.bin/groff/src/utils/Makefile.inc
diff -u src/gnu/usr.bin/groff/src/utils/Makefile.inc:1.3 src/gnu/usr.bin/groff/src/utils/Makefile.inc:1.4
--- src/gnu/usr.bin/groff/src/utils/Makefile.inc:1.3 Mon Jun 30 18:47:55 2003
+++ src/gnu/usr.bin/groff/src/utils/Makefile.inc Thu Dec 16 22:54:22 2010
@@ -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"
Index: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile:1.4 src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile:1.5
--- src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile:1.4 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile Thu Dec 16 22:54:22 2010
@@ -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 @@
PROG= addftinfo
SRCS= addftinfo.cpp guess.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Index: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile:1.5 src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile:1.6
--- src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile:1.5 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile Thu Dec 16 22:54:22 2010
@@ -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 @@
PROG= hpftodit
SRCS= hpftodit.cpp hpuni.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Index: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/indxbib/Makefile:1.6 src/gnu/usr.bin/groff/src/utils/indxbib/Makefile:1.7
--- src/gnu/usr.bin/groff/src/utils/indxbib/Makefile:1.6 Wed Oct 22 17:54:23 2008
+++ src/gnu/usr.bin/groff/src/utils/indxbib/Makefile Thu Dec 16 22:54:22 2010
@@ -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 @@
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>
Index: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/lkbib/Makefile:1.4 src/gnu/usr.bin/groff/src/utils/lkbib/Makefile:1.5
--- src/gnu/usr.bin/groff/src/utils/lkbib/Makefile:1.4 Mon Oct 9 08:32:54 2006
+++ src/gnu/usr.bin/groff/src/utils/lkbib/Makefile Thu Dec 16 22:54:22 2010
@@ -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 @@
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>
Index: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/lookbib/Makefile:1.4 src/gnu/usr.bin/groff/src/utils/lookbib/Makefile:1.5
--- src/gnu/usr.bin/groff/src/utils/lookbib/Makefile:1.4 Mon Oct 9 08:32:55 2006
+++ src/gnu/usr.bin/groff/src/utils/lookbib/Makefile Thu Dec 16 22:54:23 2010
@@ -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 @@
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>
Index: src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile:1.3 src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile:1.4
--- src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile:1.3 Mon Jun 30 18:47:56 2003
+++ src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile Thu Dec 16 22:54:23 2010
@@ -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>
Index: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile:1.4 src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile:1.5
--- src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile:1.4 Mon Oct 9 08:32:55 2006
+++ src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile Thu Dec 16 22:54:23 2010
@@ -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 @@
PROG= tfmtodit
SRCS= tfmtodit.cpp
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
