Updating build for libhashkit.

diff --git a/Makefile.am b/Makefile.am
index ea95090450919098f5d1f8488de0e896f402c389..476845c0d24b086807ceb9acebb8a3ae4291e8cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,12 +16,13 @@ EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST = README.FIRST
 
-SUBDIRS = docs libhashkit
+SUBDIRS = docs
 
 test-docs:
        (cd docs && $(MAKE) test-docs)
 include libmemcached/include.am
 include clients/include.am
+include libhashkit/include.am
 include tests/include.am
 include example/include.am
 include support/include.am

diff --git a/configure.ac b/configure.ac
index 6bb4f2848d6c17f39f07d5bdc17c45c92b8a45f2..598b930e8db98e5d19bcab4c2b61c9cea502c64a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,6 @@ AC_CONFIG_FILES([
   Makefile
   docs/Makefile
   libmemcached/memcached_configure.h
-  libhashkit/Makefile
   support/libmemcached.pc
   support/libmemcached.spec
   support/libmemcached-fc.spec

diff --git a/libhashkit/Makefile.am b/libhashkit/Makefile.am
deleted file mode 100644 (file)
index 55a2cf7..0000000
--- a/libhashkit/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-# HashKit
-# Copyright (C) 2009 Brian Aker
-# All rights reserved.
-#
-# Use and distribution licensed under the BSD license.  See
-# the COPYING file in the parent directory for full text.
-
-lib_LTLIBRARIES= libhashkit.la
-
-libhashkitincludedir= ${includedir}/libhashkit
-
-dist_libhashkitinclude_HEADERS= \
-       algorithm.h \
-       behavior.h \
-        hashkit.h \
-       strerror.h \
-        types.h \
-        visibility.h
-
-noinst_HEADERS= \
-               common.h
-
-libhashkit_la_SOURCES= \
-        crc32.c \
-        behavior.c \
-        default.c \
-        fnv.c \
-        hashkit.c \
-        jenkins.c \
-        ketama.c \
-        md5.c \
-        murmur.c \
-       strerror.c
-
-if INCLUDE_HSIEH_SRC
-libhashkit_la_SOURCES+= hsieh.c
-endif
-
-libhashkit_la_CFLAGS= \
-        ${AM_CFLAGS} \
-        -DBUILDING_HASHKIT
-
-libhashkit_la_LDFLAGS= \
-       $(LIBM) \
-        -version-info $(HASHKIT_LIBRARY_VERSION)

diff --git a/libhashkit/hsieh.c b/libhashkit/hsieh.c
index cd44b67ff5c86993033664d2443e309cdc025779..9060bba030e2f40441f91f58446fb59e38227443 100644 (file)
--- a/libhashkit/hsieh.c
+++ b/libhashkit/hsieh.c
@@ -1,11 +1,11 @@
 /* By Paul Hsieh (C) 2004, 2005.  Covered under the Paul Hsieh
- * derivative license. 
+ * derivative license.
  * See: http://www.azillionmonkeys.com/qed/weblicense.html for license
  * details.
  * http://www.azillionmonkeys.com/qed/hash.html
 */
 
-#include "hash_common.h"
+#include "common.h"
 
 #undef get16bits
 #if (defined(__GNUC__) && defined(__i386__))

diff --git a/libhashkit/include.am b/libhashkit/include.am
new file mode 100644 (file)
index 0000000..43f8ee1
--- /dev/null
+++ b/libhashkit/include.am
@@ -0,0 +1,47 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+#
+# HashKit
+# Copyright (C) 2009 Brian Aker
+# All rights reserved.
+#
+# Use and distribution licensed under the BSD license.  See
+# the COPYING file in the parent directory for full text.
+
+lib_LTLIBRARIES+= libhashkit/libhashkit.la
+
+nobase_pkginclude_HEADERS+= \
+                           libhashkit/algorithm.h \
+                           libhashkit/behavior.h \
+                           libhashkit/hashkit.h \
+                           libhashkit/strerror.h \
+                           libhashkit/types.h \
+                           libhashkit/visibility.h
+
+noinst_HEADERS+= \
+                libhashkit/common.h
+
+libhashkit_libhashkit_la_SOURCES= \
+                                 libhashkit/crc32.c \
+                                 libhashkit/behavior.c \
+                                 libhashkit/default.c \
+                                 libhashkit/fnv.c \
+                                 libhashkit/hashkit.c \
+                                 libhashkit/jenkins.c \
+                                 libhashkit/ketama.c \
+                                 libhashkit/md5.c \
+                                 libhashkit/murmur.c \
+                                 libhashkit/strerror.c
+
+if INCLUDE_HSIEH_SRC
+libhashkit_libhashkit_la_SOURCES+= libhashkit/hsieh.c
+endif
+
+libhashkit_libhashkit_la_CFLAGS= \
+                     ${AM_CFLAGS} \
+                     -DBUILDING_HASHKIT
+
+libhashkit_libhashkit_la_LDFLAGS= \
+                                 $(LIBM) \
+                                 -version-info $(HASHKIT_LIBRARY_VERSION)