Merge in fixes for 32bit

[awesomized/libmemcached] / libhashkit / include.am

diff --git a/libhashkit/include.am b/libhashkit/include.am
index 43300585b6124cde647a4434f00aca8f1a70d6a8..90d623a17c12940f152d0129e9c0eb84985c22db 100644 (file)
--- a/libhashkit/include.am
+++ b/libhashkit/include.am
@@ -36,7 +36,8 @@ 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/hashkit.cc \
                                  libhashkit/jenkins.cc \
@@ -54,14 +55,17 @@ if INCLUDE_MURMUR_SRC
 libhashkit_libhashkit_la_SOURCES+= libhashkit/murmur.cc
 endif
 
-libhashkit_libhashkit_la_CXXFLAGS= \
-                                  ${AM_CXXFLAGS} \
-                                  -DBUILDING_HASHKIT
+libhashkit_libhashkit_la_CPPFLAGS= -DBUILDING_HASHKIT
+
+libhashkit_libhashkit_la_CFLAGS= -DBUILDING_HASHKIT
+
+libhashkit_libhashkit_la_CXXFLAGS= -DBUILDING_HASHKIT
 
 libhashkit_libhashkit_la_LDFLAGS= \
                                  $(LIBM) \
                                  -version-info $(HASHKIT_LIBRARY_VERSION)
 
+# library used for testing
 noinst_LTLIBRARIES+= libhashkit/libhashkitinc.la
 
 libhashkit_libhashkitinc_la_SOURCES= ${libhashkit_libhashkit_la_SOURCES}