[src/trunk]: src/external cleanup:

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fd57fb2c49a5
branches:  trunk
changeset: 767000:fd57fb2c49a5
user:      drochner <drochner%NetBSD.org@localhost>
date:      Wed Jul 06 19:52:05 2011 +0000

description:
cleanup:
-fix for OBJDIR
-link mpfr against gmp, and mpc against gmp+mpfr
-clean up generated files

diffstat:

 external/lgpl2/mpc/lib/libmpc/Makefile               |  5 ++++-
 external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc |  9 +++++++--
 external/lgpl3/mpfr/lib/libmpfr/Makefile             |  5 ++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diffs (66 lines):

diff -r 58130353df87 -r fd57fb2c49a5 external/lgpl2/mpc/lib/libmpc/Makefile
--- a/external/lgpl2/mpc/lib/libmpc/Makefile    Wed Jul 06 18:46:04 2011 +0000
+++ b/external/lgpl2/mpc/lib/libmpc/Makefile    Wed Jul 06 19:52:05 2011 +0000
@@ -1,9 +1,12 @@
-#      $NetBSD: Makefile,v 1.2 2011/06/23 04:39:24 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2011/07/06 19:52:05 drochner Exp $
 
 .include <bsd.init.mk>
 
 LIB=   mpc
 
+LIBDPLIBS+= gmp ${.CURDIR}/../../../../lgpl3/gmp/lib/libgmp
+LIBDPLIBS+= mpfr ${.CURDIR}/../../../../lgpl3/mpfr/lib/libmpfr
+
 SRCS=  \
        abs.c \
        acos.c \
diff -r 58130353df87 -r fd57fb2c49a5 external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc      Wed Jul 06 18:46:04 2011 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc      Wed Jul 06 19:52:05 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.3 2011/07/03 06:43:16 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.4 2011/07/06 19:52:06 drochner Exp $
 
 SRCS+= \
        random.c \
@@ -180,7 +180,12 @@
 dummy:
        mkdir dummy
 ${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4
-       cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET}
+       cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.OBJDIR}/config.m4
+
+CLEANFILES+=   config.m4
+clean: cleandummy
+cleandummy: .PHONY
+       rmdir dummy
 
 .for _build _src in ${ASM_SRCS_LIST}
 ${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4
diff -r 58130353df87 -r fd57fb2c49a5 external/lgpl3/mpfr/lib/libmpfr/Makefile
--- a/external/lgpl3/mpfr/lib/libmpfr/Makefile  Wed Jul 06 18:46:04 2011 +0000
+++ b/external/lgpl3/mpfr/lib/libmpfr/Makefile  Wed Jul 06 19:52:05 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2011/07/04 12:38:29 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2011/07/06 19:52:06 drochner Exp $
 
 .include <bsd.init.mk>
 
@@ -7,6 +7,8 @@
 
 LIB=   mpfr
 
+LIBDPLIBS+= gmp ${.CURDIR}/../../../gmp/lib/libgmp
+
 SRCS=  \
        abort_prec_max.c \
        acos.c \
@@ -504,6 +506,7 @@
        cp ${.ALLSRC} ${.TARGET}
 
 ${SRCS}: mparam.h
+CLEANFILES+= mparam.h
 
 .PATH: ${.CURDIR}/../../dist