Module Name: src
Committed By: christos
Date: Thu Feb 14 01:57:43 UTC 2013
Modified Files:
src/external/bsd/am-utils: Makefile.inc
src/external/bsd/am-utils/bin: Makefile.inc
src/external/bsd/am-utils/bin/amd: Makefile
src/external/bsd/am-utils/bin/amq: Makefile
src/external/bsd/am-utils/bin/fixmount: Makefile
src/external/bsd/am-utils/bin/hlfsd: Makefile
src/external/bsd/am-utils/bin/pawd: Makefile
src/external/bsd/am-utils/bin/wire-test: Makefile
Log Message:
add PROGDPLIBS, and remove duplicate dependencies.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/am-utils/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/am-utils/bin/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/am-utils/bin/amd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/am-utils/bin/amq/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/am-utils/bin/fixmount/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/bin/hlfsd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/am-utils/bin/pawd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/am-utils/bin/wire-test/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/bsd/am-utils/Makefile.inc
diff -u src/external/bsd/am-utils/Makefile.inc:1.4 src/external/bsd/am-utils/Makefile.inc:1.5
--- src/external/bsd/am-utils/Makefile.inc:1.4 Wed Feb 13 20:06:04 2013
+++ src/external/bsd/am-utils/Makefile.inc Wed Feb 13 20:57:42 2013
@@ -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 @@ BINDIR?= /usr/sbin
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 @@ CPPFLAGS+=-DHAVE_MAP_NIS=1
.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
Index: src/external/bsd/am-utils/bin/Makefile.inc
diff -u src/external/bsd/am-utils/bin/Makefile.inc:1.1 src/external/bsd/am-utils/bin/Makefile.inc:1.2
--- src/external/bsd/am-utils/bin/Makefile.inc:1.1 Fri Sep 19 17:41:28 2008
+++ src/external/bsd/am-utils/bin/Makefile.inc Wed Feb 13 20:57:42 2013
@@ -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"
Index: src/external/bsd/am-utils/bin/amd/Makefile
diff -u src/external/bsd/am-utils/bin/amd/Makefile:1.9 src/external/bsd/am-utils/bin/amd/Makefile:1.10
--- src/external/bsd/am-utils/bin/amd/Makefile:1.9 Wed Aug 17 05:03:47 2011
+++ src/external/bsd/am-utils/bin/amd/Makefile Wed Feb 13 20:57:42 2013
@@ -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 @@ MAN+= amd.8
AMDOBJDIR!=cd ${.CURDIR} && ${PRINTOBJDIR}
CPPFLAGS+= -I${DIST} -I${AMDOBJDIR}
-LDADD+= ${LIBAMU} -lrpcsvc
+LDADD+= -lrpcsvc
DPADD+= ${LIBRPCSVC}
YHEADER= 1
Index: src/external/bsd/am-utils/bin/amq/Makefile
diff -u src/external/bsd/am-utils/bin/amq/Makefile:1.4 src/external/bsd/am-utils/bin/amq/Makefile:1.5
--- src/external/bsd/am-utils/bin/amq/Makefile:1.4 Wed Aug 17 05:03:47 2011
+++ src/external/bsd/am-utils/bin/amq/Makefile Wed Feb 13 20:57:43 2013
@@ -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 @@ SRCS= amq_xdr.c amq_clnt.c amq.c
MAN+= amq.8
CPPFLAGS+= -I${DIST}
-LDADD+= ${LIBAMU}
.include <bsd.prog.mk>
Index: src/external/bsd/am-utils/bin/fixmount/Makefile
diff -u src/external/bsd/am-utils/bin/fixmount/Makefile:1.1 src/external/bsd/am-utils/bin/fixmount/Makefile:1.2
--- src/external/bsd/am-utils/bin/fixmount/Makefile:1.1 Fri Sep 19 17:38:40 2008
+++ src/external/bsd/am-utils/bin/fixmount/Makefile Wed Feb 13 20:57:43 2013
@@ -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 @@ SRCS= fixmount.c checkmount_bsd44.c
MAN+= fixmount.8
CPPFLAGS+= -I${DIST}
-LDADD+= ${LIBAMU} -lrpcsvc
+LDADD+= -lrpcsvc
DPADD+= ${LIBRPCSVC}
.include <bsd.prog.mk>
Index: src/external/bsd/am-utils/bin/hlfsd/Makefile
diff -u src/external/bsd/am-utils/bin/hlfsd/Makefile:1.3 src/external/bsd/am-utils/bin/hlfsd/Makefile:1.4
--- src/external/bsd/am-utils/bin/hlfsd/Makefile:1.3 Wed Aug 17 05:03:47 2011
+++ src/external/bsd/am-utils/bin/hlfsd/Makefile Wed Feb 13 20:57:43 2013
@@ -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 @@ SRCS= hlfsd.c homedir.c nfs_prot_svc.c s
MAN+= hlfsd.8
CPPFLAGS+= -I${DIST}
-LDADD+= ${LIBAMU} -lrpcsvc
+LDADD+= -lrpcsvc
+DPADD+= ${LIBRPCSVC}
.include <bsd.prog.mk>
Index: src/external/bsd/am-utils/bin/pawd/Makefile
diff -u src/external/bsd/am-utils/bin/pawd/Makefile:1.4 src/external/bsd/am-utils/bin/pawd/Makefile:1.5
--- src/external/bsd/am-utils/bin/pawd/Makefile:1.4 Mon Jun 20 03:43:57 2011
+++ src/external/bsd/am-utils/bin/pawd/Makefile Wed Feb 13 20:57:43 2013
@@ -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 @@ SRCS= amq_clnt.c amq_xdr.c pawd.c
MAN+= pawd.1
CPPFLAGS+= -I${DIST}
-LDADD+= ${LIBAMU}
.if defined(HAVE_GCC)
COPTS.amq_xdr.c+= -fno-strict-aliasing
Index: src/external/bsd/am-utils/bin/wire-test/Makefile
diff -u src/external/bsd/am-utils/bin/wire-test/Makefile:1.1 src/external/bsd/am-utils/bin/wire-test/Makefile:1.2
--- src/external/bsd/am-utils/bin/wire-test/Makefile:1.1 Fri Sep 19 17:38:41 2008
+++ src/external/bsd/am-utils/bin/wire-test/Makefile Wed Feb 13 20:57:43 2013
@@ -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 @@ DIST= ${IDIST}/wire-test
SRCS= wire-test.c
MAN+= wire-test.8
-LDADD+= ${LIBAMU}
-
.include <bsd.prog.mk>
