From 1edd42a9d26d1c18f3290d2af8c68644993be63c Mon Sep 17 00:00:00 2001 From: jdolecek Date: Sat, 22 Mar 2003 12:43:57 +0000 Subject: [PATCH] move getmntopts(3) to libutil, build and install also it's manpage bump libutil minor adjust individual mount_*/Makefile to use libutil getmntopts(3) --- distrib/sets/lists/base/shl.mi | 6 +++--- distrib/sets/lists/comp/mi | 5 ++++- {sbin/mount => include}/mntopts.h | 2 +- lib/libutil/Makefile | 9 ++++++--- {sbin/mount => lib/libutil}/getmntopts.3 | 16 ++++++++++------ {sbin/mount => lib/libutil}/getmntopts.c | 6 +++--- lib/libutil/shlib_version | 4 ++-- sbin/mount/Makefile | 5 +---- sbin/mount_ados/Makefile | 7 +++++-- sbin/mount_cd9660/Makefile | 6 ++---- sbin/mount_ext2fs/Makefile | 9 ++++----- sbin/mount_fdesc/Makefile | 9 ++++----- sbin/mount_ffs/Makefile | 9 ++++----- sbin/mount_filecore/Makefile | 4 ++-- sbin/mount_kernfs/Makefile | 9 ++++----- sbin/mount_lfs/Makefile | 9 ++++----- sbin/mount_msdos/Makefile | 4 ++-- sbin/mount_nfs/Makefile | 8 +++----- sbin/mount_ntfs/Makefile | 4 ++-- sbin/mount_null/Makefile | 11 ++++++----- sbin/mount_overlay/Makefile | 11 ++++++----- sbin/mount_portal/Makefile | 11 ++++++----- sbin/mount_procfs/Makefile | 8 ++------ sbin/mount_smbfs/Makefile | 8 +++----- sbin/mount_umap/Makefile | 11 ++++++----- sbin/mount_union/Makefile | 8 +++----- 26 files changed, 98 insertions(+), 101 deletions(-) rename {sbin/mount => include}/mntopts.h (98%) rename {sbin/mount => lib/libutil}/getmntopts.3 (93%) rename {sbin/mount => lib/libutil}/getmntopts.c (95%) diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi index b2078a1c5d78..be490157cf64 100644 --- a/distrib/sets/lists/base/shl.mi +++ b/distrib/sets/lists/base/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.203 2003/03/05 20:18:14 tshiozak Exp $ +# $NetBSD: shl.mi,v 1.204 2003/03/22 12:44:02 jdolecek Exp $ # Note: libtermcap and libtermlib are hardlinked and share the same version. ./lib/libc.so.12.96 base-sys-shlib ./lib/libcrypt.so.0.1 base-sys-shlib @@ -10,7 +10,7 @@ ./lib/libm.so.0.1 base-sys-shlib ./lib/libtermcap.so.0.5 base-sys-shlib ./lib/libtermlib.so.0.5 base-sys-shlib -./lib/libutil.so.7.1 base-sys-shlib +./lib/libutil.so.7.2 base-sys-shlib ./lib/libz.so.0.3 base-sys-shlib ./usr/lib/i18n/libBIG5.so.4.1 base-i18n-shlib ./usr/lib/i18n/libEUC.so.4.1 base-i18n-shlib @@ -63,6 +63,6 @@ ./usr/lib/libtermcap.so.0.5 base-sys-shlib ./usr/lib/libtermlib.so.0.5 base-sys-shlib ./usr/lib/libusbhid.so.1.0 base-sys-shlib -./usr/lib/libutil.so.7.1 base-sys-shlib +./usr/lib/libutil.so.7.2 base-sys-shlib ./usr/lib/libwrap.so.0.2 base-net-shlib ./usr/lib/libz.so.0.3 base-sys-shlib diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 0b9c853a7586..d96a408300d7 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.545 2003/03/10 08:01:11 lukem Exp $ +# $NetBSD: mi,v 1.546 2003/03/22 12:44:02 jdolecek Exp $ ./usr/bin/addr2line comp-debug-bin ./usr/bin/ar comp-util-bin ./usr/bin/as comp-util-bin @@ -330,6 +330,7 @@ ./usr/include/miscfs/umapfs/umap.h comp-c-include ./usr/include/miscfs/union comp-c-include ./usr/include/miscfs/union/union.h comp-c-include +./usr/include/mntopts.h comp-c-include ./usr/include/mpool.h comp-c-include ./usr/include/msdosfs comp-c-include ./usr/include/msdosfs/bootsect.h comp-c-include @@ -2066,6 +2067,7 @@ ./usr/share/man/cat3/getmaxx.0 comp-c-catman ./usr/share/man/cat3/getmaxy.0 comp-c-catman ./usr/share/man/cat3/getmntinfo.0 comp-c-catman +./usr/share/man/cat3/getmntopts.0 comp-c-catman ./usr/share/man/cat3/getmode.0 comp-c-catman ./usr/share/man/cat3/getnameinfo.0 comp-c-catman ./usr/share/man/cat3/getnetbyaddr.0 comp-c-catman @@ -5117,6 +5119,7 @@ ./usr/share/man/man3/getmaxx.3 comp-c-man ./usr/share/man/man3/getmaxy.3 comp-c-man ./usr/share/man/man3/getmntinfo.3 comp-c-man +./usr/share/man/man3/getmntopts.3 comp-c-man ./usr/share/man/man3/getmode.3 comp-c-man ./usr/share/man/man3/getnameinfo.3 comp-c-man ./usr/share/man/man3/getnetbyaddr.3 comp-c-man diff --git a/sbin/mount/mntopts.h b/include/mntopts.h similarity index 98% rename from sbin/mount/mntopts.h rename to include/mntopts.h index 1ffeb50f1275..1dc4ad4914cd 100644 --- a/sbin/mount/mntopts.h +++ b/include/mntopts.h @@ -1,4 +1,4 @@ -/* $NetBSD: mntopts.h,v 1.11 2002/11/07 12:43:50 christos Exp $ */ +/* $NetBSD: mntopts.h,v 1.1 2003/03/22 12:44:03 jdolecek Exp $ */ /*- * Copyright (c) 1994 diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index e371890267bc..1f6eec034e5e 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2002/12/12 09:45:33 scw Exp $ +# $NetBSD: Makefile,v 1.43 2003/03/22 12:44:04 jdolecek Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 USE_SHLIBDIR= yes @@ -7,14 +7,17 @@ USE_SHLIBDIR= yes LIB= util CPPFLAGS+=-DLIBC_SCCS -SRCS= getbootfile.c getlabelsector.c getmaxpartitions.c getrawpartition.c \ +SRCS= getbootfile.c getlabelsector.c getmaxpartitions.c \ + getmntopts.c getrawpartition.c \ disklabel_dkcksum.c disklabel_scan.c \ login.c loginx.c login_cap.c login_tty.c logout.c logoutx.c \ logwtmp.c logwtmpx.c opendisk.c \ passwd.c pw_scan.c pidfile.c pidlock.c pty.c secure_path.c \ snprintb.c ttyaction.c ttymsg.c -MAN= getbootfile.3 getlabelsector.3 getmaxpartitions.3 getrawpartition.3 \ +MAN= getbootfile.3 getlabelsector.3 getmaxpartitions.3 \ + getmntopts.3 \ + getrawpartition.3 \ login.3 login_cap.3 loginx.3 \ disklabel_dkcksum.3 disklabel_scan.3 \ opendisk.3 openpty.3 pidfile.3 pidlock.3 \ diff --git a/sbin/mount/getmntopts.3 b/lib/libutil/getmntopts.3 similarity index 93% rename from sbin/mount/getmntopts.3 rename to lib/libutil/getmntopts.3 index e81ccad2e1c9..71ef9e20560d 100644 --- a/sbin/mount/getmntopts.3 +++ b/lib/libutil/getmntopts.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: getmntopts.3,v 1.6 2002/02/08 01:30:44 ross Exp $ +.\" $NetBSD: getmntopts.3,v 1.1 2003/03/22 12:44:04 jdolecek Exp $ .\" .\" Copyright (c) 1994 .\" The Regents of the University of California. All rights reserved. @@ -33,16 +33,18 @@ .\" .\" @(#)getmntopts.3 8.3 (Berkeley) 3/30/95 .\" -.Dd March 30, 1995 +.Dd March 22, 2003 .Dt GETMNTOPTS 3 .Os .Sh NAME .Nm getmntopts .Nd scan mount options +.Sh LIBRARY +.Lb libutil .Sh SYNOPSIS .Fd #include \*[Lt]mntopts.h\*[Gt] .Ft void -.Fn getmntopts "char *options" "struct mntopt *mopts" "int *flagp" "int *altflagp" +.Fn getmntopts "const char *options" "const struct mntopt *mopts" "int *flagp" "int *altflagp" .Sh DESCRIPTION The .Nm getmntopts @@ -71,7 +73,7 @@ The table, has the following format: .Bd -literal struct mntopt { - char *m_option; /* option name */ + const char *m_option; /* option name */ int m_inverse; /* is this a negative option, eg "dev" */ int m_flag; /* bit to set, eg MNT_RDONLY */ int m_altloc; /* non-zero to use altflagp rather than flagp */ @@ -147,9 +149,9 @@ flag, would also have an entry. This can be declared and used as follows: .Bd -literal -#include "mntopts.h" +#include -struct mntopt mopts[] = { +static const struct mntopt mopts[] = { MOPT_STDOPTS, MOPT_UPDATE, { NULL } @@ -179,3 +181,5 @@ The .Fn getmntopts function appeared in .Bx 4.4 . +It was moved to utilities library in +.Nx 2.0 . diff --git a/sbin/mount/getmntopts.c b/lib/libutil/getmntopts.c similarity index 95% rename from sbin/mount/getmntopts.c rename to lib/libutil/getmntopts.c index 6615f03ce1cd..2167816099cc 100644 --- a/sbin/mount/getmntopts.c +++ b/lib/libutil/getmntopts.c @@ -1,4 +1,4 @@ -/* $NetBSD: getmntopts.c,v 1.6 1999/11/09 15:06:33 drochner Exp $ */ +/* $NetBSD: getmntopts.c,v 1.1 2003/03/22 12:44:04 jdolecek Exp $ */ /*- * Copyright (c) 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)getmntopts.c 8.3 (Berkeley) 3/29/95"; #else -__RCSID("$NetBSD: getmntopts.c,v 1.6 1999/11/09 15:06:33 drochner Exp $"); +__RCSID("$NetBSD: getmntopts.c,v 1.1 2003/03/22 12:44:04 jdolecek Exp $"); #endif #endif /* not lint */ @@ -51,7 +51,7 @@ __RCSID("$NetBSD: getmntopts.c,v 1.6 1999/11/09 15:06:33 drochner Exp $"); #include #include -#include "mntopts.h" +#include int getmnt_silent = 0; diff --git a/lib/libutil/shlib_version b/lib/libutil/shlib_version index dd5b49e3814d..66b9e1134019 100644 --- a/lib/libutil/shlib_version +++ b/lib/libutil/shlib_version @@ -1,5 +1,5 @@ -# $NetBSD: shlib_version,v 1.31 2002/12/12 09:46:49 scw Exp $ +# $NetBSD: shlib_version,v 1.32 2003/03/22 12:44:04 jdolecek Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # major=7 -minor=1 +minor=2 diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile index 190345a5f4c3..8c2f9eab218b 100644 --- a/sbin/mount/Makefile +++ b/sbin/mount/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2003/01/19 12:37:41 tsutsui Exp $ +# $NetBSD: Makefile,v 1.28 2003/03/22 12:44:04 jdolecek Exp $ # @(#)Makefile 8.6 (Berkeley) 5/8/95 .include @@ -6,9 +6,6 @@ PROG= mount MAN= mount.8 SRCS= mount.c vfslist.c -# We do NOT install the getmntopts.3 man page. -# getmntopts.c in this directory is used by different mount programs which -# use .PATH directives to get it. .if defined(RESCUEDIR) CPPFLAGS+= -D_PATH_RESCUE=\"${RESCUEDIR}\" diff --git a/sbin/mount_ados/Makefile b/sbin/mount_ados/Makefile index 172abe6b8d9f..5b55f91a5b32 100644 --- a/sbin/mount_ados/Makefile +++ b/sbin/mount_ados/Makefile @@ -1,13 +1,16 @@ -# $NetBSD: Makefile,v 1.10 2002/08/19 10:16:55 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2003/03/22 12:43:57 jdolecek Exp $ .include PROG= mount_ados -SRCS= mount_ados.c getmntopts.c fattr.c +SRCS= mount_ados.c fattr.c MAN= mount_ados.8 MOUNT= ${NETBSDSRCDIR}/sbin/mount CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT} .PATH: ${MOUNT} +DPADD+=${LIBUTIL} +LDADD+=-lutil + .include diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile index 40c49adee997..fb6ed0d56779 100644 --- a/sbin/mount_cd9660/Makefile +++ b/sbin/mount_cd9660/Makefile @@ -1,15 +1,13 @@ -# $NetBSD: Makefile,v 1.8 2002/09/21 18:43:33 christos Exp $ +# $NetBSD: Makefile,v 1.9 2003/03/22 12:43:58 jdolecek Exp $ # @(#)Makefile 8.3 (Berkeley) 3/27/94 .include PROG= mount_cd9660 -SRCS= mount_cd9660.c getmntopts.c +SRCS= mount_cd9660.c MAN= mount_cd9660.8 MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${MOUNT} -.PATH: ${MOUNT} DPADD+=${LIBUTIL} LDADD+=-lutil diff --git a/sbin/mount_ext2fs/Makefile b/sbin/mount_ext2fs/Makefile index 5f651779a454..d9aaf3760767 100644 --- a/sbin/mount_ext2fs/Makefile +++ b/sbin/mount_ext2fs/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2002/08/19 10:16:56 lukem Exp $ +# $NetBSD: Makefile,v 1.5 2003/03/22 12:43:58 jdolecek Exp $ # # $OpenBSD: Makefile,v 1.1 1996/06/27 07:20:28 downsj Exp $ .include PROG= mount_ext2fs -SRCS= mount_ext2fs.c getmntopts.c +SRCS= mount_ext2fs.c MAN= mount_ext2fs.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${MOUNT} -.PATH: ${MOUNT} +DPADD+=${LIBUTIL} +LDADD+=-lutil .include diff --git a/sbin/mount_fdesc/Makefile b/sbin/mount_fdesc/Makefile index 1277be65bf3e..be209d6e9a74 100644 --- a/sbin/mount_fdesc/Makefile +++ b/sbin/mount_fdesc/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.10 2002/08/19 10:16:56 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2003/03/22 12:43:58 jdolecek Exp $ # @(#)Makefile 8.2 (Berkeley) 3/27/94 .include PROG= mount_fdesc -SRCS= mount_fdesc.c getmntopts.c +SRCS= mount_fdesc.c MAN= mount_fdesc.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${MOUNT} -.PATH: ${MOUNT} +DPADD+=${LIBUTIL} +LDADD+=-lutil .include diff --git a/sbin/mount_ffs/Makefile b/sbin/mount_ffs/Makefile index efceb7ede771..fb6eaaa48c1d 100644 --- a/sbin/mount_ffs/Makefile +++ b/sbin/mount_ffs/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.5 2002/08/19 10:16:56 lukem Exp $ +# $NetBSD: Makefile,v 1.6 2003/03/22 12:43:59 jdolecek Exp $ .include PROG= mount_ffs -SRCS= mount_ffs.c getmntopts.c +SRCS= mount_ffs.c MAN= mount_ffs.8 MLINKS= mount_ffs.8 mount_ufs.8 LINKS= ${BINDIR}/mount_ffs ${BINDIR}/mount_ufs -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${MOUNT} -.PATH: ${MOUNT} +DPADD+=${LIBUTIL} +LDADD+=-lutil .include diff --git a/sbin/mount_filecore/Makefile b/sbin/mount_filecore/Makefile index 23d65d7cd7de..8291a994fd8b 100644 --- a/sbin/mount_filecore/Makefile +++ b/sbin/mount_filecore/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2002/09/21 18:43:34 christos Exp $ +# $NetBSD: Makefile,v 1.6 2003/03/22 12:43:59 jdolecek Exp $ # # Makefile 1.0 1998/6/26 .include PROG= mount_filecore -SRCS= mount_filecore.c getmntopts.c fattr.c +SRCS= mount_filecore.c fattr.c MAN= mount_filecore.8 MOUNT= ${NETBSDSRCDIR}/sbin/mount diff --git a/sbin/mount_kernfs/Makefile b/sbin/mount_kernfs/Makefile index 07c6d673cf8b..d08dba6b2e84 100644 --- a/sbin/mount_kernfs/Makefile +++ b/sbin/mount_kernfs/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.10 2002/08/19 10:16:57 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2003/03/22 12:43:59 jdolecek Exp $ # @(#)Makefile 8.2 (Berkeley) 3/27/94 .include PROG= mount_kernfs -SRCS= mount_kernfs.c getmntopts.c +SRCS= mount_kernfs.c MAN= mount_kernfs.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${MOUNT} -.PATH: ${MOUNT} +DPADD+=${LIBUTIL} +LDADD+=-lutil .include diff --git a/sbin/mount_lfs/Makefile b/sbin/mount_lfs/Makefile index accd0ceb58b2..a4d05027a7ce 100644 --- a/sbin/mount_lfs/Makefile +++ b/sbin/mount_lfs/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.7 2002/08/19 10:16:57 lukem Exp $ +# $NetBSD: Makefile,v 1.8 2003/03/22 12:43:59 jdolecek Exp $ # @(#)Makefile 8.2 (Berkeley) 3/27/94 .include PROG= mount_lfs -SRCS= mount_lfs.c getmntopts.c +SRCS= mount_lfs.c MAN= mount_lfs.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${MOUNT} -.PATH: ${MOUNT} +DPADD+=${LIBUTIL} +LDADD+=-lutil .include diff --git a/sbin/mount_msdos/Makefile b/sbin/mount_msdos/Makefile index 5e2d45ed4612..351ccb50310f 100644 --- a/sbin/mount_msdos/Makefile +++ b/sbin/mount_msdos/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2002/09/21 18:43:35 christos Exp $ +# $NetBSD: Makefile,v 1.18 2003/03/22 12:44:00 jdolecek Exp $ .include PROG= mount_msdos -SRCS= mount_msdos.c getmntopts.c fattr.c +SRCS= mount_msdos.c fattr.c MAN= mount_msdos.8 MOUNT= ${NETBSDSRCDIR}/sbin/mount diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile index b2b9b30adc78..9688408c37e6 100644 --- a/sbin/mount_nfs/Makefile +++ b/sbin/mount_nfs/Makefile @@ -1,15 +1,13 @@ -# $NetBSD: Makefile,v 1.12 2002/09/21 18:43:36 christos Exp $ +# $NetBSD: Makefile,v 1.13 2003/03/22 12:44:00 jdolecek Exp $ # @(#)Makefile 8.2 (Berkeley) 3/27/94 .include PROG= mount_nfs -SRCS= mount_nfs.c getmntopts.c +SRCS= mount_nfs.c MAN= mount_nfs.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -DNFS -I${MOUNT} -.PATH: ${MOUNT} +CPPFLAGS+= -DNFS .if defined(notdef) # XXX no kernel kerb NFS support! .if defined(KERBEROS) diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile index 373f2ed79a61..03d625046693 100644 --- a/sbin/mount_ntfs/Makefile +++ b/sbin/mount_ntfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/09/21 18:43:36 christos Exp $ +# $NetBSD: Makefile,v 1.7 2003/03/22 12:44:00 jdolecek Exp $ # # Id: Makefile,v 1.1.1.1 1999/02/03 03:51:19 semenu Exp # @@ -6,7 +6,7 @@ .include PROG= mount_ntfs -SRCS= mount_ntfs.c getmntopts.c fattr.c +SRCS= mount_ntfs.c fattr.c MAN= mount_ntfs.8 MOUNT= ${NETBSDSRCDIR}/sbin/mount diff --git a/sbin/mount_null/Makefile b/sbin/mount_null/Makefile index 513309871817..c537a9e6f78d 100644 --- a/sbin/mount_null/Makefile +++ b/sbin/mount_null/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.9 2002/08/19 10:16:58 lukem Exp $ +# $NetBSD: Makefile,v 1.10 2003/03/22 12:44:00 jdolecek Exp $ # @(#)Makefile 8.3 (Berkeley) 3/27/94 .include PROG= mount_null -SRCS= mount_null.c getmntopts.c +SRCS= mount_null.c MAN= mount_null.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT} -.PATH: ${MOUNT} +CPPFLAGS+= -I${NETBSDSRCDIR}/sys + +DPADD+=${LIBUTIL} +LDADD+=-lutil .include diff --git a/sbin/mount_overlay/Makefile b/sbin/mount_overlay/Makefile index cb3a31872233..0d3cb84e4cfb 100644 --- a/sbin/mount_overlay/Makefile +++ b/sbin/mount_overlay/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2002/08/19 10:16:58 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2003/03/22 12:44:01 jdolecek Exp $ # @(#)Makefile 8.3 (Berkeley) 3/27/94 .include PROG= mount_overlay -SRCS= mount_overlay.c getmntopts.c +SRCS= mount_overlay.c MAN= mount_overlay.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT} -.PATH: ${MOUNT} +CPPFLAGS+= -I${NETBSDSRCDIR}/sys + +DPADD+=${LIBUTIL} +LDADD+=-lutil .include diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile index 42ba3911877a..91f45a9421c3 100644 --- a/sbin/mount_portal/Makefile +++ b/sbin/mount_portal/Makefile @@ -1,19 +1,20 @@ -# $NetBSD: Makefile,v 1.19 2002/08/19 10:16:58 lukem Exp $ +# $NetBSD: Makefile,v 1.20 2003/03/22 12:44:01 jdolecek Exp $ # @(#)Makefile 8.3 (Berkeley) 3/27/94 .include PROG= mount_portal -SRCS= mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \ +SRCS= mount_portal.c activate.c conf.c pt_conf.c \ pt_exec.c pt_file.c pt_tcp.c pt_filter.c SUBDIR= examples MAN= mount_portal.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT} -.PATH: ${MOUNT} +CPPFLAGS+= -I${NETBSDSRCDIR}/sys CPPFLAGS+= -DINET6 +DPADD+=${LIBUTIL} +LDADD+=-lutil + .include .include diff --git a/sbin/mount_procfs/Makefile b/sbin/mount_procfs/Makefile index e02aa4bc9911..536109cbc719 100644 --- a/sbin/mount_procfs/Makefile +++ b/sbin/mount_procfs/Makefile @@ -1,16 +1,12 @@ -# $NetBSD: Makefile,v 1.11 2002/09/21 18:43:38 christos Exp $ +# $NetBSD: Makefile,v 1.12 2003/03/22 12:44:01 jdolecek Exp $ # @(#)Makefile 8.4 (Berkeley) 3/27/94 .include PROG= mount_procfs -SRCS= mount_procfs.c getmntopts.c +SRCS= mount_procfs.c MAN= mount_procfs.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${MOUNT} -.PATH: ${MOUNT} - DPADD+=${LIBUTIL} LDADD+=-lutil diff --git a/sbin/mount_smbfs/Makefile b/sbin/mount_smbfs/Makefile index e4d947ff955a..dee92a0898ba 100644 --- a/sbin/mount_smbfs/Makefile +++ b/sbin/mount_smbfs/Makefile @@ -1,19 +1,17 @@ -# $NetBSD: Makefile,v 1.1 2003/02/18 20:35:30 jdolecek Exp $ +# $NetBSD: Makefile,v 1.2 2003/03/22 12:44:01 jdolecek Exp $ .include PROG= mount_smbfs -SRCS= mount_smbfs.c getmntopts.c +SRCS= mount_smbfs.c SRCS+= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \ print.c kiconv.c nb.c nb_name.c nb_net.c nbns_rq.c MAN= mount_smbfs.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount SMBDIST=${NETBSDSRCDIR}/dist/smbfs -CPPFLAGS+= -I${MOUNT} -I${NETBSDSRCDIR}/sys -I${SMBDIST}/include +CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${SMBDIST}/include -.PATH: ${MOUNT} .PATH: ${SMBDIST}/mount_smbfs ${SMBDIST}/lib/smb DPADD+=${LIBUTIL} diff --git a/sbin/mount_umap/Makefile b/sbin/mount_umap/Makefile index b9441a726fd5..b389ee24fd6e 100644 --- a/sbin/mount_umap/Makefile +++ b/sbin/mount_umap/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.8 2002/08/19 10:16:59 lukem Exp $ +# $NetBSD: Makefile,v 1.9 2003/03/22 12:44:01 jdolecek Exp $ # @(#)Makefile 8.3 (Berkeley) 3/27/94 .include PROG= mount_umap -SRCS= mount_umap.c getmntopts.c +SRCS= mount_umap.c MAN= mount_umap.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT} -.PATH: ${MOUNT} +CPPFLAGS+= -I${NETBSDSRCDIR}/sys + +DPADD+=${LIBUTIL} +LDADD+=-lutil .include diff --git a/sbin/mount_union/Makefile b/sbin/mount_union/Makefile index 94addc77a815..a64ed6c921cb 100644 --- a/sbin/mount_union/Makefile +++ b/sbin/mount_union/Makefile @@ -1,15 +1,13 @@ -# $NetBSD: Makefile,v 1.11 2002/09/21 18:43:38 christos Exp $ +# $NetBSD: Makefile,v 1.12 2003/03/22 12:44:02 jdolecek Exp $ # @(#)Makefile 8.4 (Berkeley) 7/13/94 .include PROG= mount_union -SRCS= mount_union.c getmntopts.c +SRCS= mount_union.c MAN= mount_union.8 -MOUNT= ${NETBSDSRCDIR}/sbin/mount -CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT} -.PATH: ${MOUNT} +CPPFLAGS+= -I${NETBSDSRCDIR}/sys DPADD+=${LIBUTIL} LDADD+=-lutil