X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libhashkit%2Finclude.am;h=72fec057f5f1c0d05d51a2f0bcc597380c2dc727;hb=17519532bd568971860f8a6046496e6bc2946d43;hp=cb424e1d5c408020bcf06265c7dfdaa29a589b98;hpb=562eadf651a079c347ff2797069adbbf938fea96;p=m6w6%2Flibmemcached

diff --git a/libhashkit/include.am b/libhashkit/include.am
index cb424e1d..72fec057 100644
--- a/libhashkit/include.am
+++ b/libhashkit/include.am
@@ -21,6 +21,7 @@ nobase_include_HEADERS+= \
 			 libhashkit/configure.h \
 			 libhashkit/digest.h \
 			 libhashkit/function.h \
+			 libhashkit/has.h \
 			 libhashkit/hashkit.h \
 			 libhashkit/hashkit.hpp \
 			 libhashkit/strerror.h \
@@ -36,39 +37,33 @@ libhashkit_libhashkit_la_SOURCES= \
 				  libhashkit/behavior.cc \
 				  libhashkit/crc32.cc \
 				  libhashkit/digest.cc \
-				  libhashkit/fnv.cc \
+				  libhashkit/fnv_32.cc \
+				  libhashkit/fnv_64.cc \
 				  libhashkit/function.cc \
+				  libhashkit/has.cc \
 				  libhashkit/hashkit.cc \
+				  libhashkit/hsieh.cc \
 				  libhashkit/jenkins.cc \
 				  libhashkit/ketama.cc \
 				  libhashkit/md5.cc \
+				  libhashkit/murmur.cc \
 				  libhashkit/one_at_a_time.cc \
 				  libhashkit/str_algorithm.cc \
 				  libhashkit/strerror.cc
 
-if INCLUDE_HSIEH_SRC
-libhashkit_libhashkit_la_SOURCES+= libhashkit/hsieh.cc
-endif
 
-if INCLUDE_MURMUR_SRC
-libhashkit_libhashkit_la_SOURCES+= libhashkit/murmur.cc
-endif
 
-libhashkit_libhashkit_la_CPPFLAGS= \
-				   ${AM_CPPFLAGS} \
-				   -DBUILDING_HASHKIT
+libhashkit_libhashkit_la_CPPFLAGS= -DBUILDING_HASHKIT
 
-libhashkit_libhashkit_la_CFLAGS= \
-				   ${AM_CFLAGS} \
-				   -DBUILDING_HASHKIT
+libhashkit_libhashkit_la_CFLAGS= -DBUILDING_HASHKIT
 
-libhashkit_libhashkit_la_CXXFLAGS= \
-				   ${AM_CXXFLAGS} \
-				   -DBUILDING_HASHKIT
+libhashkit_libhashkit_la_CXXFLAGS= -DBUILDING_HASHKIT
 
-libhashkit_libhashkit_la_LDFLAGS= \
-				  $(LIBM) \
-				  -version-info $(HASHKIT_LIBRARY_VERSION)
+libhashkit_libhashkit_la_LIBADD=
+libhashkit_libhashkit_la_LDFLAGS= -version-info $(HASHKIT_LIBRARY_VERSION)
+if TARGET_LINUX
+libhashkit_libhashkit_la_LIBADD+= -lm
+endif
 
 # library used for testing
 noinst_LTLIBRARIES+= libhashkit/libhashkitinc.la