From 87e88243e827d7c1dc5b5138ac966b41002564e4 Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Fri, 31 Aug 2012 03:23:33 +0200 Subject: Add missing contrib/libgen files to distribution This is a backport of I3f49eb4a1a186cb2d178539ada6a05c8c1aa8265 BUG: 764655 Change-Id: I32264acec0f122d045f369a254df17b488962b9f Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/3884 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Anand Avati --- libglusterfs/src/Makefile.am | 4 +++- libglusterfs/src/compat.c | 7 ------- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'libglusterfs/src') diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am index 2dab8735c96..d708f98d205 100644 --- a/libglusterfs/src/Makefile.am +++ b/libglusterfs/src/Makefile.am @@ -22,7 +22,9 @@ libglusterfs_la_SOURCES = dict.c xlator.c logging.c \ $(CONTRIBDIR)/uuid/parse.c $(CONTRIBDIR)/uuid/unparse.c \ $(CONTRIBDIR)/uuid/uuid_time.c $(CONTRIBDIR)/uuid/compare.c \ $(CONTRIBDIR)/uuid/isnull.c $(CONTRIBDIR)/uuid/unpack.c syncop.c \ - graph-print.c trie.c run.c options.c fd-lk.c circ-buff.c event-history.c + graph-print.c trie.c run.c options.c fd-lk.c circ-buff.c \ + event-history.c \ + $(CONTRIBDIR)/libgen/basename_r.c $(CONTRIBDIR)/libgen/dirname_r.c nodist_libglusterfs_la_SOURCES = y.tab.c graph.lex.c diff --git a/libglusterfs/src/compat.c b/libglusterfs/src/compat.c index 99a0041a5cf..2dcd56a4144 100644 --- a/libglusterfs/src/compat.c +++ b/libglusterfs/src/compat.c @@ -550,10 +550,3 @@ strnlen(const char *string, size_t maxlen) return len; } #endif /* STRNLEN */ - -#ifdef THREAD_UNSAFE_BASENAME -#include "../../contrib/libgen/basename_r.c" -#endif -#ifdef THREAD_UNSAFE_DIRNAME -#include "../../contrib/libgen/dirname_r.c" -#endif -- cgit