From d8db460c8ba24772ebc0283260a31bfc3e78d2cd Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 10 Aug 2012 12:12:18 +0000 Subject: Don't link explicitly against libsupc++, just use the normal C++ linkage. --- gnu/usr.bin/groff/src/utils/Makefile.inc | 6 +++--- 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 | 4 ++-- gnu/usr.bin/groff/src/utils/lkbib/Makefile | 4 ++-- gnu/usr.bin/groff/src/utils/lookbib/Makefile | 4 ++-- gnu/usr.bin/groff/src/utils/tfmtodit/Makefile | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu/usr.bin/groff/src/utils') diff --git a/gnu/usr.bin/groff/src/utils/Makefile.inc b/gnu/usr.bin/groff/src/utils/Makefile.inc index 2482afad4ee..27025cf0a16 100644 --- a/gnu/usr.bin/groff/src/utils/Makefile.inc +++ b/gnu/usr.bin/groff/src/utils/Makefile.inc @@ -1,12 +1,12 @@ -# $NetBSD: Makefile.inc,v 1.4 2010/12/16 22:54:22 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.5 2012/08/10 12:12:21 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++ +DPADD+= ${LIBM} +LDADD+= -lm .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 b13928595d4..07c2c249746 100644 --- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile +++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:22 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:21 joerg Exp $ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $ DIST_SUBDIR= src/utils/addftinfo -PROG= addftinfo +PROG_CXX= addftinfo SRCS= addftinfo.cpp guess.cpp CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile index 9a2746475a5..2d6401f10b9 100644 --- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile +++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2011/05/26 12:56:29 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2012/08/10 12:12:21 joerg Exp $ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $ DIST_SUBDIR= src/utils/hpftodit -PROG= hpftodit +PROG_CXX= hpftodit SRCS= hpftodit.cpp hpuni.cpp CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile index 81a74aeceaf..41331e349e7 100644 --- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2010/12/16 22:54:22 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2012/08/10 12:12:22 joerg Exp $ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.7 2003/05/01 13:22:21 ru Exp $ DIST_SUBDIR= src/utils/indxbib -PROG= indxbib +PROG_CXX= indxbib SRCS= indxbib.cpp signal.c DPADD+= ${LIBBIB} LDADD+= ${LIBBIB} diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile index cbfbf8491d1..a4602a6783e 100644 --- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:22 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:22 joerg Exp $ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $ DIST_SUBDIR= src/utils/lkbib -PROG= lkbib +PROG_CXX= lkbib SRCS= lkbib.cpp DPADD+= ${LIBBIB} LDADD+= ${LIBBIB} diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile index d0176ca8c7e..4562d4c1c6c 100644 --- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:23 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:22 joerg Exp $ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $ DIST_SUBDIR= src/utils/lookbib -PROG= lookbib +PROG_CXX= lookbib SRCS= lookbib.cpp DPADD+= ${LIBBIB} LDADD+= ${LIBBIB} diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile index e8c30bfe341..a59bdd3777f 100644 --- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile +++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:23 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:22 joerg Exp $ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $ DIST_SUBDIR= src/utils/tfmtodit -PROG= tfmtodit +PROG_CXX= tfmtodit SRCS= tfmtodit.cpp CLEANFILES= ${MAN} -- cgit