From 6f7c45cc94db5c7aa02b536d30e952dc1801d857 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Sun, 2 Sep 2001 20:37:36 +0000
Subject: Use the native mount and nfs_prot headers. Also generate nfs_prot_x.c
 in ANSI-C mode.

---
 usr.sbin/amd/amd/Makefile     | 3 ++-
 usr.sbin/amd/include/Makefile | 8 +-------
 usr.sbin/amd/libamu/Makefile  | 5 +++--
 3 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'usr.sbin/amd')

diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index b74da43..a05a728 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -22,7 +22,8 @@ SRCS+=	ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c ops_umapfs.c
 SRCS+=	ops_unionfs.c opts.c restart.c rpc_fwd.c sched.c
 SRCS+=	srvr_amfs_auto.c srvr_nfs.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd
+CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \
+	 -I${DESTDIR}/usr/include/rpcsvc
 
 DPADD=	${LIBAMU} ${LIBRPCSVC}
 LDADD=	${LIBAMU} -lrpcsvc
diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile
index d3c77d1..2fc5118 100644
--- a/usr.sbin/amd/include/Makefile
+++ b/usr.sbin/amd/include/Makefile
@@ -7,7 +7,7 @@
 #	Portions derived from amd/libamu/Makefile
 #	$NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $
 
-SRCS=	config_local.h mount.h nfs_prot.h
+SRCS=	config_local.h
 CLEANFILES=	${SRCS}
 
 all: ${SRCS}
@@ -16,10 +16,4 @@ config_local.h: newvers.sh
 	@rm -f ${.TARGET}
 	sh ${.ALLSRC} > ${.TARGET}
 
-mount.h: ${MOUNT_X}
-	${RPCCOM} -h -C -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET}
-
-nfs_prot.h: ${NFS_PROT_X}
-	${RPCCOM} -h -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET}
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile
index b2738ac..d055f3d 100644
--- a/usr.sbin/amd/libamu/Makefile
+++ b/usr.sbin/amd/libamu/Makefile
@@ -22,10 +22,11 @@ SRCS+=	transp_sockets.c mtab_bsd.c umount_bsd44.c
 SRCS+=		nfs_prot_x.c
 CLEANFILES+=	nfs_prot_x.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu
+CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu \
+	 -I${DESTDIR}/usr/include/rpcsvc
 
 nfs_prot_x.c: ${NFS_PROT_X}
-	${RPCCOM} -c -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET}
+	${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET}
 
 install:
 
-- 
cgit v1.1