aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-03 03:29:25 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-03 03:29:25 +0000
commita69106c869b1fdd2b624773eba923945112e56ad (patch)
tree38980cc47fe6bacf6580ba1bf61202c1eb56a7bd
parent3f8e86e8ac5db447b75f6863b5e7939492ed4a73 (diff)
downloadpaludis-a69106c869b1fdd2b624773eba923945112e56ad.tar.gz
paludis-a69106c869b1fdd2b624773eba923945112e56ad.tar.xz
Don't use shared libraries. They break.
-rw-r--r--configure.ac2
-rw-r--r--paludis/Makefile.am.m49
-rw-r--r--paludis/args/Makefile.am12
-rw-r--r--paludis/qa/Makefile.am.m412
-rw-r--r--paludis/util/Makefile.am.m47
-rw-r--r--src/Makefile.am6
-rw-r--r--src/qualudis/Makefile.am8
7 files changed, 25 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac
index f2729c8..9ae1952 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_LIBTOOL
+AC_PROG_RANLIB
AC_PROG_MAKE_SET
dnl }}}
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 5484dbe..f86273e 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -10,8 +10,8 @@ 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.la \
- $(top_builddir)/paludis/util/libpaludisutil.la
+ libpaludis.a \
+ $(top_builddir)/paludis/util/libpaludisutil.a
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
@@ -41,8 +41,7 @@ EXTRA_DIST = about.hh.in Makefile.am.m4 paludis.hh.m4 files.m4 \
hashed_containers.hh.in testscriptlist
SUBDIRS = util . args qa
-libpaludis_la_SOURCES = filelist
-libpaludis_la_LDFLAGS = -version-info 0:0:0
+libpaludis_a_SOURCES = filelist
TESTS = testlist
@@ -53,7 +52,7 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
-lib_LTLIBRARIES = libpaludis.la
+noinst_LIBRARIES = libpaludis.a
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 bd65763..122f7c9 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -5,7 +5,7 @@ AM_CXXFLAGS = -I$(top_srcdir)
TESTS = \
args_TEST
-libpaludisargs_la_SOURCES = \
+libpaludisargs_a_SOURCES = \
args.hh args.cc \
args_error.hh args_error.cc \
args_group.hh args_group.cc \
@@ -17,17 +17,15 @@ libpaludisargs_la_SOURCES = \
missing_value.hh missing_value.cc \
args_dumper.hh args_dumper.cc
-libpaludisargs_la_LDFLAGS = -version-info 0:0:0
-
TESTS_ENVIRONMENT = env -u PALUDIS_OPTIONS TEST_SCRIPT_DIR="$(srcdir)/" $(SHELL) $(top_srcdir)/test/run_test.sh
-lib_LTLIBRARIES = libpaludisargs.la
+noinst_LIBRARIES = libpaludisargs.a
check_PROGRAMS = $(TESTS)
test_ldadd = \
$(top_builddir)/test/libtest.a \
- libpaludisargs.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la
+ libpaludisargs.a \
+ $(top_builddir)/paludis/libpaludis.a \
+ $(top_builddir)/paludis/util/libpaludisutil.a
args_TEST_SOURCES = args_TEST.cc
args_TEST_LDADD = $(test_ldadd)
diff --git a/paludis/qa/Makefile.am.m4 b/paludis/qa/Makefile.am.m4
index 56c8c8c..16609a0 100644
--- a/paludis/qa/Makefile.am.m4
+++ b/paludis/qa/Makefile.am.m4
@@ -13,9 +13,9 @@ $1_TEST_SOURCES = $1_TEST.cc
$1_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludisqa.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la
+ libpaludisqa.a \
+ $(top_builddir)/paludis/libpaludis.a \
+ $(top_builddir)/paludis/util/libpaludisutil.a
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
@@ -33,9 +33,7 @@ addthis(`$1',`$5')addthis(`$1',`$6')')dnl
include(`paludis/qa/files.m4')
-libpaludisqa_la_SOURCES = filelist
-libpaludisqa_la_LIBADD = $(top_builddir)/paludis/libpaludis.la
-libpaludisqa_la_LDFLAGS = -version-info 0:0:0
+libpaludisqa_a_SOURCES = filelist
TESTS = testlist
@@ -46,7 +44,7 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
-lib_LTLIBRARIES = libpaludisqa.la
+noinst_LIBRARIES = libpaludisqa.a
endif
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index 9057fa4..e0180e3 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -8,7 +8,7 @@ define(`testlist', `')dnl
define(`testscriptlist', `')dnl
define(`addtest', `define(`testlist', testlist `$1_TEST')dnl
$1_TEST_SOURCES = $1_TEST.cc
-$1_TEST_LDADD = test_extras.o $(top_builddir)/test/libtest.a libpaludisutil.la
+$1_TEST_LDADD = test_extras.o $(top_builddir)/test/libtest.a libpaludisutil.a
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
@@ -35,8 +35,7 @@ EXTRA_DIST = util.hh.m4 Makefile.am.m4 files.m4 smart_record.hh.m4 \
comparison_policy.hh.m4 testscriptlist test_extras.cc
SUBDIRS = .
-libpaludisutil_la_SOURCES = filelist
-libpaludisutil_la_LDFLAGS = -version-info 0:0:0
+libpaludisutil_a_SOURCES = filelist
TESTS = testlist
@@ -47,7 +46,7 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
-lib_LTLIBRARIES = libpaludisutil.la
+noinst_LIBRARIES = libpaludisutil.a
Makefile.am : Makefile.am.m4 files.m4
$(top_srcdir)/misc/do_m4.bash Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
index ebdd2d1..b846da5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,9 +18,9 @@ paludis_SOURCES = \
paludis.cc
paludis_LDADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la
+ $(top_builddir)/paludis/libpaludis.a \
+ $(top_builddir)/paludis/args/libpaludisargs.a \
+ $(top_builddir)/paludis/util/libpaludisutil.a
TESTS_ENVIRONMENT = env TEST_SCRIPT_DIR="$(srcdir)/" $(SHELL) $(top_srcdir)/test/run_test.sh bash
TESTS = version_TEST
diff --git a/src/qualudis/Makefile.am b/src/qualudis/Makefile.am
index 56603f6..ea544bc 100644
--- a/src/qualudis/Makefile.am
+++ b/src/qualudis/Makefile.am
@@ -16,10 +16,10 @@ qualudis_SOURCES = \
qualudis.cc
qualudis_LDADD = \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/qa/libpaludisqa.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludis.la
+ $(top_builddir)/paludis/args/libpaludisargs.a \
+ $(top_builddir)/paludis/qa/libpaludisqa.a \
+ $(top_builddir)/paludis/util/libpaludisutil.a \
+ $(top_builddir)/paludis/libpaludis.a
TESTS_ENVIRONMENT = env TEST_SCRIPT_DIR="$(srcdir)/" $(SHELL) $(top_srcdir)/test/run_test.sh bash
TESTS = version_TEST