[src/trunk]: src/external/bsd/am-utils add PROGDPLIBS, and remove duplicate d...

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

details:   https://anonhg.NetBSD.org/src/rev/47625f0ae857
branches:  trunk
changeset: 784917:47625f0ae857
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 14 01:57:42 2013 +0000

description:
add PROGDPLIBS, and remove duplicate dependencies.

diffstat:

 external/bsd/am-utils/Makefile.inc           |  23 +++++++++++------------
 external/bsd/am-utils/bin/Makefile.inc       |   6 +-----
 external/bsd/am-utils/bin/amd/Makefile       |   4 ++--
 external/bsd/am-utils/bin/amq/Makefile       |   3 +--
 external/bsd/am-utils/bin/fixmount/Makefile  |   4 ++--
 external/bsd/am-utils/bin/hlfsd/Makefile     |   5 +++--
 external/bsd/am-utils/bin/pawd/Makefile      |   3 +--
 external/bsd/am-utils/bin/wire-test/Makefile |   4 +---
 8 files changed, 22 insertions(+), 30 deletions(-)

diffs (160 lines):

diff -r d507ca14c291 -r 47625f0ae857 external/bsd/am-utils/Makefile.inc
--- a/external/bsd/am-utils/Makefile.inc        Thu Feb 14 01:21:25 2013 +0000
+++ b/external/bsd/am-utils/Makefile.inc        Thu Feb 14 01:57:42 2013 +0000
@@ -1,5 +1,7 @@
-#      $NetBSD: Makefile.inc,v 1.4 2013/02/14 01:06:04 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2013/02/14 01:57:42 christos Exp $
 
+.ifndef AMU_MAKEFILE_INC
+AMU_MAKEFILE_INC=
 WARNS?=        1
 
 .include <bsd.own.mk>
@@ -8,10 +10,14 @@
 
 USE_FORT?=yes
 
-IDIST= ${NETBSDSRCDIR}/external/bsd/am-utils/dist
+AMUTILS=       ${NETBSDSRCDIR}/external/bsd/am-utils
+IDIST=         ${AMUTILS}/dist
 
 CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include -I${IDIST}/libamu \
-       -I${IDIST}/include -I${LIBAMUOBJDIR}
+    -I${IDIST}/include
+
+LIBAMUOBJDIR!= cd ${AMUTILS}/lib/libamu && ${PRINTOBJDIR}
+CPPFLAGS+=     -I${LIBAMUOBJDIR}
 
 .if (${USE_HESIOD} != "no")
 CPPFLAGS+=-DHAVE_MAP_HESIOD=1
@@ -27,13 +33,6 @@
 .endif
 
 .if !defined(LIB) || empty(LIB)
-LDADD+=        -L${LIBAMUOBJDIR} -lamu
-LIBDPLIBS+= -llibamu ${LIBAMUOBJDIR}
-#.if ${MKPICLIB} != "no"
-#DPADD+=       ${LIBAMUOBJDIR}/libamu_pic.a
-#.elif ${MKPIC} != "no"
-#DPADD+=       ${LIBAMUOBJDIR}/libamu.so
-#.else
-#DPADD+=       ${LIBAMUOBJDIR}/libamu.a
-#.endif
+PROGDPLIBS+=   amu     ${AMUTILS}/lib/libamu
 .endif
+.endif
diff -r d507ca14c291 -r 47625f0ae857 external/bsd/am-utils/bin/Makefile.inc
--- a/external/bsd/am-utils/bin/Makefile.inc    Thu Feb 14 01:21:25 2013 +0000
+++ b/external/bsd/am-utils/bin/Makefile.inc    Thu Feb 14 01:57:42 2013 +0000
@@ -1,7 +1,3 @@
-#      $NetBSD: Makefile.inc,v 1.1 2008/09/19 21:41:28 christos Exp $
-
-.include <bsd.own.mk>
-
-LIBAMUOBJDIR!=cd ${.CURDIR}/../../lib/libamu && ${PRINTOBJDIR}
+#      $NetBSD: Makefile.inc,v 1.2 2013/02/14 01:57:42 christos Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
diff -r d507ca14c291 -r 47625f0ae857 external/bsd/am-utils/bin/amd/Makefile
--- a/external/bsd/am-utils/bin/amd/Makefile    Thu Feb 14 01:21:25 2013 +0000
+++ b/external/bsd/am-utils/bin/amd/Makefile    Thu Feb 14 01:57:42 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2011/08/17 09:03:47 christos Exp $
+#      $NetBSD: Makefile,v 1.10 2013/02/14 01:57:42 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -51,7 +51,7 @@
 AMDOBJDIR!=cd ${.CURDIR} && ${PRINTOBJDIR}
 
 CPPFLAGS+=     -I${DIST} -I${AMDOBJDIR}
-LDADD+=                ${LIBAMU} -lrpcsvc
+LDADD+=                -lrpcsvc
 DPADD+=                ${LIBRPCSVC}
 YHEADER=       1
 
diff -r d507ca14c291 -r 47625f0ae857 external/bsd/am-utils/bin/amq/Makefile
--- a/external/bsd/am-utils/bin/amq/Makefile    Thu Feb 14 01:21:25 2013 +0000
+++ b/external/bsd/am-utils/bin/amq/Makefile    Thu Feb 14 01:57:42 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/08/17 09:03:47 christos Exp $
+#      $NetBSD: Makefile,v 1.5 2013/02/14 01:57:43 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -11,6 +11,5 @@
 MAN+=  amq.8
 
 CPPFLAGS+=     -I${DIST}
-LDADD+=                ${LIBAMU}
 
 .include <bsd.prog.mk>
diff -r d507ca14c291 -r 47625f0ae857 external/bsd/am-utils/bin/fixmount/Makefile
--- a/external/bsd/am-utils/bin/fixmount/Makefile       Thu Feb 14 01:21:25 2013 +0000
+++ b/external/bsd/am-utils/bin/fixmount/Makefile       Thu Feb 14 01:57:42 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2008/09/19 21:38:40 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2013/02/14 01:57:43 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -11,7 +11,7 @@
 MAN+=  fixmount.8
 
 CPPFLAGS+=     -I${DIST}
-LDADD+=                ${LIBAMU} -lrpcsvc
+LDADD+=                -lrpcsvc
 DPADD+=                ${LIBRPCSVC}
 
 .include <bsd.prog.mk>
diff -r d507ca14c291 -r 47625f0ae857 external/bsd/am-utils/bin/hlfsd/Makefile
--- a/external/bsd/am-utils/bin/hlfsd/Makefile  Thu Feb 14 01:21:25 2013 +0000
+++ b/external/bsd/am-utils/bin/hlfsd/Makefile  Thu Feb 14 01:57:42 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2011/08/17 09:03:47 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2013/02/14 01:57:43 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -11,6 +11,7 @@
 MAN+=  hlfsd.8
 
 CPPFLAGS+=     -I${DIST}
-LDADD+=                ${LIBAMU} -lrpcsvc
+LDADD+=                -lrpcsvc
+DPADD+=                ${LIBRPCSVC}
 
 .include <bsd.prog.mk>
diff -r d507ca14c291 -r 47625f0ae857 external/bsd/am-utils/bin/pawd/Makefile
--- a/external/bsd/am-utils/bin/pawd/Makefile   Thu Feb 14 01:21:25 2013 +0000
+++ b/external/bsd/am-utils/bin/pawd/Makefile   Thu Feb 14 01:57:42 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/06/20 07:43:57 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2013/02/14 01:57:43 christos Exp $
 
 BINDIR=        /usr/bin
 
@@ -13,7 +13,6 @@
 MAN+=  pawd.1
 
 CPPFLAGS+=     -I${DIST}
-LDADD+=                ${LIBAMU}
 
 .if defined(HAVE_GCC)
 COPTS.amq_xdr.c+=      -fno-strict-aliasing
diff -r d507ca14c291 -r 47625f0ae857 external/bsd/am-utils/bin/wire-test/Makefile
--- a/external/bsd/am-utils/bin/wire-test/Makefile      Thu Feb 14 01:21:25 2013 +0000
+++ b/external/bsd/am-utils/bin/wire-test/Makefile      Thu Feb 14 01:57:42 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2008/09/19 21:38:41 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2013/02/14 01:57:43 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -10,6 +10,4 @@
 SRCS=  wire-test.c
 MAN+=  wire-test.8
 
-LDADD+=        ${LIBAMU}
-
 .include <bsd.prog.mk>