summaryrefslogtreecommitdiffstats
path: root/collection
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-04-11 10:15:12 -0400
committerSimo Sorce <ssorce@redhat.com>2009-04-13 09:06:39 -0400
commitc0c9939f0b41d51fb5edd44198d13baee086a6fa (patch)
tree61336b30a6889d154f2f3dbe7cbc9e9071368f36 /collection
parentc57cb8cfff2edf4bfb0437d00d505d5dcf27faa6 (diff)
downloadding-libs2-c0c9939f0b41d51fb5edd44198d13baee086a6fa.tar.gz
ding-libs2-c0c9939f0b41d51fb5edd44198d13baee086a6fa.tar.xz
ding-libs2-c0c9939f0b41d51fb5edd44198d13baee086a6fa.zip
Build system improvements for common tools
Allows building shared or static libraries using autotools and provides a pkg-config file to simplify inclusion into other parts of the project (or other projects in the future) For now, we will statically link the collection library and INI parser.
Diffstat (limited to 'collection')
-rw-r--r--collection/Makefile.am16
-rw-r--r--collection/collection.pc.in11
2 files changed, 20 insertions, 7 deletions
diff --git a/collection/Makefile.am b/collection/Makefile.am
index bdc1111..a47f8f9 100644
--- a/collection/Makefile.am
+++ b/collection/Makefile.am
@@ -4,14 +4,16 @@ TRACE_LEVEL=@TRACE_VAR@
topdir=..
AM_CPPFLAGS = -Wall -I$(topdir) -I$(topdir)/trace $(TRACE_LEVEL)
-# Build static libraty
-noinst_LIBRARIES = libcollection.a
-libcollection_a_SOURCES = collection.c collection_tools.c collection.h trace.h collection_tools.h collection_class.h
+# Set up the pkg-config file
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = collection.pc
-# Build shared library - reserved for future
-# lib_LTLIBRARIES = libcollection.la
-# libcollection_la_SOURCES = collection.c collection_tools.c collection.h trace.h collection_tools.h collection_class.h
+# Build libraty
+lib_LTLIBRARIES = libcollection.la
+libcollection_la_SOURCES = collection.c collection_tools.c collection_tools.h collection_class.h
+include_HEADERS = collection.h collection_tools.h
+# Build unit test
noinst_PROGRAMS = collection_ut
collection_ut_SOURCES = collection_ut.c
-collection_ut_LDADD = libcollection.a -lm -lz
+collection_ut_LDADD = libcollection.la -lm -lz
diff --git a/collection/collection.pc.in b/collection/collection.pc.in
new file mode 100644
index 0000000..c73a588
--- /dev/null
+++ b/collection/collection.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: collection
+Description: A data-type to collect data in a heirarchical structure for easy iteration and serialization
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lcollection
+Cflags: -I${includedir}
+URL: http://fedorahosted.org/sssd/