32 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 9f93f992d80..ce0adb8c7c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = autogen.sh COPYING INSTALL README AUTHORS THANKS NEWS glusterfs.spec
 
-SUBDIRS = argp-standalone libglusterfs xlators glusterfsd $(FUSERMOUNT_SUBDIR) doc extras contrib
+SUBDIRS = argp-standalone libglusterfs rpc xlators glusterfsd $(FUSERMOUNT_SUBDIR) doc extras contrib
 
 CLEANFILES = 
 
diff --git a/configure.ac b/configure.ac
index ffe87e819f0..fe88d5e3306 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,12 @@ AC_CONFIG_FILES([Makefile
 		libglusterfs/src/Makefile
 		glusterfsd/Makefile
 		glusterfsd/src/Makefile
+                rpc/Makefile
+                rpc/rpc-lib/Makefile
+                rpc/rpc-lib/src/Makefile
+                rpc/rpc-transport/Makefile
+                rpc/rpc-transport/socket/Makefile
+                rpc/rpc-transport/socket/src/Makefile
 		xlators/Makefile
 		xlators/mount/Makefile
 		xlators/mount/fuse/Makefile
@@ -84,12 +90,6 @@ AC_CONFIG_FILES([Makefile
 		xlators/protocol/auth/addr/src/Makefile
 		xlators/protocol/auth/login/Makefile
 		xlators/protocol/auth/login/src/Makefile
-                xlators/protocol/rpc/Makefile
-                xlators/protocol/rpc/rpc-lib/Makefile
-                xlators/protocol/rpc/rpc-lib/src/Makefile
-                xlators/protocol/rpc/rpc-transport/Makefile
-                xlators/protocol/rpc/rpc-transport/socket/Makefile
-                xlators/protocol/rpc/rpc-transport/socket/src/Makefile
 		xlators/protocol/client/Makefile
 		xlators/protocol/client/src/Makefile
 		xlators/protocol/server/Makefile
diff --git a/xlators/protocol/rpc/Makefile.am b/rpc/Makefile.am
index bd435fa6d38..bd435fa6d38 100644
--- a/xlators/protocol/rpc/Makefile.am
+++ b/rpc/Makefile.am
diff --git a/xlators/protocol/rpc/rpc-lib/Makefile.am b/rpc/rpc-lib/Makefile.am
index af437a64d6d..af437a64d6d 100644
--- a/xlators/protocol/rpc/rpc-lib/Makefile.am
+++ b/rpc/rpc-lib/Makefile.am
diff --git a/xlators/protocol/rpc/rpc-lib/src/Makefile.am b/rpc/rpc-lib/src/Makefile.am
index 4df8888a08d..4df8888a08d 100644
--- a/xlators/protocol/rpc/rpc-lib/src/Makefile.am
+++ b/rpc/rpc-lib/src/Makefile.am
diff --git a/xlators/protocol/rpc/rpc-lib/src/auth-glusterfs.c b/rpc/rpc-lib/src/auth-glusterfs.c
index e248bf142aa..e248bf142aa 100644
--- a/xlators/protocol/rpc/rpc-lib/src/auth-glusterfs.c
+++ b/rpc/rpc-lib/src/auth-glusterfs.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/auth-null.c b/rpc/rpc-lib/src/auth-null.c
index a2581a1718d..a2581a1718d 100644
--- a/xlators/protocol/rpc/rpc-lib/src/auth-null.c
+++ b/rpc/rpc-lib/src/auth-null.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/auth-unix.c b/rpc/rpc-lib/src/auth-unix.c
index aed3c1f9d46..aed3c1f9d46 100644
--- a/xlators/protocol/rpc/rpc-lib/src/auth-unix.c
+++ b/rpc/rpc-lib/src/auth-unix.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index 84fdb9bb55f..84fdb9bb55f 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpc-clnt.h b/rpc/rpc-lib/src/rpc-clnt.h
index efc256cd261..efc256cd261 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpc-clnt.h
+++ b/rpc/rpc-lib/src/rpc-clnt.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index 82ea9a74bfd..82ea9a74bfd 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h
index b3c7985e095..b3c7985e095 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpc-transport.h
+++ b/rpc/rpc-lib/src/rpc-transport.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpcsvc-auth.c b/rpc/rpc-lib/src/rpcsvc-auth.c
index fa039c38677..fa039c38677 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpcsvc-auth.c
+++ b/rpc/rpc-lib/src/rpcsvc-auth.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpcsvc-common.h b/rpc/rpc-lib/src/rpcsvc-common.h
index 0b9d84cfdf0..0b9d84cfdf0 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpcsvc-common.h
+++ b/rpc/rpc-lib/src/rpcsvc-common.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index e07cb8ee714..e07cb8ee714 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h
index 10dc32698ad..10dc32698ad 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpcsvc.h
+++ b/rpc/rpc-lib/src/rpcsvc.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/xdr-common.h b/rpc/rpc-lib/src/xdr-common.h
index 0c9ffb2f827..0c9ffb2f827 100644
--- a/xlators/protocol/rpc/rpc-lib/src/xdr-common.h
+++ b/rpc/rpc-lib/src/xdr-common.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/xdr-rpc.c b/rpc/rpc-lib/src/xdr-rpc.c
index 088bddbf5b7..088bddbf5b7 100644
--- a/xlators/protocol/rpc/rpc-lib/src/xdr-rpc.c
+++ b/rpc/rpc-lib/src/xdr-rpc.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/xdr-rpc.h b/rpc/rpc-lib/src/xdr-rpc.h
index 4c0ee69b138..4c0ee69b138 100644
--- a/xlators/protocol/rpc/rpc-lib/src/xdr-rpc.h
+++ b/rpc/rpc-lib/src/xdr-rpc.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/xdr-rpcclnt.c b/rpc/rpc-lib/src/xdr-rpcclnt.c
index 98676ae61ab..98676ae61ab 100644
--- a/xlators/protocol/rpc/rpc-lib/src/xdr-rpcclnt.c
+++ b/rpc/rpc-lib/src/xdr-rpcclnt.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/xdr-rpcclnt.h b/rpc/rpc-lib/src/xdr-rpcclnt.h
index 37c3046d330..37c3046d330 100644
--- a/xlators/protocol/rpc/rpc-lib/src/xdr-rpcclnt.h
+++ b/rpc/rpc-lib/src/xdr-rpcclnt.h
diff --git a/xlators/protocol/rpc/rpc-transport/Makefile.am b/rpc/rpc-transport/Makefile.am
index 7dd9f026cfc..7dd9f026cfc 100644
--- a/xlators/protocol/rpc/rpc-transport/Makefile.am
+++ b/rpc/rpc-transport/Makefile.am
diff --git a/xlators/protocol/rpc/rpc-transport/socket/Makefile.am b/rpc/rpc-transport/socket/Makefile.am
index f963effea22..f963effea22 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/Makefile.am
+++ b/rpc/rpc-transport/socket/Makefile.am
diff --git a/xlators/protocol/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am
index 325a58bb05d..46a3e12378b 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/src/Makefile.am
+++ b/rpc/rpc-transport/socket/src/Makefile.am
@@ -9,7 +9,7 @@ socket_la_SOURCES = socket.c name.c
 socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
 AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
-	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/protocol/rpc/rpc-lib/src/ \
+	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \
 	-I$(top_srcdir)/xlators/protocol/lib/src/ -shared -nostartfiles $(GF_CFLAGS)
 
 CLEANFILES = *~
diff --git a/xlators/protocol/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c
index 763fa3dd09b..763fa3dd09b 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/src/name.c
+++ b/rpc/rpc-transport/socket/src/name.c
diff --git a/xlators/protocol/rpc/rpc-transport/socket/src/name.h b/rpc/rpc-transport/socket/src/name.h
index 6a89d383b65..6a89d383b65 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/src/name.h
+++ b/rpc/rpc-transport/socket/src/name.h
diff --git a/xlators/protocol/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 4ca7121e8af..4ca7121e8af 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
diff --git a/xlators/protocol/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h
index aa31ee2a7ef..aa31ee2a7ef 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/src/socket.h
+++ b/rpc/rpc-transport/socket/src/socket.h
diff --git a/xlators/protocol/Makefile.am b/xlators/protocol/Makefile.am
index b38506d473e..17c9a8313f8 100644
--- a/xlators/protocol/Makefile.am
+++ b/xlators/protocol/Makefile.am
@@ -1 +1 @@
-SUBDIRS = lib auth legacy rpc client server
+SUBDIRS = lib auth legacy client server
diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
index 1051368a2a9..7811e088a7e 100644
--- a/xlators/protocol/client/src/Makefile.am
+++ b/xlators/protocol/client/src/Makefile.am
@@ -5,7 +5,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
 client_la_LDFLAGS = -module -avoidversion
 
 client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
-	$(top_builddir)/xlators/protocol/rpc/rpc-lib/src/libgfrpc.la \
+	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
 	$(top_builddir)/xlators/protocol/lib/src/libgfproto1.la
 
 client_la_SOURCES = client.c client-helpers.c client3_1-fops.c client-handshake.c
@@ -13,4 +13,4 @@ noinst_HEADERS = client.h client-mem-types.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$(top_srcdir)/xlators/protocol/lib/src -I$(top_srcdir)/xlators/protocol/rpc/rpc-lib/src/
+	-I$(top_srcdir)/xlators/protocol/lib/src -I$(top_srcdir)/rpc/rpc-lib/src/
diff --git a/xlators/protocol/lib/src/Makefile.am b/xlators/protocol/lib/src/Makefile.am
index 98cf44d0948..be59aa666a0 100644
--- a/xlators/protocol/lib/src/Makefile.am
+++ b/xlators/protocol/lib/src/Makefile.am
@@ -6,7 +6,7 @@ libgfproto1_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SO
 	-D$(GF_HOST_OS) -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\"      \
 	-DTRANSPORTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/transport\"           \
 	-I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/libglusterfs/src/                      \
-        -I$(top_srcdir)/xlators/protocol/rpc/rpc-lib/src/
+        -I$(top_srcdir)/rpc/rpc-lib/src/
 
 libgfproto1_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
 
diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am
index 56606796059..be304bdc768 100644
--- a/xlators/protocol/server/src/Makefile.am
+++ b/xlators/protocol/server/src/Makefile.am
@@ -4,7 +4,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
 server_la_LDFLAGS = -module -avoidversion
 
 server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
-	$(top_builddir)/xlators/protocol/rpc/rpc-lib/src/libgfrpc.la \
+	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
 	$(top_builddir)/xlators/protocol/lib/src/libgfproto1.la
 
 server_la_SOURCES = server.c server-resolve.c server-helpers.c  \
@@ -16,7 +16,7 @@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall    \
 	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles  \
 	-DCONFDIR=\"$(sysconfdir)/glusterfs\" -D$(GF_HOST_OS)   \
 	$(GF_CFLAGS) -I$(top_srcdir)/xlators/protocol/lib/src   \
-	-I$(top_srcdir)/xlators/protocol/rpc/rpc-lib/src/       \
+	-I$(top_srcdir)/rpc/rpc-lib/src/       \
 	-I$(top_srcdir)/contrib/md5/
 
 CLEANFILES = *~