diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2009-05-21 09:03:01 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2009-05-26 09:10:45 -0400 |
| commit | a2111416b0d8ae0a2c1b3090fe62353e2c231ea6 (patch) | |
| tree | 4636cb48efc877f636b86c901191920885fc2595 /collection | |
| parent | 048a614802f36d8173aec5d3fd893ec845460564 (diff) | |
| download | ding-libs2-a2111416b0d8ae0a2c1b3090fe62353e2c231ea6.tar.gz ding-libs2-a2111416b0d8ae0a2c1b3090fe62353e2c231ea6.tar.xz ding-libs2-a2111416b0d8ae0a2c1b3090fe62353e2c231ea6.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 'collection')
| -rw-r--r-- | collection/Makefile.am | 10 | ||||
| -rw-r--r-- | collection/configure.ac | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/collection/Makefile.am b/collection/Makefile.am index 86488ed..0b8d0d0 100644 --- a/collection/Makefile.am +++ b/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/collection/configure.ac b/collection/configure.ac index ed51593..32a238c 100644 --- a/collection/configure.ac +++ b/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 |