diff options
Diffstat (limited to 'libglusterfs/src/gfdb')
| -rw-r--r-- | libglusterfs/src/gfdb/Makefile.am | 17 | ||||
| -rw-r--r-- | libglusterfs/src/gfdb/gfdb_data_store_types.h | 1 |
2 files changed, 5 insertions, 13 deletions
diff --git a/libglusterfs/src/gfdb/Makefile.am b/libglusterfs/src/gfdb/Makefile.am index fdc11bf131a..30d1b7bcdde 100644 --- a/libglusterfs/src/gfdb/Makefile.am +++ b/libglusterfs/src/gfdb/Makefile.am @@ -5,7 +5,8 @@ libgfdb_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 -fpic \ -I$(top_srcdir)/libglusterfs/src \ -DDATADIR=\"$(localstatedir)\" -libgfdb_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(SQLITE_LIBS) +libgfdb_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ + $(SQLITE_LIBS) $(UUID_LIBS) libgfdb_la_LDFLAGS = $(GF_LDFLAGS) -version-info $(LIBGLUSTERFS_LT_VERSION) @@ -18,25 +19,15 @@ endif CONTRIB_BUILDDIR = $(top_builddir)/contrib libgfdb_la_SOURCES = gfdb_data_store.c gfdb_sqlite3_helper.c\ - gfdb_sqlite3.c \ - $(CONTRIBDIR)/uuid/clear.c \ - $(CONTRIBDIR)/uuid/copy.c $(CONTRIBDIR)/uuid/gen_uuid.c \ - $(CONTRIBDIR)/uuid/pack.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 + gfdb_sqlite3.c noinst_HEADERS = gfdb_data_store.h gfdb_data_store_types.h gfdb_sqlite3_helper.h\ - gfdb_sqlite3.h gfdb_mem-types.h \ - $(CONTRIBDIR)/uuid/uuidd.h \ - $(CONTRIBDIR)/uuid/uuid.h $(CONTRIBDIR)/uuid/uuid.h \ - $(CONTRIB_BUILDDIR)/uuid/uuid_types.h + gfdb_sqlite3.h gfdb_mem-types.h libgfdb_HEADERS = gfdb_data_store.h gfdb_data_store_types.h \ gfdb_sqlite3.h gfdb_mem-types.h gfdb_sqlite3_helper.c CLEANFILES = -CONFIG_CLEAN_FILES = $(CONTRIB_BUILDDIR)/uuid/uuid_types.h $(top_builddir)/libglusterfs/src/libglusterfs.la: $(MAKE) -C $(top_builddir)/libglusterfs/src/ all diff --git a/libglusterfs/src/gfdb/gfdb_data_store_types.h b/libglusterfs/src/gfdb/gfdb_data_store_types.h index 94708ac1d3b..5bd95241f06 100644 --- a/libglusterfs/src/gfdb/gfdb_data_store_types.h +++ b/libglusterfs/src/gfdb/gfdb_data_store_types.h @@ -21,6 +21,7 @@ #include <string.h> #include "common-utils.h" +#include "compat-uuid.h" #include "gfdb_mem-types.h" #include "dict.h" |