Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add PROGDPLIBS, and remove duplicate dependencies.

This commit is contained in:
christos 2013-02-14 01:57:42 +00:00
parent 276acf4a26
commit 48e0a195df
8 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
external/bsd/am-utils/Makefile.inc vendored
View File

@ -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

6
external/bsd/am-utils/bin/Makefile.inc vendored
View File

@ -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"

4
external/bsd/am-utils/bin/amd/Makefile vendored
View File

@ -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

3
external/bsd/am-utils/bin/amq/Makefile vendored
View File

@ -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>

4
external/bsd/am-utils/bin/fixmount/Makefile vendored
View File

@ -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>

5
external/bsd/am-utils/bin/hlfsd/Makefile vendored
View File

@ -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 stubs.c
MAN+= hlfsd.8
CPPFLAGS+= -I${DIST}
LDADD+= ${LIBAMU} -lrpcsvc
LDADD+= -lrpcsvc
DPADD+= ${LIBRPCSVC}
.include <bsd.prog.mk>

3
external/bsd/am-utils/bin/pawd/Makefile vendored
View File

@ -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

4
external/bsd/am-utils/bin/wire-test/Makefile vendored
View File

@ -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>