Patchwork [BUG:1274,2/8] nfs: Do not build nfs/rpc as shared library

login
register
Submitter Shehjar Tikoo
Date 2010-08-10 08:11:55
Message ID <1281427921-30665-2-git-send-email-shehjart@gluster.com>
Download mbox | patch
Permalink /patch/4050/
State Accepted
Delegated to: Anand Avati
Headers show

Comments

Shehjar Tikoo - 2010-08-10 08:11:55
From: Shehjar Tikoo <shehjart@gluster.com>

Signed-off-by: Shehjar Tikoo <shehjart@gluster.com>
---
 xlators/nfs/Makefile.am            |    2 +-
 xlators/nfs/lib/Makefile.am        |    3 ---
 xlators/nfs/lib/src/Makefile.am    |   11 -----------
 xlators/nfs/server/src/Makefile.am |   11 +++++------
 4 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 xlators/nfs/lib/Makefile.am
 delete mode 100644 xlators/nfs/lib/src/Makefile.am

Patch

diff --git a/xlators/nfs/Makefile.am b/xlators/nfs/Makefile.am
index de3c08c..8771032 100644
--- a/xlators/nfs/Makefile.am
+++ b/xlators/nfs/Makefile.am
@@ -1,3 +1,3 @@ 
-SUBDIRS = lib server
+SUBDIRS = server
 
 CLEANFILES =
diff --git a/xlators/nfs/lib/Makefile.am b/xlators/nfs/lib/Makefile.am
deleted file mode 100644
index a985f42..0000000
--- a/xlators/nfs/lib/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@ 
-SUBDIRS = src
-
-CLEANFILES =
diff --git a/xlators/nfs/lib/src/Makefile.am b/xlators/nfs/lib/src/Makefile.am
deleted file mode 100644
index 4eb9b61..0000000
--- a/xlators/nfs/lib/src/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@ 
-lib_LTLIBRARIES = libglrpcsvc.la
-libglrpcsvc_la_LDFLAGS = -avoidversion
-
-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)\
-	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)
-
-CLEANFILES =
diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am
index 5e1c9ba..e2e41de 100644
--- a/xlators/nfs/server/src/Makefile.am
+++ b/xlators/nfs/server/src/Makefile.am
@@ -1,14 +1,13 @@ 
 xlator_LTLIBRARIES = server.la
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs
-rpclibdir = $(top_srcdir)/xlators/nfs/lib/src/
+nfsrpclibdir = $(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/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 nfs-mem-types.h
+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 $(nfsrpclibdir)/auth-null.c  $(nfsrpclibdir)/auth-unix.c $(nfsrpclibdir)/msg-nfs3.c  $(nfsrpclibdir)/rpc-socket.c  $(nfsrpclibdir)/rpcsvc-auth.c  $(nfsrpclibdir)/rpcsvc.c  $(nfsrpclibdir)/xdr-nfs3.c  $(nfsrpclibdir)/xdr-rpc.c
+server_la_LIBADD = $(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 nfs-mem-types.h $(nfsrpclibdir)/xdr-rpc.h $(nfsrpclibdir)/msg-nfs3.h $(nfsrpclibdir)/xdr-common.h $(nfsrpclibdir)/xdr-nfs3.h $(nfsrpclibdir)/rpc-socket.h $(nfsrpclibdir)/rpcsvc.h
 AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
 	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)\
-	-I$(rpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree
+	-I$(nfsrpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree
 
 CLEANFILES =