summaryrefslogtreecommitdiffstats
path: root/common/Makefile.am
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-05-21 09:03:01 -0400
committerSimo Sorce <ssorce@redhat.com>2009-05-26 09:10:45 -0400
commit419d4579bcb84a3b10d8b5048df2087a3f55544f (patch)
treee36310049957f423bc9afa0d9ec7a1f056ac3274 /common/Makefile.am
parent23cb08ee2f1e3b597742281e475350039247d9d8 (diff)
downloadsssd-419d4579bcb84a3b10d8b5048df2087a3f55544f.tar.gz
sssd-419d4579bcb84a3b10d8b5048df2087a3f55544f.tar.xz
sssd-419d4579bcb84a3b10d8b5048df2087a3f55544f.zip
Clean up automake build to work on older versions of libtool
LT_INIT is supported only on Libtool >= 2.0, so I reverted it to using AC_PROG_LIBTOOL. Also reorganized how the common libraries were being built. Now they are treated as libtool convenience libraries instead of installable libraries (the --with-singlelib configure flag can still be used to generate a combined, installable DSO) I cleaned up the set of files being installed by automake, so the list of things we need to remove before packaging the RPM is now only the .la files associated with our own plugins.
Diffstat (limited to 'common/Makefile.am')
-rw-r--r--common/Makefile.am14
1 files changed, 6 insertions, 8 deletions
diff --git a/common/Makefile.am b/common/Makefile.am
index 47d7c4a99..42bd483a1 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,19 +1,17 @@
ACLOCAL_AMFLAGS = -I m4
-
+SUBDIRS = trace collection ini dhash
if SINGLELIB
# Build all components as a single shared library
lib_LTLIBRARIES = libsssd_util.la
-libsssd_util_la_SOURCES = \
- collection/collection.c \
- collection/collection_tools.c \
- ini/ini_config.c \
- dhash/dhash.c
+libsssd_util_la_SOURCES =
+libsssd_util_la_LIBADD = \
+ collection/libcollection.la \
+ ini/libini_config.la \
+ dhash/libdhash.la
libsssd_util_la_CFLAGS = $(AM_CFLAGS) \
-I ./collection \
-I ./ini \
-I ./dhash \
-I ./trace
-else
-SUBDIRS = collection ini trace dhash
endif