Move xxhash to contrib.

CMakeLists.txt

@@ -851,7 +851,8 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src"
 					"${CMAKE_SOURCE_DIR}/src/ucl/include"
 					"${CMAKE_SOURCE_DIR}/contrib/uthash"
 					"${CMAKE_SOURCE_DIR}/contrib/http-parser"
-					"${CMAKE_SOURCE_DIR}/contrib/libottery")
+					"${CMAKE_SOURCE_DIR}/contrib/libottery"
+					"${CMAKE_SOURCE_DIR}/contrib/xxhash")
 
 SET(RSPAMDSRC	src/modules.c
 				src/controller.c
@@ -887,13 +888,13 @@ IF(NOT HIREDIS_FOUND)
     INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/contrib/hiredis")
 ENDIF(NOT HIREDIS_FOUND)
 
-
+ADD_SUBDIRECTORY(contrib/xxhash)
+ADD_SUBDIRECTORY(contrib/http-parser)
+ADD_SUBDIRECTORY(contrib/libottery)
 ADD_SUBDIRECTORY(src/lua)
 ADD_SUBDIRECTORY(src/json)
 ADD_SUBDIRECTORY(src/cdb)
 ADD_SUBDIRECTORY(src/ucl)
-ADD_SUBDIRECTORY(contrib/http-parser)
-ADD_SUBDIRECTORY(contrib/libottery)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(src/client)
 

contrib/xxhash/CMakeLists.txt

@@ -0,0 +1,3 @@
+SET(XXHASHSRC xxhash.c)
+
+ADD_LIBRARY(xxhash STATIC ${XXHASHSRC})

debian/copyright

@@ -42,7 +42,7 @@ Files: contrib/libottery/*
 Copyright: Nick Mathewson
 License: CC0
 
-Files: src/ucl/src/xxhash.*
+Files: contrib/xxhash/xxhash.*
 Copyright: 2012-2013, Yann Collet.
 License: BSD-2-Clause
 

src/CMakeLists.txt

@@ -70,6 +70,7 @@ TARGET_LINK_LIBRARIES(rspamd-util rspamd-ucl)
 TARGET_LINK_LIBRARIES(rspamd-util rspamd-ottery)
 TARGET_LINK_LIBRARIES(rspamd-util rspamd-http-parser)
 TARGET_LINK_LIBRARIES(rspamd-util event)
+TARGET_LINK_LIBRARIES(rspamd-util xxhash)
 
 IF(NOT DEBIAN_BUILD)
 SET_TARGET_PROPERTIES(rspamd-util PROPERTIES VERSION ${RSPAMD_VERSION})

src/ucl/CMakeLists.txt

@@ -1,13 +1,13 @@
 SET(UCLSRC            src/ucl_util.c
                       src/ucl_parser.c
                       src/ucl_emitter.c
-                      src/ucl_hash.c
-                      src/xxhash.c)
+                      src/ucl_hash.c)
 
 ADD_LIBRARY(rspamd-ucl ${LINK_TYPE} ${UCLSRC})
 SET_TARGET_PROPERTIES(rspamd-ucl PROPERTIES VERSION ${RSPAMD_VERSION})
 SET_TARGET_PROPERTIES(rspamd-ucl PROPERTIES COMPILE_FLAGS "-DRSPAMD_LIB")
 
+TARGET_LINK_LIBRARIES(rspamd-ucl xxhash)
 IF(HAVE_FETCH_H)
     TARGET_LINK_LIBRARIES(rspamd-ucl fetch)
 ELSE(HAVE_FETCH_H)