From 6eb27480b6559103e4437facd7aecbcd373479c9 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 3 Apr 2015 18:14:13 +0200 Subject: build: make contrib/uuid dependency optional On Linux systems we should use the libuuid from the distribution and not bundle and statically link the contrib/uuid/ bits. libglusterfs/src/compat-uuid.h has been introduced and should become an abstraction layer for different UUID APIs. Non-Linux operating systems should implement their compatibility layer there. Once all operating systems have an implementation in compat-uuid.h, we can remove contrib/uuid/ from the repository completely. Change-Id: I345e5357644be2521685e00358bb8c83c4ea0577 BUG: 1206587 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/10129 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 3b71fa8a4ea..05c4af767d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,7 @@ EXTRA_DIST = autogen.sh \ build-aux/xdrgen \ contrib/argp-standalone \ contrib/umountd \ + contrib/uuid \ $(shell find $(top_srcdir)/tests -type f -print) SUBDIRS = $(ARGP_STANDALONE_DIR) libglusterfs rpc api xlators glusterfsd \ @@ -17,6 +18,7 @@ pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = glusterfs-api.pc libgfchangelog.pc libgfdb.pc CLEANFILES = +CONFIG_CLEAN_FILES = $(CONTRIB_BUILDDIR)/uuid/uuid_types.h gitclean: distclean find . -name Makefile.in -exec rm -f {} \; -- cgit