From 5c9cda00d5a54052a90ed18e1aa110128628cf13 Mon Sep 17 00:00:00 2001 From: Daniel Salzman <daniel.salzman@nic.cz> Date: Mon, 7 Dec 2015 12:43:02 +0100 Subject: [PATCH] contrib: move lmdb from internal --- Knot.files | 8 ++++---- src/Makefile.am | 10 +++++----- src/{libknot/internal/namedb => contrib/lmdb}/lmdb.h | 0 src/{libknot/internal/namedb => contrib/lmdb}/mdb.c | 0 src/{libknot/internal/namedb => contrib/lmdb}/midl.c | 0 src/{libknot/internal/namedb => contrib/lmdb}/midl.h | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename src/{libknot/internal/namedb => contrib/lmdb}/lmdb.h (100%) rename src/{libknot/internal/namedb => contrib/lmdb}/mdb.c (100%) rename src/{libknot/internal/namedb => contrib/lmdb}/midl.c (100%) rename src/{libknot/internal/namedb => contrib/lmdb}/midl.h (100%) diff --git a/Knot.files b/Knot.files index 84426087e3..e43ba66346 100644 --- a/Knot.files +++ b/Knot.files @@ -49,6 +49,10 @@ src/contrib/dnstap/writer.h src/contrib/endian.h src/contrib/getline.c src/contrib/getline.h +src/contrib/lmdb/lmdb.h +src/contrib/lmdb/mdb.c +src/contrib/lmdb/midl.c +src/contrib/lmdb/midl.h src/contrib/lookup.h src/contrib/net.c src/contrib/net.h @@ -373,10 +377,6 @@ src/libknot/internal/lists.h src/libknot/internal/macros.h src/libknot/internal/mempattern.c src/libknot/internal/mempattern.h -src/libknot/internal/namedb/lmdb.h -src/libknot/internal/namedb/mdb.c -src/libknot/internal/namedb/midl.c -src/libknot/internal/namedb/midl.h src/libknot/internal/namedb/namedb.h src/libknot/internal/namedb/namedb_lmdb.c src/libknot/internal/namedb/namedb_lmdb.h diff --git a/src/Makefile.am b/src/Makefile.am index 11618953ef..9098f25a56 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -179,12 +179,12 @@ pkgconfig_DATA = libknot.pc if !HAVE_LMDB libknot_internal_la_SOURCES += \ - libknot/internal/namedb/mdb.c \ - libknot/internal/namedb/midl.c \ - libknot/internal/namedb/lmdb.h \ - libknot/internal/namedb/midl.h + contrib/lmdb/lmdb.h \ + contrib/lmdb/mdb.c \ + contrib/lmdb/midl.c \ + contrib/lmdb/midl.h libknot_internal_la_CPPFLAGS += \ - -I$(srcdir)/libknot/internal/namedb/ + -I$(srcdir)/contrib/lmdb/ endif ################### diff --git a/src/libknot/internal/namedb/lmdb.h b/src/contrib/lmdb/lmdb.h similarity index 100% rename from src/libknot/internal/namedb/lmdb.h rename to src/contrib/lmdb/lmdb.h diff --git a/src/libknot/internal/namedb/mdb.c b/src/contrib/lmdb/mdb.c similarity index 100% rename from src/libknot/internal/namedb/mdb.c rename to src/contrib/lmdb/mdb.c diff --git a/src/libknot/internal/namedb/midl.c b/src/contrib/lmdb/midl.c similarity index 100% rename from src/libknot/internal/namedb/midl.c rename to src/contrib/lmdb/midl.c diff --git a/src/libknot/internal/namedb/midl.h b/src/contrib/lmdb/midl.h similarity index 100% rename from src/libknot/internal/namedb/midl.h rename to src/contrib/lmdb/midl.h -- GitLab