diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2015-10-14 11:13:50 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-11-16 01:15:04 -0800 |
| commit | 82e45b87e30ce4ec2ab62c39820951da7a82eddb (patch) | |
| tree | f74f1763191e4229c762e337e6793785b3c6a0f3 /rpc | |
| parent | 8ad921e8d61e8b7b1dcd4aaba5d00aafbb55cf2a (diff) | |
build: install and package header files more conventionally
The current way we install and package header files for the -devel
package is a hack. This patch uses more conventional autoconf, libtool,
and rpmbuild idioms to package -devel headers and libraries.
Change-Id: I63ffb3460f5c12b6b355493bd00824ac9e5354c5
BUG: 1271907
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/12360
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/rpc-lib/src/Makefile.am | 4 | ||||
| -rw-r--r-- | rpc/rpc-transport/rdma/src/Makefile.am | 2 | ||||
| -rw-r--r-- | rpc/xdr/src/Makefile.am | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/rpc/rpc-lib/src/Makefile.am b/rpc/rpc-lib/src/Makefile.am index 36eb245bc06..8d0ef9a01b8 100644 --- a/rpc/rpc-lib/src/Makefile.am +++ b/rpc/rpc-lib/src/Makefile.am @@ -7,10 +7,12 @@ libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \ libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la libgfrpc_la_LDFLAGS = -version-info $(LIBGFRPC_LT_VERSION) $(GF_LDFLAGS) -noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \ +libgfrpc_la_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \ rpc-clnt.h rpcsvc-common.h protocol-common.h rpc-drc.h rpc-clnt-ping.h \ rpc-lib-messages.h +libgfrpc_ladir = $(includedir)/glusterfs/rpc + AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(top_srcdir)/rpc/xdr/src \ -DRPC_TRANSPORTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport\" \ diff --git a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am index 6526b6ce790..b5fb06f4f01 100644 --- a/rpc/rpc-transport/rdma/src/Makefile.am +++ b/rpc/rpc-transport/rdma/src/Makefile.am @@ -10,8 +10,6 @@ rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ -libverbs -lrdmacm noinst_HEADERS = rdma.h name.h rpc-trans-rdma-messages.h - -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \ - -I$(top_srcdir)/xlators/protocol/lib/src/ $(GF_CFLAGS) AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \ diff --git a/rpc/xdr/src/Makefile.am b/rpc/xdr/src/Makefile.am index eae7c9b673d..56e64ad3797 100644 --- a/rpc/xdr/src/Makefile.am +++ b/rpc/xdr/src/Makefile.am @@ -18,7 +18,10 @@ libgfxdr_la_LDFLAGS = -version-info $(LIBGFXDR_LT_VERSION) libgfxdr_la_SOURCES = xdr-generic.c xdr-nfs3.c msg-nfs3.c nodist_libgfxdr_la_SOURCES = $(XDRSOURCES) -noinst_HEADERS = xdr-generic.h xdr-nfs3.h msg-nfs3.h glusterfs3.h +libgfxdr_la_HEADERS = xdr-generic.h xdr-nfs3.h msg-nfs3.h glusterfs3.h \ + $(XDRHEADERS) + +libgfxdr_ladir = $(includedir)/glusterfs/rpc BUILT_SOURCES = $(XDRSOURCES) $(XDRHEADERS) |