diff options
| -rw-r--r-- | glusterfs.spec.in | 16 | ||||
| -rw-r--r-- | libglusterfs/src/Makefile.am | 34 | ||||
| -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 | ||||
| -rw-r--r-- | xlators/protocol/server/src/Makefile.am | 4 |
6 files changed, 31 insertions, 34 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 6f7ee953e2d..90705b1ae3c 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -629,20 +629,8 @@ pushd xlators/features/glupy/src python setup.py install --skip-build --verbose --root %{buildroot} popd # Install include directory -mkdir -p %{buildroot}%{_includedir}/glusterfs -install -p -m 0644 libglusterfs/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/ install -p -m 0644 contrib/uuid/*.h \ %{buildroot}%{_includedir}/glusterfs/ -# Following needed by hekafs multi-tenant translator -mkdir -p %{buildroot}%{_includedir}/glusterfs/rpc -install -p -m 0644 rpc/rpc-lib/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/rpc/ -install -p -m 0644 rpc/xdr/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/rpc/ -mkdir -p %{buildroot}%{_includedir}/glusterfs/server -install -p -m 0644 xlators/protocol/server/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/server/ %if ( 0%{_for_fedora_koji_builds} ) install -D -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/sysconfig/glusterd @@ -1027,8 +1015,8 @@ fi %{_sysconfdir}/bash_completion.d/gluster %files devel -%{_includedir}/glusterfs -%exclude %{_includedir}/glusterfs/y.tab.h +%dir %{_includedir}/glusterfs +%{_includedir}/glusterfs/* %exclude %{_includedir}/glusterfs/api %exclude %{_libdir}/libgfapi.so %{_libdir}/*.so diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am index 904da328bea..1b3a5572c8b 100644 --- a/libglusterfs/src/Makefile.am +++ b/libglusterfs/src/Makefile.am @@ -36,23 +36,27 @@ nodist_libglusterfs_la_SOURCES = y.tab.c graph.lex.c defaults.c BUILT_SOURCES = graph.lex.c defaults.c -noinst_HEADERS = common-utils.h defaults.h default-args.h dict.h glusterfs.h \ - hashfn.h timespec.h \ - logging.h xlator.h stack.h timer.h list.h inode.h call-stub.h compat.h \ - fd.h revision.h compat-errno.h event.h mem-pool.h byte-order.h \ +libglusterfs_la_HEADERS = common-utils.h defaults.h default-args.h \ + dict.h glusterfs.h hashfn.h timespec.h logging.h xlator.h \ + stack.h timer.h list.h inode.h call-stub.h compat.h fd.h \ + revision.h compat-errno.h event.h mem-pool.h byte-order.h \ gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h \ - checksum.h daemon.h $(CONTRIBDIR)/rbtree/rb.h store.h\ - rbthash.h iatt.h latency.h mem-types.h syncop.h cluster-syncop.h \ - graph-utils.h trie.h refcount.h \ - run.h options.h lkowner.h fd-lk.h circ-buff.h event-history.h \ - gidcache.h client_t.h glusterfs-acl.h glfs-message-id.h \ - template-component-messages.h strfd.h syncop-utils.h parse-utils.h \ - libglusterfs-messages.h ctr-messages.h \ - $(CONTRIBDIR)/mount/mntent_compat.h lvm-defaults.h \ + checksum.h daemon.h store.h rbthash.h iatt.h latency.h \ + mem-types.h syncop.h cluster-syncop.h graph-utils.h trie.h \ + refcount.h run.h options.h lkowner.h fd-lk.h circ-buff.h \ + event-history.h gidcache.h client_t.h glusterfs-acl.h \ + glfs-message-id.h template-component-messages.h strfd.h \ + syncop-utils.h parse-utils.h libglusterfs-messages.h tw.h \ + ctr-messages.h lvm-defaults.h quota-common-utils.h rot-buffs.h \ + compat-uuid.h upcall-utils.h + +libglusterfs_ladir = $(includedir)/glusterfs + +noinst_HEADERS = unittest/unittest.h \ + $(CONTRIBDIR)/rbtree/rb.h \ + $(CONTRIBDIR)/mount/mntent_compat.h \ $(CONTRIBDIR)/libexecinfo/execinfo_compat.h \ - unittest/unittest.h quota-common-utils.h rot-buffs.h \ - $(CONTRIBDIR)/timer-wheel/timer-wheel.h compat-uuid.h \ - tw.h upcall-utils.h + $(CONTRIBDIR)/timer-wheel/timer-wheel.h if !HAVE_LIBUUID # FIXME: unbundle libuuid, see compat-uuid.h. 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) diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am index 50799790445..688d0202bcc 100644 --- a/xlators/protocol/server/src/Makefile.am +++ b/xlators/protocol/server/src/Makefile.am @@ -10,9 +10,11 @@ server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ server_la_SOURCES = server.c server-resolve.c server-helpers.c \ server-rpc-fops.c server-handshake.c authenticate.c -noinst_HEADERS = server.h server-helpers.h server-mem-types.h authenticate.h \ +server_la_HEADERS = server.h server-helpers.h server-mem-types.h authenticate.h \ server-messages.h +server_ladir = $(includedir)/glusterfs/server + AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src \ -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ |