diff options
| author | Amar Tumballi <amarts@redhat.com> | 2019-06-28 22:51:37 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2019-08-16 05:37:03 +0000 |
| commit | 29cfe643cbcf7826375a3d52ff1865706a35bc38 (patch) | |
| tree | add22d6f9e8b8afaae089625526d521c53c8b33c /cli | |
| parent | a24288c5c9da9137eb1d5d487bc7cd11af01b88b (diff) | |
libglusterfs: remove dependency of rpc
Goal: 'libglusterfs' files shouldn't have any dependency outside of
the tree, specially the header files, shouldn't have '#include'
from outside the tree.
Fixes:
* Had to introduce libglusterd so, methods and structures required
for only mgmt/glusterd, and cli/ are separated from 'libglusterfs/'
* Remove rpc/xdr/gen from build, which was used mainly so
dependency for libglusterfs could be properly satisfied.
* Move rpcsvc_auth_data to client_t.h, so all dependencies could
be handled.
Updates: bz#1636297
Change-Id: I0e80243a5a3f4615e6fac6e1b947ad08a9363fce
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/Makefile.am | 10 | ||||
| -rw-r--r-- | cli/src/cli.h | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 3e7511fe1b7..cfbfca450c5 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -5,6 +5,7 @@ gluster_SOURCES = cli.c registry.c input.c cli-cmd.c cli-rl.c cli-cmd-global.c \ cli-cmd-system.c cli-cmd-misc.c cli-xml-output.c cli-quotad-client.c cli-cmd-snapshot.c gluster_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD) \ + $(top_builddir)/libglusterd/src/libglusterd.la \ $(RLLIBS) $(top_builddir)/rpc/xdr/src/libgfxdr.la \ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ $(XML_LIBS) @@ -13,9 +14,9 @@ gluster_LDFLAGS = $(GF_LDFLAGS) noinst_HEADERS = cli.h cli-mem-types.h cli-cmd.h cli-quotad-client.h AM_CPPFLAGS = $(GF_CPPFLAGS) \ - -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src\ - -I$(top_srcdir)/rpc/xdr/src\ - -I$(top_builddir)/rpc/xdr/src\ + -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src \ + -I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/libglusterd/src \ + -I$(top_builddir)/rpc/xdr/src \ -DDATADIR=\"$(localstatedir)\" \ -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ @@ -28,5 +29,8 @@ CLEANFILES = $(top_builddir)/libglusterfs/src/libglusterfs.la: $(MAKE) -C $(top_builddir)/libglusterfs/src/ all +$(top_builddir)/libglusterfs/src/libglusterd.la: + $(MAKE) -C $(top_builddir)/libglusterd/src/ all + install-data-hook: $(mkdir_p) $(DESTDIR)$(localstatedir)/run/gluster diff --git a/cli/src/cli.h b/cli/src/cli.h index 7166991a7ff..4e008ffe878 100644 --- a/cli/src/cli.h +++ b/cli/src/cli.h @@ -17,6 +17,7 @@ #include <glusterfs/quota-common-utils.h> #include "cli1-xdr.h" +#include "gd-common-utils.h" #if (HAVE_LIB_XML) #include <libxml/encoding.h> |