diff --git a/CMakeLists.txt b/CMakeLists.txt index 2916ff13..ef479095 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,6 +159,9 @@ link_directories(${UNBOUND_LIBRARY_DIRS}) # Final setup for rapidjson include_directories(external/rapidjson) + +add_subdirectory(db_drivers) + # Final setup for liblmdb include_directories(${LMDB_INCLUDE}) diff --git a/external/db_drivers/CMakeLists.txt b/db_drivers/CMakeLists.txt similarity index 100% rename from external/db_drivers/CMakeLists.txt rename to db_drivers/CMakeLists.txt diff --git a/external/db_drivers/liblmdb/.gitignore b/db_drivers/liblmdb/.gitignore similarity index 100% rename from external/db_drivers/liblmdb/.gitignore rename to db_drivers/liblmdb/.gitignore diff --git a/external/db_drivers/liblmdb/CHANGES b/db_drivers/liblmdb/CHANGES similarity index 100% rename from external/db_drivers/liblmdb/CHANGES rename to db_drivers/liblmdb/CHANGES diff --git a/external/db_drivers/liblmdb/CMakeLists.txt b/db_drivers/liblmdb/CMakeLists.txt similarity index 100% rename from external/db_drivers/liblmdb/CMakeLists.txt rename to db_drivers/liblmdb/CMakeLists.txt diff --git a/external/db_drivers/liblmdb/COPYRIGHT b/db_drivers/liblmdb/COPYRIGHT similarity index 100% rename from external/db_drivers/liblmdb/COPYRIGHT rename to db_drivers/liblmdb/COPYRIGHT diff --git a/external/db_drivers/liblmdb/Doxyfile b/db_drivers/liblmdb/Doxyfile similarity index 100% rename from external/db_drivers/liblmdb/Doxyfile rename to db_drivers/liblmdb/Doxyfile diff --git a/external/db_drivers/liblmdb/LICENSE b/db_drivers/liblmdb/LICENSE similarity index 100% rename from external/db_drivers/liblmdb/LICENSE rename to db_drivers/liblmdb/LICENSE diff --git a/external/db_drivers/liblmdb/Makefile b/db_drivers/liblmdb/Makefile similarity index 100% rename from external/db_drivers/liblmdb/Makefile rename to db_drivers/liblmdb/Makefile diff --git a/external/db_drivers/liblmdb/lmdb.h b/db_drivers/liblmdb/lmdb.h similarity index 100% rename from external/db_drivers/liblmdb/lmdb.h rename to db_drivers/liblmdb/lmdb.h diff --git a/external/db_drivers/liblmdb/mdb.c b/db_drivers/liblmdb/mdb.c similarity index 100% rename from external/db_drivers/liblmdb/mdb.c rename to db_drivers/liblmdb/mdb.c diff --git a/external/db_drivers/liblmdb/mdb_copy.1 b/db_drivers/liblmdb/mdb_copy.1 similarity index 100% rename from external/db_drivers/liblmdb/mdb_copy.1 rename to db_drivers/liblmdb/mdb_copy.1 diff --git a/external/db_drivers/liblmdb/mdb_copy.c b/db_drivers/liblmdb/mdb_copy.c similarity index 100% rename from external/db_drivers/liblmdb/mdb_copy.c rename to db_drivers/liblmdb/mdb_copy.c diff --git a/external/db_drivers/liblmdb/mdb_dump.1 b/db_drivers/liblmdb/mdb_dump.1 similarity index 100% rename from external/db_drivers/liblmdb/mdb_dump.1 rename to db_drivers/liblmdb/mdb_dump.1 diff --git a/external/db_drivers/liblmdb/mdb_dump.c b/db_drivers/liblmdb/mdb_dump.c similarity index 100% rename from external/db_drivers/liblmdb/mdb_dump.c rename to db_drivers/liblmdb/mdb_dump.c diff --git a/external/db_drivers/liblmdb/mdb_load.1 b/db_drivers/liblmdb/mdb_load.1 similarity index 100% rename from external/db_drivers/liblmdb/mdb_load.1 rename to db_drivers/liblmdb/mdb_load.1 diff --git a/external/db_drivers/liblmdb/mdb_load.c b/db_drivers/liblmdb/mdb_load.c similarity index 100% rename from external/db_drivers/liblmdb/mdb_load.c rename to db_drivers/liblmdb/mdb_load.c diff --git a/external/db_drivers/liblmdb/mdb_stat.1 b/db_drivers/liblmdb/mdb_stat.1 similarity index 100% rename from external/db_drivers/liblmdb/mdb_stat.1 rename to db_drivers/liblmdb/mdb_stat.1 diff --git a/external/db_drivers/liblmdb/mdb_stat.c b/db_drivers/liblmdb/mdb_stat.c similarity index 100% rename from external/db_drivers/liblmdb/mdb_stat.c rename to db_drivers/liblmdb/mdb_stat.c diff --git a/external/db_drivers/liblmdb/midl.c b/db_drivers/liblmdb/midl.c similarity index 100% rename from external/db_drivers/liblmdb/midl.c rename to db_drivers/liblmdb/midl.c diff --git a/external/db_drivers/liblmdb/midl.h b/db_drivers/liblmdb/midl.h similarity index 100% rename from external/db_drivers/liblmdb/midl.h rename to db_drivers/liblmdb/midl.h diff --git a/external/db_drivers/liblmdb/mtest.c b/db_drivers/liblmdb/mtest.c similarity index 100% rename from external/db_drivers/liblmdb/mtest.c rename to db_drivers/liblmdb/mtest.c diff --git a/external/db_drivers/liblmdb/mtest2.c b/db_drivers/liblmdb/mtest2.c similarity index 100% rename from external/db_drivers/liblmdb/mtest2.c rename to db_drivers/liblmdb/mtest2.c diff --git a/external/db_drivers/liblmdb/mtest3.c b/db_drivers/liblmdb/mtest3.c similarity index 100% rename from external/db_drivers/liblmdb/mtest3.c rename to db_drivers/liblmdb/mtest3.c diff --git a/external/db_drivers/liblmdb/mtest4.c b/db_drivers/liblmdb/mtest4.c similarity index 100% rename from external/db_drivers/liblmdb/mtest4.c rename to db_drivers/liblmdb/mtest4.c diff --git a/external/db_drivers/liblmdb/mtest5.c b/db_drivers/liblmdb/mtest5.c similarity index 100% rename from external/db_drivers/liblmdb/mtest5.c rename to db_drivers/liblmdb/mtest5.c diff --git a/external/db_drivers/liblmdb/mtest6.c b/db_drivers/liblmdb/mtest6.c similarity index 100% rename from external/db_drivers/liblmdb/mtest6.c rename to db_drivers/liblmdb/mtest6.c diff --git a/external/db_drivers/liblmdb/sample-bdb.txt b/db_drivers/liblmdb/sample-bdb.txt similarity index 100% rename from external/db_drivers/liblmdb/sample-bdb.txt rename to db_drivers/liblmdb/sample-bdb.txt diff --git a/external/db_drivers/liblmdb/sample-mdb.txt b/db_drivers/liblmdb/sample-mdb.txt similarity index 100% rename from external/db_drivers/liblmdb/sample-mdb.txt rename to db_drivers/liblmdb/sample-mdb.txt diff --git a/external/db_drivers/liblmdb/tooltag b/db_drivers/liblmdb/tooltag similarity index 100% rename from external/db_drivers/liblmdb/tooltag rename to db_drivers/liblmdb/tooltag diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 245758d9..80e574b0 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -97,5 +97,3 @@ else() die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent") endif() endif() - -add_subdirectory(db_drivers)