summaryrefslogtreecommitdiffstats
path: root/common/collection
diff options
context:
space:
mode:
Diffstat (limited to 'common/collection')
-rw-r--r--common/collection/Makefile.am10
-rw-r--r--common/collection/configure.ac5
2 files changed, 6 insertions, 9 deletions
diff --git a/common/collection/Makefile.am b/common/collection/Makefile.am
index 86488eddb..0b8d0d035 100644
--- a/common/collection/Makefile.am
+++ b/common/collection/Makefile.am
@@ -7,17 +7,17 @@ ACLOCAL_AMFLAGS = -I m4
# Set up the pkg-config file
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = collection.pc
+dist_noinst_DATA = collection.pc
# Build library
-lib_LTLIBRARIES = libcollection.la
+noinst_LTLIBRARIES = libcollection.la
libcollection_la_SOURCES = \
collection.c \
collection_tools.c \
+ collection.h \
+ collection_tools.h \
collection_priv.h \
- trace.h
-
-include_HEADERS = collection.h collection_tools.h
+ ../trace/trace.h
# Build unit test
noinst_PROGRAMS = collection_ut
diff --git a/common/collection/configure.ac b/common/collection/configure.ac
index ed51593d9..32a238ce2 100644
--- a/common/collection/configure.ac
+++ b/common/collection/configure.ac
@@ -3,10 +3,7 @@ AC_CONFIG_SRCDIR([collection.c])
AC_CONFIG_AUX_DIR([build])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_PROG_CC
-
-#Until the API is stabilized, we'll statically link
-LT_INIT([disable-shared])
-
+AC_PROG_LIBTOOL
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_INSTALL