summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/groff/src/roff
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/usr.bin/groff/src/roff
parentf799f7e63b4c067b9e50181e313892e0b690a420 (diff)
Push C++ library linkage into the shared Makefile.inc fragments.
Diffstat (limited to 'gnu/usr.bin/groff/src/roff')
-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
3 files changed, 6 insertions, 7 deletions
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=