Move cdb to contrib as well.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89d1cd401d007ca25d8c60b3e541b12c87ca6dd4..72b01cfed09779cdddd06b47af972466318f4f56 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -892,6 +892,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src"
                                        "${CMAKE_SOURCE_DIR}/contrib/http-parser"
                                        "${CMAKE_SOURCE_DIR}/contrib/libottery"
                                        "${CMAKE_SOURCE_DIR}/contrib/xxhash"
+                                       "${CMAKE_SOURCE_DIR}/contrib/cdb"
                                        "${CMAKE_SOURCE_DIR}/contrib/snowball/include"
                                        "${CMAKE_SOURCE_DIR}/contrib/siphash"
                                        "${CMAKE_SOURCE_DIR}/contrib/blake2"
@@ -943,6 +944,7 @@ IF(GLIB_COMPAT)
 ENDIF(GLIB_COMPAT)
 
 ADD_SUBDIRECTORY(contrib/xxhash)
+ADD_SUBDIRECTORY(contrib/cdb)
 ADD_SUBDIRECTORY(contrib/http-parser)
 ADD_SUBDIRECTORY(contrib/libottery)
 ADD_SUBDIRECTORY(contrib/snowball)

diff --git a/src/cdb/CMakeLists.txt b/contrib/cdb/CMakeLists.txt
similarity index 100%
rename from src/cdb/CMakeLists.txt
rename to contrib/cdb/CMakeLists.txt

diff --git a/src/cdb/cdb.h b/contrib/cdb/cdb.h
similarity index 100%
rename from src/cdb/cdb.h
rename to contrib/cdb/cdb.h

diff --git a/src/cdb/cdb_find.c b/contrib/cdb/cdb_find.c
similarity index 100%
rename from src/cdb/cdb_find.c
rename to contrib/cdb/cdb_find.c

diff --git a/src/cdb/cdb_init.c b/contrib/cdb/cdb_init.c
similarity index 100%
rename from src/cdb/cdb_init.c
rename to contrib/cdb/cdb_init.c

diff --git a/src/cdb/cdb_make.c b/contrib/cdb/cdb_make.c
similarity index 100%
rename from src/cdb/cdb_make.c
rename to contrib/cdb/cdb_make.c

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1fcab9cb7d3b8dcb244d25e384ebf730f4688acf..787ff1a7c2f02659a0e54b45bd81d1586189412a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,8 +54,6 @@ MACRO(AddModules MLIST WLIST)
        #ENDIF(NOT EXISTS "modules.c")
 ENDMACRO(AddModules MLIST WLIST)
 
-# Contrib software
-ADD_SUBDIRECTORY(cdb)
 # Rspamd core components
 ADD_SUBDIRECTORY(lua)
 ADD_SUBDIRECTORY(libcryptobox)

diff --git a/src/lua/lua_cdb.c b/src/lua/lua_cdb.c
index 48b091254b8ddb7c9710cdb06c3cb23799497a23..68e0a749da9e56f2131dc88a5eb5b3e8d84fe109 100644 (file)
--- a/src/lua/lua_cdb.c
+++ b/src/lua/lua_cdb.c
@@ -22,7 +22,7 @@
  */
 
 #include "lua_common.h"
-#include "cdb/cdb.h"
+#include "cdb.h"
 
 #define CDB_REFRESH_TIME 60