Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Use MKPICLIB to determine if we should have a dependency on ...
details: https://anonhg.NetBSD.org/src/rev/8241bab4cb6a
branches: trunk
changeset: 545612:8241bab4cb6a
user: thorpej <thorpej%NetBSD.org@localhost>
date: Fri Apr 11 22:46:02 2003 +0000
description:
Use MKPICLIB to determine if we should have a dependency on the .a or
_pic.a version of the library.
diffstat:
gnu/usr.bin/binutils/common/Makefile.prog | 6 +++---
gnu/usr.bin/binutils/gas/Makefile | 10 +++++++++-
gnu/usr.bin/binutils/gprof/Makefile | 6 +++++-
gnu/usr.bin/binutils/ld/Makefile | 6 +++++-
gnu/usr.sbin/dbsym/Makefile | 4 ++--
gnu/usr.sbin/mdsetimage/Makefile | 4 ++--
usr.sbin/amd/Makefile.inc | 4 ++--
7 files changed, 28 insertions(+), 12 deletions(-)
diffs (152 lines):
diff -r 7941998934a5 -r 8241bab4cb6a gnu/usr.bin/binutils/common/Makefile.prog
--- a/gnu/usr.bin/binutils/common/Makefile.prog Fri Apr 11 22:40:31 2003 +0000
+++ b/gnu/usr.bin/binutils/common/Makefile.prog Fri Apr 11 22:46:02 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.prog,v 1.5 2003/04/09 22:38:25 thorpej Exp $
+# $NetBSD: Makefile.prog,v 1.6 2003/04/11 22:46:02 thorpej Exp $
#
# Common Makefile fragment for a binutils program.
#
@@ -26,7 +26,7 @@
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
OPCODESOBJ!= cd ${TOP}/lib/libopcodes && ${PRINTOBJDIR}
LDADD+= -L${OPCODESOBJ} -lopcodes
-.if ${MKPIC} != "no"
+.if ${MKPICLIB} != "no"
DPADD+= ${OPCODESOBJ}/libopcodes_pic.a
.else
DPADD+= ${OPCODESOBJ}/libopcodes.a
@@ -36,7 +36,7 @@
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libbfd*)
BFDOBJ!= cd ${TOP}/lib/libbfd && ${PRINTOBJDIR}
LDADD+= -L${BFDOBJ} -lbfd
-.if ${MKPIC} != "no"
+.if ${MKPICLIB} != "no"
DPADD+= ${BFDOBJ}/libbfd_pic.a
.else
DPADD+= ${BFDOBJ}/libbfd.a
diff -r 7941998934a5 -r 8241bab4cb6a gnu/usr.bin/binutils/gas/Makefile
--- a/gnu/usr.bin/binutils/gas/Makefile Fri Apr 11 22:40:31 2003 +0000
+++ b/gnu/usr.bin/binutils/gas/Makefile Fri Apr 11 22:46:02 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/03/01 13:09:06 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2003/04/11 22:46:02 thorpej Exp $
.include <bsd.own.mk>
@@ -22,11 +22,19 @@
OPCODESOBJ!= cd ${TOP}/lib/libopcodes && ${PRINTOBJDIR}
LDADD+= -L${OPCODESOBJ} -lopcodes
+.if ${MKPICLIB} != "no"
DPADD+= ${OPCODESOBJ}/libopcodes_pic.a
+.else
+DPADD+= ${OPCODESOBJ}/libopcodes.a
+.endif
BFDOBJ!= cd ${TOP}/lib/libbfd && ${PRINTOBJDIR}
LDADD+= -L${BFDOBJ} -lbfd
+.if ${MKPICLIB} != "no"
DPADD+= ${BFDOBJ}/libbfd_pic.a
+.else
+DPADD+= ${BFDOBJ}/libbfd.a
+.endif
IBERTYOBJ!= cd ${TOP}/lib/libiberty && ${PRINTOBJDIR}
LDADD+= -L${IBERTYOBJ} -liberty
diff -r 7941998934a5 -r 8241bab4cb6a gnu/usr.bin/binutils/gprof/Makefile
--- a/gnu/usr.bin/binutils/gprof/Makefile Fri Apr 11 22:40:31 2003 +0000
+++ b/gnu/usr.bin/binutils/gprof/Makefile Fri Apr 11 22:46:02 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/19 03:09:33 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2003/04/11 22:46:02 thorpej Exp $
.include <bsd.own.mk>
@@ -16,7 +16,11 @@
BFDOBJ!= cd ${TOP}/lib/libbfd && ${PRINTOBJDIR}
LDADD+= -L${BFDOBJ} -lbfd
+.if ${MKPICLIB} != "no"
DPADD+= ${BFDOBJ}/libbfd_pic.a
+.else
+DPADD+= ${BFDOBJ}/libbfd.a
+.endif
IBERTYOBJ!= cd ${TOP}/lib/libiberty && ${PRINTOBJDIR}
LDADD+= -L${IBERTYOBJ} -liberty
diff -r 7941998934a5 -r 8241bab4cb6a gnu/usr.bin/binutils/ld/Makefile
--- a/gnu/usr.bin/binutils/ld/Makefile Fri Apr 11 22:40:31 2003 +0000
+++ b/gnu/usr.bin/binutils/ld/Makefile Fri Apr 11 22:46:02 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/03/01 13:09:20 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2003/04/11 22:46:02 thorpej Exp $
.include <bsd.own.mk>
@@ -20,7 +20,11 @@
BFDOBJ!= cd ${TOP}/lib/libbfd && ${PRINTOBJDIR}
LDADD+= -L${BFDOBJ} -lbfd
+.if ${MKPICLIB} != "no"
DPADD+= ${BFDOBJ}/libbfd_pic.a
+.else
+DPADD+= ${BFDOBJ}/libbfd.a
+.endif
IBERTYOBJ!= cd ${TOP}/lib/libiberty && ${PRINTOBJDIR}
LDADD+= -L${IBERTYOBJ} -liberty
diff -r 7941998934a5 -r 8241bab4cb6a gnu/usr.sbin/dbsym/Makefile
--- a/gnu/usr.sbin/dbsym/Makefile Fri Apr 11 22:40:31 2003 +0000
+++ b/gnu/usr.sbin/dbsym/Makefile Fri Apr 11 22:46:02 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/04/09 22:38:24 thorpej Exp $
+# $NetBSD: Makefile,v 1.9 2003/04/11 22:46:03 thorpej Exp $
.include <bsd.own.mk>
@@ -13,7 +13,7 @@
CPPFLAGS+= -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
-.if !defined(HOSTPROG) && ${MKPIC} != "no"
+.if !defined(HOSTPROG) && ${MKPICLIB} != "no"
DPADD+= ${BFDDIR}/libbfd_pic.a
.else
DPADD+= ${BFDDIR}/libbfd.a
diff -r 7941998934a5 -r 8241bab4cb6a gnu/usr.sbin/mdsetimage/Makefile
--- a/gnu/usr.sbin/mdsetimage/Makefile Fri Apr 11 22:40:31 2003 +0000
+++ b/gnu/usr.sbin/mdsetimage/Makefile Fri Apr 11 22:46:02 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/04/09 22:38:25 thorpej Exp $
+# $NetBSD: Makefile,v 1.13 2003/04/11 22:46:03 thorpej Exp $
.include <bsd.own.mk>
@@ -13,7 +13,7 @@
CPPFLAGS+= -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
-.if !defined(HOSTPROG) && ${MKPIC} != "no"
+.if !defined(HOSTPROG) && ${MKPICLIB} != "no"
DPADD+= ${BFDDIR}/libbfd_pic.a
.else
DPADD+= ${BFDDIR}/libbfd.a
diff -r 7941998934a5 -r 8241bab4cb6a usr.sbin/amd/Makefile.inc
--- a/usr.sbin/amd/Makefile.inc Fri Apr 11 22:40:31 2003 +0000
+++ b/usr.sbin/amd/Makefile.inc Fri Apr 11 22:46:02 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2002/09/18 03:54:26 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.19 2003/04/11 22:47:32 thorpej Exp $
WARNS?= 1
WFORMAT=2
@@ -22,7 +22,7 @@
.if !defined(LIB) || empty(LIB)
LDADD+= -L${LIBAMUOBJDIR} -lamu
-.if ${MKPIC} == "no"
+.if ${MKPICLIB} == "no"
DPADD+= ${LIBAMUOBJDIR}/libamu.a
.else
DPADD+= ${LIBAMUOBJDIR}/libamu_pic.a
Home |
Main Index |
Thread Index |
Old Index