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

This commit is contained in:
joerg 2010-12-16 22:54:18 +00:00
parent c4120e324e
commit 6c436c698f
26 changed files with 51 additions and 70 deletions

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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=

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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"

View File

@ -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}

View File

@ -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=

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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"

View File

@ -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>

View File

@ -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=

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>