diff options
| author | Shehjar Tikoo <shehjart@gluster.com> | 2010-03-31 23:52:33 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-04-02 04:14:27 -0700 |
| commit | 8d2342b19c715f2d6ecb024eace8102e2c5e3a29 (patch) | |
| tree | fdc0547516dda19ae6f88f6705bf5f37586f0e88 /xlators/nfs | |
| parent | 41f05fcefc1c192a3f322e827114897ec0ace316 (diff) | |
nfs: Fix RPC library name to avoid conflict with system librpcsvc
Signed-off-by: Shehjar Tikoo <shehjart@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 399 (NFS translator with Mount v3 and NFS v3 support)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=399
Diffstat (limited to 'xlators/nfs')
| -rw-r--r-- | xlators/nfs/lib/src/Makefile.am | 8 | ||||
| -rw-r--r-- | xlators/nfs/server/src/Makefile.am | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xlators/nfs/lib/src/Makefile.am b/xlators/nfs/lib/src/Makefile.am index a6090bb2896..a3a342aca2a 100644 --- a/xlators/nfs/lib/src/Makefile.am +++ b/xlators/nfs/lib/src/Makefile.am @@ -1,8 +1,8 @@ -lib_LTLIBRARIES = librpcsvc.la -librpcsvc_la_LDFLAGS = -module -avoidversion +lib_LTLIBRARIES = libglrpcsvc.la +libglrpcsvc_la_LDFLAGS = -module -avoidversion -librpcsvc_la_SOURCES = msg-nfs3.c xdr-nfs3.c xdr-rpc.c auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c rpc-socket.c -librpcsvc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +libglrpcsvc_la_SOURCES = msg-nfs3.c xdr-nfs3.c xdr-rpc.c auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c rpc-socket.c +libglrpcsvc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = xdr-rpc.h msg-nfs3.h xdr-common.h xdr-nfs3.h rpc-socket.h rpcsvc.h AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am index c51dad1e804..020c6b1a187 100644 --- a/xlators/nfs/server/src/Makefile.am +++ b/xlators/nfs/server/src/Makefile.am @@ -3,7 +3,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs rpclibdir = $(top_srcdir)/xlators/nfs/lib/src/ server_la_LDFLAGS = -module -avoidversion server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c -server_la_LIBADD = $(top_builddir)/xlators/nfs/lib/src/librpcsvc.la $(top_builddir)/libglusterfs/src/libglusterfs.la +server_la_LIBADD = $(top_builddir)/xlators/nfs/lib/src/libglrpcsvc.la $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = nfs.h nfs-common.h nfs-fops.h nfs-inodes.h nfs-generics.h mount3.h nfs3-fh.h nfs3.h nfs3-helpers.h |