Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/gnu/usr.bin/groff/src Push C++ library linkage into the shar...



details:   https://anonhg.NetBSD.org/src/rev/2034cc0e2abe
branches:  trunk
changeset: 759807:2034cc0e2abe
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Dec 16 22:54:18 2010 +0000

description:
Push C++ library linkage into the shared Makefile.inc fragments.

diffstat:

 gnu/usr.bin/groff/src/devices/Makefile.inc     |  5 ++++-
 gnu/usr.bin/groff/src/devices/grodvi/Makefile  |  4 +---
 gnu/usr.bin/groff/src/devices/grohtml/Makefile |  4 +---
 gnu/usr.bin/groff/src/devices/grolbp/Makefile  |  4 +---
 gnu/usr.bin/groff/src/devices/grolj4/Makefile  |  4 +---
 gnu/usr.bin/groff/src/devices/grops/Makefile   |  4 +---
 gnu/usr.bin/groff/src/devices/grotty/Makefile  |  4 +---
 gnu/usr.bin/groff/src/preproc/Makefile.inc     |  5 ++++-
 gnu/usr.bin/groff/src/preproc/eqn/Makefile     |  4 +---
 gnu/usr.bin/groff/src/preproc/grn/Makefile     |  4 +---
 gnu/usr.bin/groff/src/preproc/html/Makefile    |  4 +---
 gnu/usr.bin/groff/src/preproc/pic/Makefile     |  4 +---
 gnu/usr.bin/groff/src/preproc/refer/Makefile   |  6 +++---
 gnu/usr.bin/groff/src/preproc/soelim/Makefile  |  4 +---
 gnu/usr.bin/groff/src/preproc/tbl/Makefile     |  4 +---
 gnu/usr.bin/groff/src/roff/Makefile.inc        |  5 ++++-
 gnu/usr.bin/groff/src/roff/groff/Makefile      |  4 +---
 gnu/usr.bin/groff/src/roff/troff/Makefile      |  4 +---
 gnu/usr.bin/groff/src/utils/Makefile.inc       |  9 ++++++++-
 gnu/usr.bin/groff/src/utils/addftinfo/Makefile |  4 +---
 gnu/usr.bin/groff/src/utils/hpftodit/Makefile  |  4 +---
 gnu/usr.bin/groff/src/utils/indxbib/Makefile   |  6 +++---
 gnu/usr.bin/groff/src/utils/lkbib/Makefile     |  6 +++---
 gnu/usr.bin/groff/src/utils/lookbib/Makefile   |  6 +++---
 gnu/usr.bin/groff/src/utils/pfbtops/Makefile   |  5 ++---
 gnu/usr.bin/groff/src/utils/tfmtodit/Makefile  |  4 +---
 26 files changed, 51 insertions(+), 70 deletions(-)

diffs (truncated from 460 to 300 lines):

diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/devices/Makefile.inc
--- a/gnu/usr.bin/groff/src/devices/Makefile.inc        Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/devices/Makefile.inc        Thu Dec 16 22:54:18 2010 +0000
@@ -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 -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/devices/grodvi/Makefile
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile     Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile     Thu Dec 16 22:54:18 2010 +0000
@@ -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>
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/devices/grohtml/Makefile
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile    Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile    Thu Dec 16 22:54:18 2010 +0000
@@ -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>
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/devices/grolbp/Makefile
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile     Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile     Thu Dec 16 22:54:18 2010 +0000
@@ -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=
 
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/devices/grolj4/Makefile
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile     Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile     Thu Dec 16 22:54:18 2010 +0000
@@ -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>
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/devices/grops/Makefile
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile      Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile      Thu Dec 16 22:54:18 2010 +0000
@@ -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>
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/devices/grotty/Makefile
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile     Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile     Thu Dec 16 22:54:18 2010 +0000
@@ -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>
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/preproc/Makefile.inc
--- a/gnu/usr.bin/groff/src/preproc/Makefile.inc        Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/preproc/Makefile.inc        Thu Dec 16 22:54:18 2010 +0000
@@ -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 -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/preproc/eqn/Makefile
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile        Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile        Thu Dec 16 22:54:18 2010 +0000
@@ -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}
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/preproc/grn/Makefile
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile        Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile        Thu Dec 16 22:54:18 2010 +0000
@@ -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=
 
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/preproc/html/Makefile
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile       Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile       Thu Dec 16 22:54:18 2010 +0000
@@ -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>
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/preproc/pic/Makefile
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile        Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile        Thu Dec 16 22:54:18 2010 +0000
@@ -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>
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/preproc/refer/Makefile
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile      Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile      Thu Dec 16 22:54:18 2010 +0000
@@ -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>
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/preproc/soelim/Makefile
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile     Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile     Thu Dec 16 22:54:18 2010 +0000
@@ -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>
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/preproc/tbl/Makefile
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile        Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile        Thu Dec 16 22:54:18 2010 +0000
@@ -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>
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/roff/Makefile.inc
--- a/gnu/usr.bin/groff/src/roff/Makefile.inc   Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/roff/Makefile.inc   Thu Dec 16 22:54:18 2010 +0000
@@ -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 -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/roff/groff/Makefile
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile Thu Dec 16 22:54:18 2010 +0000
@@ -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>
diff -r 597a4c96d739 -r 2034cc0e2abe gnu/usr.bin/groff/src/roff/troff/Makefile
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile Thu Dec 16 22:52:32 2010 +0000
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile Thu Dec 16 22:54:18 2010 +0000
@@ -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 $
 



Home | Main Index | Thread Index | Old Index