diff options
| author | Jeff Layton <jlayton@redhat.com> | 2009-08-01 06:26:15 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2009-08-01 06:26:15 -0400 |
| commit | f8dd0b70ecf5a02eda29af4acead86f3359c3081 (patch) | |
| tree | a0b1b0acad58f56c99945d8ddc15f59a415f620c | |
| parent | 3339c1f73c05fc9b5cf51e14a2033ec38f671334 (diff) | |
| download | nfs-utils-f8dd0b70ecf5a02eda29af4acead86f3359c3081.tar.gz nfs-utils-f8dd0b70ecf5a02eda29af4acead86f3359c3081.tar.xz nfs-utils-f8dd0b70ecf5a02eda29af4acead86f3359c3081.zip | |
nfs-utils: move nfssvc.c to nfsd dir and clean up linking of nfsd
rpc.nfsd is the only user of nfssvc.c, so we might as well move it
out of libnfs.a.
Also, don't link in libexport.a and libmisc.a, they aren't needed.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | support/include/nfslib.h | 1 | ||||
| -rw-r--r-- | support/nfs/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/nfsd/Makefile.am | 6 | ||||
| -rw-r--r-- | utils/nfsd/nfsd.c | 1 | ||||
| -rw-r--r-- | utils/nfsd/nfssvc.c (renamed from support/nfs/nfssvc.c) | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/support/include/nfslib.h b/support/include/nfslib.h index ae98650..537a31e 100644 --- a/support/include/nfslib.h +++ b/support/include/nfslib.h @@ -130,7 +130,6 @@ int wildmat(char *text, char *pattern); * nfsd library functions. */ int nfsctl(int, struct nfsctl_arg *, union nfsctl_res *); -int nfssvc(int port, int nrservs, unsigned int versbits, int minorvers4, unsigned int portbits, char *haddr); int nfsaddclient(struct nfsctl_client *clp); int nfsdelclient(struct nfsctl_client *clp); int nfsexport(struct nfsctl_export *exp); diff --git a/support/nfs/Makefile.am b/support/nfs/Makefile.am index 86f52a1..096f56d 100644 --- a/support/nfs/Makefile.am +++ b/support/nfs/Makefile.am @@ -2,7 +2,7 @@ noinst_LIBRARIES = libnfs.a libnfs_a_SOURCES = exports.c rmtab.c xio.c rpcmisc.c rpcdispatch.c \ - xlog.c xcommon.c wildmat.c nfssvc.c nfsclient.c \ + xlog.c xcommon.c wildmat.c nfsclient.c \ nfsexport.c getfh.c nfsctl.c rpc_socket.c getport.c \ svc_socket.c cacheio.c closeall.c nfs_mntent.c diff --git a/utils/nfsd/Makefile.am b/utils/nfsd/Makefile.am index 445e3fd..c4c6fb0 100644 --- a/utils/nfsd/Makefile.am +++ b/utils/nfsd/Makefile.am @@ -7,10 +7,8 @@ RPCPREFIX = rpc. KPREFIX = @kprefix@ sbin_PROGRAMS = nfsd -nfsd_SOURCES = nfsd.c -nfsd_LDADD = ../../support/export/libexport.a \ - ../../support/nfs/libnfs.a \ - ../../support/misc/libmisc.a +nfsd_SOURCES = nfsd.c nfssvc.c +nfsd_LDADD = ../../support/nfs/libnfs.a MAINTAINERCLEANFILES = Makefile.in diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c index e3c0094..8563c5c 100644 --- a/utils/nfsd/nfsd.c +++ b/utils/nfsd/nfsd.c @@ -25,6 +25,7 @@ #include <arpa/inet.h> #include "nfslib.h" +#include "nfssvc.h" static void usage(const char *); diff --git a/support/nfs/nfssvc.c b/utils/nfsd/nfssvc.c index 33c15a7..6c5289a 100644 --- a/support/nfs/nfssvc.c +++ b/utils/nfsd/nfssvc.c @@ -1,5 +1,5 @@ /* - * support/nfs/nfssvc.c + * utils/nfsd/nfssvc.c * * Run an NFS daemon. * |