diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2010-01-07 15:11:07 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-01-20 08:56:00 -0500 |
| commit | 746391a1719659161f026684193b3fb04593f563 (patch) | |
| tree | 600ba93efdd7182db2d96c86ac7f72d5f7377240 /common | |
| parent | 8b179530db795f6e974677a11b38c31ca82ba793 (diff) | |
| download | sssd-746391a1719659161f026684193b3fb04593f563.tar.gz sssd-746391a1719659161f026684193b3fb04593f563.tar.bz2 sssd-746391a1719659161f026684193b3fb04593f563.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 'common')
| -rw-r--r-- | common/dhash/Makefile.am | 22 | ||||
| -rw-r--r-- | common/dhash/README | 1 | ||||
| -rw-r--r-- | common/dhash/configure.ac | 2 | ||||
| -rw-r--r-- | common/dhash/examples/dhash_example.c (renamed from common/dhash/dhash_example.c) | 0 | ||||
| -rw-r--r-- | common/dhash/examples/dhash_test.c (renamed from common/dhash/dhash_test.c) | 0 |
5 files changed, 16 insertions, 9 deletions
diff --git a/common/dhash/Makefile.am b/common/dhash/Makefile.am index de3c34d2..d5a56187 100644 --- a/common/dhash/Makefile.am +++ b/common/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/common/dhash/README b/common/dhash/README new file mode 100644 index 00000000..bee5024e --- /dev/null +++ b/common/dhash/README @@ -0,0 +1 @@ +Documentation for libdhash can be found in dhash.h diff --git a/common/dhash/configure.ac b/common/dhash/configure.ac index bd210287..1012afbb 100644 --- a/common/dhash/configure.ac +++ b/common/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/common/dhash/dhash_example.c b/common/dhash/examples/dhash_example.c index 7ed01d71..7ed01d71 100644 --- a/common/dhash/dhash_example.c +++ b/common/dhash/examples/dhash_example.c diff --git a/common/dhash/dhash_test.c b/common/dhash/examples/dhash_test.c index 27eb88d5..27eb88d5 100644 --- a/common/dhash/dhash_test.c +++ b/common/dhash/examples/dhash_test.c |