From d660b5fe4402d8942dfe6d3e5cecba9c1e0c297f Mon Sep 17 00:00:00 2001 From: Anand Avati Date: Wed, 29 May 2013 03:15:19 -0700 Subject: api/Makefile: link api.so against libgfapi (and dependencies) Samba opens vfs_gluster.so with dlopen(..,RTLD_LOCAL). This makes the symobls in the shared module and the library it exclusively links against (specifically gfapi) not resolvable from the .so files which are opened in turn within (like xlator .so files) unless explicitly linked against the dependent libraries. This is not otherwise required in case of glusterfsd as the main executable symbols are always available for resolution from dlopen()'ed shared objects, making Samba's vfs_glusterfs requirement unique, but luckily not incompatible. Change-Id: I894c521daade7d46ec5bf07793f2eea02ebc9700 BUG: 953694 Signed-off-by: Anand Avati Reviewed-on: http://review.gluster.org/5169 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- api/src/Makefile.am | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'api/src/Makefile.am') diff --git a/api/src/Makefile.am b/api/src/Makefile.am index a0bbc416d..087523823 100644 --- a/api/src/Makefile.am +++ b/api/src/Makefile.am @@ -14,13 +14,18 @@ libgfapi_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ -I$(top_srcdir)/rpc/rpc-lib/src \ -I$(top_srcdir)/rpc/xdr/src +api.la: libgfapi.la + xlator_LTLIBRARIES = api.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mount api_la_SOURCES = glfs-master.c api_la_LDFLAGS = -module -avoid-version -api_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +api_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ + $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ + $(top_builddir)/rpc/xdr/src/libgfxdr.la \ + $(top_builddir)/api/src/libgfapi.la AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -- cgit