Permalink
Browse files

Import of amd reach-over Makefiles for using the sources in dist/am-u…

…tils.
  • Loading branch information...
wiz
wiz committed Nov 20, 2000
1 parent 8b223b5 commit 8d24f516f89925d3e356d99628a3dcc981a90716
View
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.6 1999/09/04 22:24:53 christos Exp $
-SUBDIR= libamu amd amq hlfsd fixmount fsinfo mk-amd-map pawd wire-test doc
+# $NetBSD: Makefile,v 1.1.1.7 2000/11/20 00:16:16 wiz Exp $
+
+SUBDIR= libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd scripts wire-test
all-amd all-amq all-hlfsd all-fixmount all-fsinfo all-mk-amd-map all-pawd \
all-wire-test: all-libamu
View
@@ -1,20 +1,24 @@
-# $NetBSD: Makefile.inc,v 1.1.1.6 1999/02/01 18:45:39 christos Exp $
+# $NetBSD: Makefile.inc,v 1.1.1.7 2000/11/20 00:16:16 wiz Exp $
+
+WARNS?= 1
+
+IDIST= ${.CURDIR}/../../../dist/am-utils
+
+LIBAMUOBJDIR!=cd ${.CURDIR}/../libamu; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+
+CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../include -I${IDIST}/libamu \
+ -I${IDIST}/include -I${LIBAMUOBJDIR}
.include <bsd.own.mk>
-WARNS ?= 1
-LIBAMU != cd ${.CURDIR}/../libamu;\
- printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-CPPFLAGS += -I${.CURDIR}/../include -I${.CURDIR} -I${LIBAMU} -I. -DHAVE_CONFIG_H
-CPPFLAGS += -DDEBUG
.if !defined(LIB) || empty(LIB)
-LDADD += -L${LIBAMU} -lamu -lrpcsvc -ll
-.if defined(NOPIC)
-DPADD += ${LIBAMU}/libamu.a
+LDADD+= -L${LIBAMUOBJDIR} -lamu
+.if ${MKPIC} == "no"
+DPADD+= ${LIBAMUOBJDIR}/libamu.a
.else
-DPADD += ${LIBAMU}/libamu_pic.a
+DPADD+= ${LIBAMUOBJDIR}/libamu_pic.a
.endif
-DPADD += ${LIBRPCSVC} ${LIBL}
.endif
.if exists(${.CURDIR}/../../Makefile.inc)
View
@@ -1,18 +1,35 @@
-# $NetBSD: Makefile,v 1.1.1.5 1999/02/01 18:46:29 christos Exp $
-
-PROG= amd
-SRCS= conf_parse.c conf_tok.c srvr_nfs.c srvr_amfs_auto.c sched.c rpc_fwd.c \
-restart.c opts.c ops_unionfs.c ops_umapfs.c ops_ufs.c ops_tmpfs.c \
-ops_tfs.c ops_pcfs.c ops_nullfs.c ops_nfs3.c ops_nfs.c ops_mfs.c \
-ops_cdfs.c ops_autofs.c nfs_subr.c nfs_start.c nfs_prot_svc.c mntfs.c \
-mapc.c map.c info_union.c info_passwd.c info_nis.c info_ndbm.c \
-info_file.c info_hesiod.c get_args.c conf.c clock.c autil.c \
-amq_svc.c amq_subr.c amfs_union.c amfs_toplvl.c amfs_root.c amfs_program.c \
-amfs_nfsx.c amfs_nfsl.c amfs_linkx.c amfs_link.c amfs_inherit.c amfs_host.c \
-amfs_error.c amfs_direct.c amfs_auto.c amd.c am_ops.c
-MAN+= amd.8
-YHEADER=1
-CLEANFILES+=conf_tok.c conf_parse.c conf_parse.h
+# $NetBSD: Makefile,v 1.1.1.6 2000/11/20 00:16:18 wiz Exp $
+
+.include "${.CURDIR}/../Makefile.inc"
+
+PROG= amd
+
+DIST= ${IDIST}/amd
+.PATH: ${DIST}
+
+SRCS= am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c amfs_host.c \
+ amfs_inherit.c amfs_link.c amfs_linkx.c amfs_nfsl.c amfs_nfsx.c \
+ amfs_program.c amfs_root.c amfs_toplvl.c amfs_union.c amq_subr.c \
+ amq_svc.c autil.c clock.c conf.c get_args.c info_file.c info_hesiod.c \
+ info_ndbm.c info_nis.c info_passwd.c \
+ info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c \
+ nfs_subr.c ops_autofs.c ops_cdfs.c \
+ ops_mfs.c ops_nfs.c ops_nfs3.c ops_nullfs.c ops_pcfs.c \
+ ops_tfs.c ops_tmpfs.c ops_ufs.c ops_umapfs.c ops_unionfs.c \
+ opts.c restart.c rpc_fwd.c sched.c srvr_amfs_auto.c srvr_nfs.c \
+ conf_parse.c conf_tok.c
+# the following are not supported on NetBSD
+# info_ldap.c info_nisplus.c ops_cachefs.c ops_efs.c ops_lofs.c ops_xfs.c
+MAN+= amd.8
+
+AMDOBJDIR!=cd ${.CURDIR}; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+
+CPPFLAGS+= -I${DIST} -I${AMDOBJDIR}
+LDADD+= ${LIBAMU} -lrpcsvc
+DPADD+= ${LIBRPCSVC}
+YHEADER= 1
+CLEANFILES+= conf_tok.c conf_parse.c conf_parse.h
conf_tok.o: conf_parse.h
View
@@ -1,7 +1,16 @@
-# $NetBSD: Makefile,v 1.1.1.2 1997/07/24 21:23:01 christos Exp $
+# $NetBSD: Makefile,v 1.1.1.3 2000/11/20 00:16:18 wiz Exp $
-PROG= amq
-SRCS= amq_xdr.c amq_clnt.c amq.c
-MAN+= amq.8
+.include "${.CURDIR}/../Makefile.inc"
+
+PROG= amq
+
+DIST= ${IDIST}/amq
+.PATH: ${DIST}
+
+SRCS= amq_xdr.c amq_clnt.c amq.c
+MAN+= amq.8
+
+CPPFLAGS+= -I${DIST}
+LDADD+= ${LIBAMU}
.include <bsd.prog.mk>
View
@@ -1,6 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.3 1999/09/04 22:25:45 christos Exp $
+# $NetBSD: Makefile,v 1.1.1.4 2000/11/20 00:16:18 wiz Exp $
-TEXINFO = am-utils.info
-INFOFLAGS = -I${.CURDIR}
+.include "${.CURDIR}/../Makefile.inc"
+
+DIST= ${IDIST}/doc
+.PATH: ${DIST}
+
+TEXINFO= am-utils.texi
+INFOFLAGS= -I${DIST} -I${.CURDIR}
+
+CLEANFILES+= am-utils.info
.include <bsd.info.mk>
@@ -1,7 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 1997/07/24 21:24:12 christos Exp $
+# $NetBSD: Makefile,v 1.1.1.2 2000/11/20 00:16:18 wiz Exp $
-PROG= fixmount
-SRCS= check_mount.c fixmount.c
-MAN+= fixmount.8
+.include "${.CURDIR}/../Makefile.inc"
+
+PROG= fixmount
+
+DIST= ${IDIST}/fixmount
+.PATH: ${DIST} ${IDIST}/conf/checkmount
+
+SRCS= fixmount.c checkmount_bsd44.c
+MAN+= fixmount.8
+
+CPPFLAGS+= -I${DIST}
+LDADD+= ${LIBAMU} -lrpcsvc
+DPADD+= ${LIBRPCSVC}
.include <bsd.prog.mk>
@@ -1,12 +1,24 @@
-# $NetBSD: Makefile,v 1.1.1.4 1998/08/08 22:05:38 christos Exp $
+# $NetBSD: Makefile,v 1.1.1.5 2000/11/20 00:16:18 wiz Exp $
-PROG= fsinfo
-SRCS= fsi_gram.c fsi_lex.c wr_fstab.c wr_exportfs.c wr_dumpset.c wr_bparam.c \
-wr_atab.c fsinfo.c fsi_util.c fsi_dict.c fsi_analyze.c
-MAN+= fsinfo.8
-YHEADER=1
-CLEANFILES+=fsi_lex.c fsi_gram.c fsi_gram.h
+.include "${.CURDIR}/../Makefile.inc"
-fsi_lex.o: fsi_gram.h
+PROG= fsinfo
+
+DIST= ${IDIST}/fsinfo
+.PATH: ${DIST}
+
+SRCS= fsi_analyze.c fsi_dict.c fsi_gram.c fsi_lex.c fsi_util.c fsinfo.c \
+ wr_atab.c wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c
+MAN+= fsinfo.8
+
+
+FSINFOOBJDIR!=cd ${.CURDIR}; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+
+CPPFLAGS+= -I${DIST} -I${FSINFOOBJDIR}
+YHEADER= 1
+CLEANFILES+= fsi_lex.c fsi_gram.c fsi_gram.h
+
+fsi_lex.o fsinfo.o: fsi_gram.h
.include <bsd.prog.mk>
@@ -1,7 +1,16 @@
-# $NetBSD: Makefile,v 1.1.1.1 1997/07/24 21:22:43 christos Exp $
+# $NetBSD: Makefile,v 1.1.1.2 2000/11/20 00:16:18 wiz Exp $
-PROG= hlfsd
-SRCS= stubs.c nfs_prot_svc.c homedir.c hlfsd.c
-MAN+= hlfsd.8
+.include "${.CURDIR}/../Makefile.inc"
+
+PROG= hlfsd
+
+DIST= ${IDIST}/hlfsd
+.PATH: ${DIST}
+
+SRCS= hlfsd.c homedir.c nfs_prot_svc.c stubs.c
+MAN+= hlfsd.8
+
+CPPFLAGS+= -I${DIST}
+LDADD+= ${LIBAMU} -lrpcsvc
.include <bsd.prog.mk>
@@ -1,7 +1,7 @@
-/* $NetBSD: amu_nfs_prot.h,v 1.1.1.5 1999/09/04 22:25:02 christos Exp $ */
+/* $NetBSD: amu_nfs_prot.h,v 1.1.1.6 2000/11/20 00:16:18 wiz Exp $ */
/*
- * Copyright (c) 1997-1999 Erez Zadok
+ * Copyright (c) 1997-2000 Erez Zadok
* Copyright (c) 1990 Jan-Simon Pendry
* Copyright (c) 1990 Imperial College of Science, Technology & Medicine
* Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
*
* %W% (Berkeley) %G%
*
- * Id: nfs_prot_netbsd1_3.h,v 1.3 1999/02/04 07:24:36 ezk Exp
+ * $Id: amu_nfs_prot.h,v 1.1.1.6 2000/11/20 00:16:18 wiz Exp $
*
*/
@@ -50,6 +50,26 @@
#ifdef HAVE_RPCSVC_NFS_PROT_H
# include <rpcsvc/nfs_prot.h>
#endif /* HAVE_RPCSVC_NFS_PROT_H */
+#ifdef HAVE_NFS_RPCV2_H
+# include <nfs/rpcv2.h>
+#endif /* HAVE_NFS_RPCV2_H */
+#ifndef NFS_NPROCS
+# define NFS_NPROCS 26
+#endif /* not NFS_NPROCS */
+#ifdef HAVE_NFS_NFS_H
+# include <nfs/nfs.h>
+#endif /* HAVE_NFS_NFS_H */
+#ifdef HAVE_NFS_NFSMOUNT_H
+# include <nfs/nfsmount.h>
+#endif /* HAVE_NFS_NFSMOUNT_H */
+
+#ifdef HAVE_UFS_UFS_UFSMOUNT_H
+/* netbsd-1.4 does't protect <ufs/ufs/ufsmount.h> */
+# ifndef _UFS_UFS_UFSMOUNT_H
+# include <ufs/ufs/ufsmount.h>
+# define _UFS_UFS_UFSMOUNT_H
+# endif /* not _UFS_UFS_UFSMOUNT_H */
+#endif /* HAVE_UFS_UFS_UFSMOUNT_H */
/* NON-NFS STUFF (doesn't really belong here) */
#ifndef DEFINED_YPALL_CALLBACK_FXN_T
@@ -1,3 +1,5 @@
+/* $NetBSD: aux_conf.h,v 1.1.1.3 2000/11/20 00:16:17 wiz Exp $ */
+
/*
* aux_conf.h:
* This file gets "filled in" for each architecture.
Oops, something went wrong.

0 comments on commit 8d24f51

Please sign in to comment.