diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2010-02-01 11:17:03 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-02-03 10:35:18 -0500 |
| commit | e467f4da6d71d2de3c70f38942ce80f3ababbd11 (patch) | |
| tree | 2f7867d3708af200ffe052ada575600d82e9e675 | |
| parent | 0786af71b4ef4135cbdbdf64ed53c9f305a42a7e (diff) | |
| download | ding-libs-e467f4da6d71d2de3c70f38942ce80f3ababbd11.tar.gz ding-libs-e467f4da6d71d2de3c70f38942ce80f3ababbd11.tar.xz ding-libs-e467f4da6d71d2de3c70f38942ce80f3ababbd11.zip | |
Split off libini_config into a shared library
| -rw-r--r-- | ini/Makefile.am | 21 | ||||
| -rw-r--r-- | ini/README | 1 | ||||
| -rw-r--r-- | ini/configure.ac | 2 | ||||
| -rw-r--r-- | ini/ini_config.pc.in | 2 |
4 files changed, 19 insertions, 7 deletions
diff --git a/ini/Makefile.am b/ini/Makefile.am index bf993bc..cfaacf9 100644 --- a/ini/Makefile.am +++ b/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/ini/README b/ini/README new file mode 100644 index 0000000..2b4d381 --- /dev/null +++ b/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/ini/configure.ac b/ini/configure.ac index ef8f0de..c58be24 100644 --- a/ini/configure.ac +++ b/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/ini/ini_config.pc.in b/ini/ini_config.pc.in index 3ac3b26..efa8da9 100644 --- a/ini/ini_config.pc.in +++ b/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/ |