summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2010-06-21 04:26:00 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-06-21 20:21:13 -0700
commit002ab96fd30f8924533fc454ecea00be04c013d5 (patch)
tree83832c397d9e47007bad5479a76c0a394229aa6a /xlators
parentfdd20492638fe98a62b5e6d5e82f18cf4799fd1a (diff)
make rpc protocol as default, and move the old one to legacy
Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Raghavendra G <raghavendra@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875
Diffstat (limited to 'xlators')
-rw-r--r--xlators/protocol/client/src/Makefile.am2
-rw-r--r--xlators/protocol/legacy/client/src/Makefile.am13
-rw-r--r--xlators/protocol/legacy/server/src/Makefile.am12
-rw-r--r--xlators/protocol/server/src/Makefile.am2
4 files changed, 17 insertions, 12 deletions
diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
index 40281467e17..1051368a2a9 100644
--- a/xlators/protocol/client/src/Makefile.am
+++ b/xlators/protocol/client/src/Makefile.am
@@ -1,6 +1,6 @@
xlator_LTLIBRARIES = client.la
-xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/alpha/protocol
+xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
client_la_LDFLAGS = -module -avoidversion
diff --git a/xlators/protocol/legacy/client/src/Makefile.am b/xlators/protocol/legacy/client/src/Makefile.am
index da00a5182b5..b7c2f7c8f77 100644
--- a/xlators/protocol/legacy/client/src/Makefile.am
+++ b/xlators/protocol/legacy/client/src/Makefile.am
@@ -1,11 +1,12 @@
-xlator_LTLIBRARIES = client.la
-xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
+xlator_LTLIBRARIES = client-old.la
+xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/legacy/protocol
-client_la_LDFLAGS = -module -avoidversion
+client_old_la_LDFLAGS = -module -avoidversion
-client_la_SOURCES = client-protocol.c saved-frames.c
-client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+client_old_la_SOURCES = client-protocol.c saved-frames.c
+
+client_old_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
$(top_builddir)/xlators/protocol/legacy/lib/src/libgfproto.la
noinst_HEADERS = client-protocol.h saved-frames.h client-mem-types.h
@@ -16,3 +17,5 @@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
CLEANFILES =
+install-data-hook:
+ ln -sf client.so $(DESTDIR)$(xlatordir)/client-old.so
diff --git a/xlators/protocol/legacy/server/src/Makefile.am b/xlators/protocol/legacy/server/src/Makefile.am
index 87d3042c534..d51b5d07f6a 100644
--- a/xlators/protocol/legacy/server/src/Makefile.am
+++ b/xlators/protocol/legacy/server/src/Makefile.am
@@ -1,11 +1,11 @@
-xlator_LTLIBRARIES = server.la
-xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
+xlator_LTLIBRARIES = server-old.la
+xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/legacy/protocol
-server_la_LDFLAGS = -module -avoidversion
+server_old_la_LDFLAGS = -module -avoidversion
-server_la_SOURCES = server-protocol.c server-resolve.c server-helpers.c
-server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+server_old_la_SOURCES = server-protocol.c server-resolve.c server-helpers.c
+server_old_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
$(top_builddir)/xlators/protocol/legacy/lib/src/libgfproto.la \
$(top_builddir)/xlators/protocol/lib/src/libgfproto1.la
@@ -20,3 +20,5 @@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
CLEANFILES =
+install-data-hook:
+ ln -sf server.so $(DESTDIR)$(xlatordir)/server-old.so
diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am
index 842ab5e50fc..56606796059 100644
--- a/xlators/protocol/server/src/Makefile.am
+++ b/xlators/protocol/server/src/Makefile.am
@@ -1,5 +1,5 @@
xlator_LTLIBRARIES = server.la
-xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/alpha/protocol
+xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
server_la_LDFLAGS = -module -avoidversion