From a2111416b0d8ae0a2c1b3090fe62353e2c231ea6 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 21 May 2009 09:03:01 -0400 Subject: 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. --- dhash/Makefile.am | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'dhash') diff --git a/dhash/Makefile.am b/dhash/Makefile.am index 67e69b6..9037bf9 100644 --- a/dhash/Makefile.am +++ b/dhash/Makefile.am @@ -2,15 +2,16 @@ AM_CPPFLAGS = -Wall ACLOCAL_AMFLAGS = -I m4 pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dhash.pc +dist_noinst_DATA = dhash.pc -lib_LTLIBRARIES = libdhash.la -libdhash_la_SOURCES = dhash.c -include_HEADERS = dhash.h +noinst_LTLIBRARIES = libdhash.la +libdhash_la_SOURCES = \ + dhash.c \ + dhash.h check_PROGRAMS = dhash_test dhash_example dhash_test_LDADD = dhash.o dhash_example_LDADD = dhash.o examplesdir = $(docdir)/examples -dist_examples_DATA = dhash_test.c dhash_example.c +dist_noinst_DATA += dhash_test.c dhash_example.c -- cgit