diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-02-21 18:35:54 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-02-21 18:35:54 +0000 |
| commit | d0f501c2309b84c3d05a68d82f87c5af165b34f4 (patch) | |
| tree | ad3d68d5aa2148472c8bde91bfe05954bb62e2c0 | |
| parent | f1c22fe6f3a7218c67556d5468c34fac00b0ed7b (diff) | |
| download | rspamd-d0f501c2309b84c3d05a68d82f87c5af165b34f4.tar.gz rspamd-d0f501c2309b84c3d05a68d82f87c5af165b34f4.zip | |
Move cdb to contrib as well.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/cdb/CMakeLists.txt (renamed from src/cdb/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | contrib/cdb/cdb.h (renamed from src/cdb/cdb.h) | 0 | ||||
| -rw-r--r-- | contrib/cdb/cdb_find.c (renamed from src/cdb/cdb_find.c) | 0 | ||||
| -rw-r--r-- | contrib/cdb/cdb_init.c (renamed from src/cdb/cdb_init.c) | 0 | ||||
| -rw-r--r-- | contrib/cdb/cdb_make.c (renamed from src/cdb/cdb_make.c) | 0 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/lua/lua_cdb.c | 2 |
8 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 89d1cd401..72b01cfed 100644 --- 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 index 7f3850bc5..7f3850bc5 100644 --- a/src/cdb/CMakeLists.txt +++ b/contrib/cdb/CMakeLists.txt diff --git a/src/cdb/cdb.h b/contrib/cdb/cdb.h index 03da9ac41..03da9ac41 100644 --- a/src/cdb/cdb.h +++ b/contrib/cdb/cdb.h diff --git a/src/cdb/cdb_find.c b/contrib/cdb/cdb_find.c index cae0f184b..cae0f184b 100644 --- a/src/cdb/cdb_find.c +++ b/contrib/cdb/cdb_find.c diff --git a/src/cdb/cdb_init.c b/contrib/cdb/cdb_init.c index 0c0b5e353..0c0b5e353 100644 --- a/src/cdb/cdb_init.c +++ b/contrib/cdb/cdb_init.c diff --git a/src/cdb/cdb_make.c b/contrib/cdb/cdb_make.c index b5ce28eeb..b5ce28eeb 100644 --- a/src/cdb/cdb_make.c +++ b/contrib/cdb/cdb_make.c diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1fcab9cb7..787ff1a7c 100644 --- 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 48b091254..68e0a749d 100644 --- 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 |