diff options
author | Amar Tumballi <amarts@redhat.com> | 2019-05-05 13:19:31 +0530 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2019-07-10 03:38:42 +0000 |
commit | c2e514c18df8fe1dfe06bc147f94756838f67c41 (patch) | |
tree | ae4e608b39e669c5e38a74fa99279e6f9613310d /rpc | |
parent | 670299cf4fc90c1c61032057b6ff570fee7a448e (diff) |
rpc/xdr: include nfs specific files in build only if gNFS is enabled
updates: bz#1193929
Change-Id: I2b85fd0a04c77815a154f445ec8fb4da37dcbe40
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'rpc')
-rw-r--r-- | rpc/xdr/gen/Makefile.am | 11 | ||||
-rw-r--r-- | rpc/xdr/src/Makefile.am | 22 |
2 files changed, 23 insertions, 10 deletions
diff --git a/rpc/xdr/gen/Makefile.am b/rpc/xdr/gen/Makefile.am index 194718f9bba..3e799b4c644 100644 --- a/rpc/xdr/gen/Makefile.am +++ b/rpc/xdr/gen/Makefile.am @@ -1,6 +1,11 @@ -XDRGENFILES = glusterfs3-xdr.x glusterfs4-xdr.x cli1-xdr.x nlm4-xdr.x nsm-xdr.x \ - rpc-common-xdr.x glusterd1-xdr.x acl3-xdr.x portmap-xdr.x \ - mount3udp.x changelog-xdr.x +if BUILD_GNFS + NFS_XDRS = nlm4-xdr.x nsm-xdr.x acl3-xdr.x mount3udp.x +endif + +XDRGENFILES = glusterfs3-xdr.x glusterfs4-xdr.x cli1-xdr.x \ + rpc-common-xdr.x glusterd1-xdr.x portmap-xdr.x \ + changelog-xdr.x ${NFS_XDRS} + XDRHEADERS = $(XDRGENFILES:.x=.h) XDRSOURCES = $(XDRGENFILES:.x=.c) diff --git a/rpc/xdr/src/Makefile.am b/rpc/xdr/src/Makefile.am index fe6b0181cd5..44a72cac53b 100644 --- a/rpc/xdr/src/Makefile.am +++ b/rpc/xdr/src/Makefile.am @@ -1,10 +1,19 @@ -XDRGENFILES = glusterfs3-xdr.x glusterfs4-xdr.x cli1-xdr.x nlm4-xdr.x nsm-xdr.x \ - rpc-common-xdr.x glusterd1-xdr.x acl3-xdr.x portmap-xdr.x \ - mount3udp.x changelog-xdr.x +if BUILD_GNFS + NFS_XDRS = nlm4-xdr.x nsm-xdr.x acl3-xdr.x mount3udp.x + NFS_SRCS = xdr-nfs3.c msg-nfs3.c + NFS_HDRS = xdr-nfs3.h msg-nfs3.h +else + NFS_EXTRA_XDRS = nlm4-xdr.x nsm-xdr.x acl3-xdr.x mount3udp.x +endif + +XDRGENFILES = glusterfs3-xdr.x glusterfs4-xdr.x cli1-xdr.x \ + rpc-common-xdr.x glusterd1-xdr.x changelog-xdr.x \ + portmap-xdr.x ${NFS_XDRS} + XDRHEADERS = $(XDRGENFILES:.x=.h) XDRSOURCES = $(XDRGENFILES:.x=.c) -EXTRA_DIST = $(XDRGENFILES) libgfxdr.sym +EXTRA_DIST = $(XDRGENFILES) libgfxdr.sym ${NFS_EXTRA_XDRS} lib_LTLIBRARIES = libgfxdr.la @@ -19,11 +28,10 @@ libgfxdr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la libgfxdr_la_LDFLAGS = -version-info $(LIBGFXDR_LT_VERSION) $(GF_LDFLAGS) \ -export-symbols $(top_srcdir)/rpc/xdr/src/libgfxdr.sym -libgfxdr_la_SOURCES = xdr-generic.c xdr-nfs3.c msg-nfs3.c +libgfxdr_la_SOURCES = xdr-generic.c ${NFS_SRCS} nodist_libgfxdr_la_SOURCES = $(XDRSOURCES) -libgfxdr_la_HEADERS = xdr-generic.h xdr-nfs3.h msg-nfs3.h glusterfs3.h \ - rpc-pragmas.h +libgfxdr_la_HEADERS = xdr-generic.h glusterfs3.h rpc-pragmas.h ${NFS_HDRS} nodist_libgfxdr_la_HEADERS = $(XDRHEADERS) libgfxdr_ladir = $(includedir)/glusterfs/rpc |