summaryrefslogtreecommitdiffstats
path: root/dhash
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-01-07 15:11:07 -0500
committerStephen Gallagher <sgallagh@redhat.com>2010-01-20 08:56:00 -0500
commita799f03edc51320e3a70dfbfe2039d56f3cda260 (patch)
treefa1cb2f6dfda58119836daf40fc92e4cd12dca1e /dhash
parent60413faaa5c846f30e481de48d5d12f272725943 (diff)
downloadding-libs-a799f03edc51320e3a70dfbfe2039d56f3cda260.tar.gz
ding-libs-a799f03edc51320e3a70dfbfe2039d56f3cda260.tar.xz
ding-libs-a799f03edc51320e3a70dfbfe2039d56f3cda260.zip
Split off libdhash into a shared library
Right now, the pkg-config checks for the system version of libdhash are forcibly disabled, requiring the SSSD to build it from its own tree. In the future, when we split the libraries off from the SSSD, it will be easy to switch this check to the external library.
Diffstat (limited to 'dhash')
-rw-r--r--dhash/Makefile.am22
-rw-r--r--dhash/README1
-rw-r--r--dhash/configure.ac2
-rw-r--r--dhash/examples/dhash_example.c (renamed from dhash/dhash_example.c)0
-rw-r--r--dhash/examples/dhash_test.c (renamed from dhash/dhash_test.c)0
5 files changed, 16 insertions, 9 deletions
diff --git a/dhash/Makefile.am b/dhash/Makefile.am
index de3c34d..d5a5618 100644
--- a/dhash/Makefile.am
+++ b/dhash/Makefile.am
@@ -8,22 +8,28 @@ endif
ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
-dist_noinst_DATA = \
- dhash.pc \
- m4
+dist_pkgconfig_DATA = dhash.pc
-noinst_LTLIBRARIES = libdhash.la
-libdhash_la_SOURCES = \
- dhash.c \
- dhash.h
+dist_noinst_DATA = m4
+
+dist_include_HEADERS = dhash.h
+
+lib_LTLIBRARIES = libdhash.la
+libdhash_la_SOURCES = dhash.c
+libdhash_la_LDFLAGS = \
+ -version-info 1:0:0
check_PROGRAMS = dhash_test dhash_example
TESTS = $(check_PROGRAMS)
+dhash_test_SOURCES = examples/dhash_test.c
dhash_test_LDADD = dhash.o
+
+dhash_example_SOURCES = examples/dhash_example.c
dhash_example_LDADD = dhash.o
examplesdir = $(docdir)/examples
-dist_noinst_DATA += dhash_test.c dhash_example.c
+dist_examples_DATA = examples/dhash_test.c examples/dhash_example.c
+dist_doc_DATA = README
tests: all $(check_PROGRAMS)
diff --git a/dhash/README b/dhash/README
new file mode 100644
index 0000000..bee5024
--- /dev/null
+++ b/dhash/README
@@ -0,0 +1 @@
+Documentation for libdhash can be found in dhash.h
diff --git a/dhash/configure.ac b/dhash/configure.ac
index bd21028..1012afb 100644
--- a/dhash/configure.ac
+++ b/dhash/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([dhash], [0.3.3], [jdennis@redhat.com])
+AC_INIT([dhash], [0.4.0], [jdennis@redhat.com])
AC_CONFIG_SRCDIR([dhash.c])
AC_CONFIG_AUX_DIR([build])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
diff --git a/dhash/dhash_example.c b/dhash/examples/dhash_example.c
index 7ed01d7..7ed01d7 100644
--- a/dhash/dhash_example.c
+++ b/dhash/examples/dhash_example.c
diff --git a/dhash/dhash_test.c b/dhash/examples/dhash_test.c
index 27eb88d..27eb88d 100644
--- a/dhash/dhash_test.c
+++ b/dhash/examples/dhash_test.c