summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-02-01 11:17:03 -0500
committerStephen Gallagher <sgallagh@redhat.com>2010-02-03 10:35:18 -0500
commitf4918db9dc26e3585054cc3841f379137bb9f8a6 (patch)
treeecfd0b40a9d9937422afa611a2ebf0167edf5a7c /common
parent1151bcff3fd6f16d4fe3ca216e3957c1420d7b54 (diff)
downloadsssd-f4918db9dc26e3585054cc3841f379137bb9f8a6.tar.gz
sssd-f4918db9dc26e3585054cc3841f379137bb9f8a6.tar.bz2
sssd-f4918db9dc26e3585054cc3841f379137bb9f8a6.zip
Split off libini_config into a shared library
Diffstat (limited to 'common')
-rw-r--r--common/ini/Makefile.am21
-rw-r--r--common/ini/README1
-rw-r--r--common/ini/configure.ac2
-rw-r--r--common/ini/ini_config.pc.in2
4 files changed, 19 insertions, 7 deletions
diff --git a/common/ini/Makefile.am b/common/ini/Makefile.am
index bf993bcf..cfaacf94 100644
--- a/common/ini/Makefile.am
+++ b/common/ini/Makefile.am
@@ -1,7 +1,10 @@
#DEBUG_FLAGS=@DEBUG_VAR@
TRACE_LEVEL=@TRACE_VAR@
+builddir ?= .
+
topdir=$(srcdir)/..
+topbuilddir=$(builddir)/..
AM_CFLAGS =
if HAVE_GCC
@@ -16,23 +19,31 @@ ACLOCAL_AMFLAGS = -I m4
# Set up the pkg-config file
pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = ini_config.pc
+
dist_noinst_DATA = \
- ini_config.pc \
ini.conf \
ini.d/real.conf \
ini.d/test.conf \
m4
+dist_include_HEADERS = \
+ ini_config.h
+
# Build library
-noinst_LTLIBRARIES = libini_config.la
+lib_LTLIBRARIES = libini_config.la
libini_config_la_SOURCES = \
- ini_config.c \
- ini_config.h
+ ini_config.c
+libini_config_la_LIBADD = \
+ -L$(topbuilddir)/collection \
+ -lcollection
+libini_config_la_LDFLAGS = \
+ -version-info 1:0:0
# Build unit test
check_PROGRAMS = ini_config_ut
ini_config_ut_SOURCES = ini_config_ut.c
-ini_config_ut_LDADD = libini_config.la ../collection/libcollection.la
+ini_config_ut_LDADD = libini_config.la -lcollection
TESTS = ini_config_ut
diff --git a/common/ini/README b/common/ini/README
new file mode 100644
index 00000000..2b4d381d
--- /dev/null
+++ b/common/ini/README
@@ -0,0 +1 @@
+Documentation for ini_config can be found in ini_config.h \ No newline at end of file
diff --git a/common/ini/configure.ac b/common/ini/configure.ac
index ef8f0de9..c58be247 100644
--- a/common/ini/configure.ac
+++ b/common/ini/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([ini_config],[0.3.3],[sssd-devel@lists.fedorahosted.org])
+AC_INIT([ini_config],[0.4.0],[sssd-devel@lists.fedorahosted.org])
AC_CONFIG_SRCDIR([ini_config.c])
AC_CONFIG_AUX_DIR([build])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
diff --git a/common/ini/ini_config.pc.in b/common/ini/ini_config.pc.in
index 3ac3b260..efa8da97 100644
--- a/common/ini/ini_config.pc.in
+++ b/common/ini/ini_config.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: @PACKAGE_NAME@
Description: Library to process config files in INI format into a libcollection data structure
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lini_config
+Libs: -L${libdir} -lini_config -lcollection
Cflags: -I${includedir}
URL: http://fedorahosted.org/sssd/