aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Diego Pettenò <flameeyes@gentoo.org> 2006-03-06 12:52:30 +0000
committerAvatar Diego Pettenò <flameeyes@gentoo.org> 2006-03-06 12:52:30 +0000
commit4cfce6e0e9d197ce2de0fca29ea503d0242b71a9 (patch)
tree82bd14858af69906e48741cb780e988c6911e75e
parentd75fd008e07c7a22b663d6094480bc4429417f3b (diff)
downloadpaludis-4cfce6e0e9d197ce2de0fca29ea503d0242b71a9.tar.gz
paludis-4cfce6e0e9d197ce2de0fca29ea503d0242b71a9.tar.xz
Use libtool to build a shared libpaludis.
-rw-r--r--configure.ac2
-rw-r--r--paludis/Makefile.am.m47
-rw-r--r--paludis/args/Makefile.am2
-rw-r--r--paludis/qa/Makefile.am.m42
-rw-r--r--src/Makefile.am2
-rw-r--r--src/qualudis/Makefile.am2
6 files changed, 9 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 9c1e990..3df686c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_LANG([C++])
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
dnl }}}
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index d43444d..1d48765 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -10,7 +10,7 @@ define(`addtest', `define(`testlist', testlist `$1_TEST')dnl
$1_TEST_SOURCES = $1_TEST.cc
$1_TEST_LDADD = $(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludis.a \
+ libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.a
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
@@ -38,7 +38,8 @@ EXTRA_DIST = about.hh.in Makefile.am.m4 paludis.hh.m4 files.m4 \
hashed_containers.hh.in testscriptlist
SUBDIRS = util . args qa
-libpaludis_a_SOURCES = filelist
+libpaludis_la_SOURCES = filelist
+libpaludis_la_LDFLAGS = -version-info 0:0:0
TESTS = testlist
@@ -49,7 +50,7 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
-noinst_LIBRARIES = libpaludis.a
+lib_LTLIBRARIES = libpaludis.la
Makefile.am : Makefile.am.m4 files.m4
$(top_srcdir)/misc/do_m4.bash Makefile.am
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index 734f0b3..f602acf 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -24,7 +24,7 @@ check_PROGRAMS = $(TESTS)
test_ldadd = \
$(top_builddir)/test/libtest.a \
libpaludisargs.a \
- $(top_builddir)/paludis/libpaludis.a \
+ $(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.a
args_TEST_SOURCES = args_TEST.cc
diff --git a/paludis/qa/Makefile.am.m4 b/paludis/qa/Makefile.am.m4
index 664d1f6..09e2469 100644
--- a/paludis/qa/Makefile.am.m4
+++ b/paludis/qa/Makefile.am.m4
@@ -12,7 +12,7 @@ $1_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
libpaludisqa.a \
- $(top_builddir)/paludis/libpaludis.a \
+ $(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.a
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
diff --git a/src/Makefile.am b/src/Makefile.am
index 73deda7..73bc026 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ paludis_SOURCES = \
paludis.cc
paludis_LDADD = \
- $(top_builddir)/paludis/libpaludis.a \
+ $(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/args/libpaludisargs.a \
$(top_builddir)/paludis/util/libpaludisutil.a
diff --git a/src/qualudis/Makefile.am b/src/qualudis/Makefile.am
index d682c1d..1a386ab 100644
--- a/src/qualudis/Makefile.am
+++ b/src/qualudis/Makefile.am
@@ -14,7 +14,7 @@ qualudis_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.a \
$(top_builddir)/paludis/qa/libpaludisqa.a \
$(top_builddir)/paludis/util/libpaludisutil.a \
- $(top_builddir)/paludis/libpaludis.a
+ $(top_builddir)/paludis/libpaludis.la
TESTS_ENVIRONMENT = env TEST_SCRIPT_DIR="$(srcdir)/" $(SHELL) $(top_srcdir)/test/run_test.sh bash
TESTS = version_TEST