Module Name: src
Committed By: drochner
Date: Wed Jul 6 19:52:06 UTC 2011
Modified Files:
src/external/lgpl2/mpc/lib/libmpc: Makefile
src/external/lgpl3/gmp/lib/libgmp/arch/i386: Makefile.inc
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
cleanup:
-fix for OBJDIR
-link mpfr against gmp, and mpc against gmp+mpfr
-clean up generated files
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/lgpl2/mpc/lib/libmpc/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/mpfr/lib/libmpfr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl2/mpc/lib/libmpc/Makefile
diff -u src/external/lgpl2/mpc/lib/libmpc/Makefile:1.2 src/external/lgpl2/mpc/lib/libmpc/Makefile:1.3
--- src/external/lgpl2/mpc/lib/libmpc/Makefile:1.2 Thu Jun 23 04:39:24 2011
+++ src/external/lgpl2/mpc/lib/libmpc/Makefile Wed Jul 6 19:52:05 2011
@@ -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 \
Index: src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.3 src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.4
--- src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc:1.3 Sun Jul 3 06:43:16 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc Wed Jul 6 19:52:06 2011
@@ -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
Index: src/external/lgpl3/mpfr/lib/libmpfr/Makefile
diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.5 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.6
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.5 Mon Jul 4 12:38:29 2011
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Wed Jul 6 19:52:06 2011
@@ -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
