aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-07-29 19:03:07 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-07-29 21:48:43 +0100
commitd0c4e15066ace678c90e7e06161d9353816a4c03 (patch)
tree9d2b51fafb97d02f849d7c413f54d41749d13e1b
parent6c049a7f3aeae2fac8ac45789c86b84c14d22380 (diff)
downloadpaludis-d0c4e15066ace678c90e7e06161d9353816a4c03.tar.gz
paludis-d0c4e15066ace678c90e7e06161d9353816a4c03.tar.xz
Stick slot information into the so names.
Libtool is too stupid to get this right just using .so.whatever. Fixes: ticket:616
-rw-r--r--configure.ac2
-rw-r--r--doc/api/cplusplus/examples/Makefile.am84
-rw-r--r--paludis/Makefile.am.m461
-rw-r--r--paludis/args/Makefile.am22
-rw-r--r--paludis/environments/adapted/Makefile.am21
-rw-r--r--paludis/environments/no_config/Makefile.am18
-rw-r--r--paludis/environments/paludis/Makefile.am26
-rw-r--r--paludis/environments/portage/Makefile.am19
-rw-r--r--paludis/environments/test/Makefile.am14
-rw-r--r--paludis/hooker.cc11
-rwxr-xr-xpaludis/hooker_TEST_setup.sh6
-rw-r--r--paludis/repositories/cran/Makefile.am41
-rw-r--r--paludis/repositories/e/Makefile.am152
-rw-r--r--paludis/repositories/e/glsa.cc4
-rw-r--r--paludis/repositories/e/qa/Makefile.am146
-rw-r--r--paludis/repositories/fake/Makefile.am36
-rw-r--r--paludis/repositories/gems/Makefile.am53
-rw-r--r--paludis/repositories/unavailable/Makefile.am22
-rw-r--r--paludis/repositories/unpackaged/Makefile.am36
-rw-r--r--paludis/repositories/virtuals/Makefile.am35
-rw-r--r--paludis/selinux/Makefile.am14
-rw-r--r--paludis/util/Makefile.am.m413
-rw-r--r--python/Makefile.am51
-rw-r--r--ruby/Makefile.am31
-rw-r--r--src/clients/accerso/Makefile.am17
-rw-r--r--src/clients/adjutrix/Makefile.am21
-rw-r--r--src/clients/contrarius/Makefile.am15
-rw-r--r--src/clients/gtkpaludis/Makefile.am5
-rw-r--r--src/clients/importare/Makefile.am15
-rw-r--r--src/clients/inquisitio/Makefile.am14
-rw-r--r--src/clients/instruo/Makefile.am17
-rw-r--r--src/clients/paludis/Makefile.am15
-rw-r--r--src/clients/qualudis/Makefile.am18
-rw-r--r--src/clients/reconcilio/Makefile.am21
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/Makefile.am4
-rw-r--r--src/clients/reconcilio/util/Makefile.am4
36 files changed, 553 insertions, 531 deletions
diff --git a/configure.ac b/configure.ac
index ca48ba5..b4962ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_LANG([C++])
PALUDIS_CXXFLAGS=
PALUDIS_PC_CFLAGS=
-PALUDIS_PC_LIBS="-lpaludis -lpaludisutil -lpaludisargs"
+PALUDIS_PC_LIBS="-lpaludis_${PALUDIS_PC_SLOT} -lpaludisutil_${PALUDIS_PC_SLOT} -lpaludisargs_${PALUDIS_PC_SLOT}"
PALUDIS_PC_VERSION=
dnl }}}
diff --git a/doc/api/cplusplus/examples/Makefile.am b/doc/api/cplusplus/examples/Makefile.am
index c6b51c4..41736ca 100644
--- a/doc/api/cplusplus/examples/Makefile.am
+++ b/doc/api/cplusplus/examples/Makefile.am
@@ -41,131 +41,131 @@ libpaludisexamples_a_SOURCES = \
example_command_line.cc
libpaludisexamples_a_LIBADD = \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_about_SOURCES = example_about.cc
example_about_LDADD = \
- $(top_builddir)/paludis/libpaludis.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
example_action_SOURCES = example_action.cc
example_action_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_contents_SOURCES = example_contents.cc
example_contents_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_dep_label_SOURCES = example_dep_label.cc
example_dep_label_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_dep_spec_SOURCES = example_dep_spec.cc
example_dep_spec_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_dep_tree_SOURCES = example_dep_tree.cc
example_dep_tree_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_dep_tag_SOURCES = example_dep_tag.cc
example_dep_tag_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_dep_spec_flattener_SOURCES = example_dep_spec_flattener.cc
example_dep_spec_flattener_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_environment_SOURCES = example_environment.cc
example_environment_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_formatter_SOURCES = example_formatter.cc
example_formatter_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_stringify_formatter_SOURCES = example_stringify_formatter.cc
example_stringify_formatter_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_package_id_SOURCES = example_package_id.cc
example_package_id_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_mask_SOURCES = example_mask.cc
example_mask_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_metadata_key_SOURCES = example_metadata_key.cc
example_metadata_key_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_repository_SOURCES = example_repository.cc
example_repository_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_match_package_SOURCES = example_match_package.cc
example_match_package_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_selection_SOURCES = example_selection.cc
example_selection_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_package_database_SOURCES = example_package_database.cc
example_package_database_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_version_operator_SOURCES = example_version_operator.cc
example_version_operator_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_version_spec_SOURCES = example_version_spec.cc
example_version_spec_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
example_name_SOURCES = example_name.cc
example_name_LDADD = \
libpaludisexamples.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 2c0168b..c6ee4d9 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -19,11 +19,11 @@ $1_TEST_LDADD = \
ihateautomake.o \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
$1_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS)
')dnl
@@ -86,34 +86,34 @@ EXTRA_DIST = about.hh.in Makefile.am.m4 paludis.hh.m4 files.m4 \
SUBDIRS = distributions fetchers syncers util selinux . repositories environments args
BUILT_SOURCES = srcleanlist secleanlist
-libpaludis_la_SOURCES = filelist
-libpaludis_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 $(PTHREAD_LIBS)
+libpaludis_@PALUDIS_PC_SLOT@_la_SOURCES = filelist
+libpaludis_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 $(PTHREAD_LIBS)
-libpaludispythonhooks_la_SOURCES = python_hooks.cc
-libpaludispythonhooks_la_CXXFLAGS = $(AM_CXXFLAGS) \
+libpaludispythonhooks_@PALUDIS_PC_SLOT@_la_SOURCES = python_hooks.cc
+libpaludispythonhooks_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) \
@PALUDIS_CXXFLAGS_NO_STRICT_ALIASING@ \
@PALUDIS_CXXFLAGS_NO_WSHADOW@ \
-I@PYTHON_INCLUDE_DIR@
-libpaludispythonhooks_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 @BOOST_PYTHON_LIB@ -lpython@PYTHON_VERSION@
-libpaludispythonhooks_la_LIBADD = libpaludis.la
+libpaludispythonhooks_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 @BOOST_PYTHON_LIB@ -lpython@PYTHON_VERSION@
+libpaludispythonhooks_@PALUDIS_PC_SLOT@_la_LIBADD = libpaludis_@PALUDIS_PC_SLOT@.la
-libpaludismanpagethings_la_SOURCES = name.cc
+libpaludismanpagethings_@PALUDIS_PC_SLOT@_la_SOURCES = name.cc
-libpaludissohooks_TEST_la_SOURCES = sohooks_TEST.cc
+libpaludissohooks_TEST_@PALUDIS_PC_SLOT@_la_SOURCES = sohooks_TEST.cc
# -rpath to force shared library
-libpaludissohooks_TEST_la_LDFLAGS = -rpath /nowhere -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludissohooks_TEST_@PALUDIS_PC_SLOT@_la_LDFLAGS = -rpath /nowhere -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-libpaludissohooks_TEST_la_LIBADD = libpaludis.la
+libpaludissohooks_TEST_@PALUDIS_PC_SLOT@_la_LIBADD = libpaludis_@PALUDIS_PC_SLOT@.la
-libpaludis_la_LIBADD = \
- $(top_builddir)/paludis/selinux/libpaludisselinux.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+libpaludis_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/selinux/libpaludisselinux_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
@DYNAMIC_LD_LIBS@ \
$(PTHREAD_LIBS)
-libpaludismanpagethings_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil.la
+libpaludismanpagethings_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
dep_list_TEST_SOURCES += dep_list_TEST.hh
define(`testlist', testlist `dep_list_TEST_blockers')dnl
@@ -122,10 +122,10 @@ dep_list_TEST_blockers_LDADD = \
ihateautomake.o \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
dep_list_TEST_blockers_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS)
@@ -133,7 +133,7 @@ TESTS = testlist
check_PROGRAMS = $(TESTS) stripper_TEST_binary
check_SCRIPTS = testscriptlist
-check_LTLIBRARIES = libpaludissohooks_TEST.la
+check_LTLIBRARIES = libpaludissohooks_TEST_@PALUDIS_PC_SLOT@.la
stripper_TEST_binary_SOURCES = stripper_TEST_binary.cc
@@ -145,15 +145,15 @@ paludis_libexec_SCRIPTS = hooker.bash
if MONOLITHIC
-noinst_LTLIBRARIES = libpaludis.la libpaludismanpagethings.la
+noinst_LTLIBRARIES = libpaludis_@PALUDIS_PC_SLOT@.la libpaludismanpagethings_@PALUDIS_PC_SLOT@.la
else
-lib_LTLIBRARIES = libpaludis.la
-noinst_LTLIBRARIES = libpaludismanpagethings.la
+lib_LTLIBRARIES = libpaludis_@PALUDIS_PC_SLOT@.la
+noinst_LTLIBRARIES = libpaludismanpagethings_@PALUDIS_PC_SLOT@.la
if ENABLE_PYTHON_HOOKS
-lib_LTLIBRARIES += libpaludispythonhooks.la
+lib_LTLIBRARIES += libpaludispythonhooks_@PALUDIS_PC_SLOT@.la
endif
endif
@@ -178,7 +178,7 @@ changequote(`<', `>')
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-DISTCHECK_DEPS = libpaludis.la libpaludismanpagethings.la
+DISTCHECK_DEPS = libpaludis_@PALUDIS_PC_SLOT@.la libpaludismanpagethings_@PALUDIS_PC_SLOT@.la
distcheck-deps-local : $(DISTCHECK_DEPS)
@@ -199,6 +199,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
TEST_SCRIPT_DIR="$(srcdir)/" \
SO_SUFFIX=@VERSION_LIB_CURRENT@ \
+ PALUDIS_PC_SLOT=@PALUDIS_PC_SLOT@ \
PYTHONPATH="$(top_builddir)/python/" \
PALUDIS_PYTHON_DIR="$(top_srcdir)/python/" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index b051923..ed5fe2d 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -25,7 +25,7 @@ paludis_args_include_HEADERS = \
install_args_group.hh \
do_help.hh
-libpaludisargs_la_SOURCES = \
+libpaludisargs_@PALUDIS_PC_SLOT@_la_SOURCES = \
args.cc \
args_error.cc \
args_group.cc \
@@ -41,14 +41,14 @@ libpaludisargs_la_SOURCES = \
dep_list_args_group.cc \
install_args_group.cc
-libpaludisman_a_SOURCES = \
+libpaludisman_@PALUDIS_PC_SLOT@_a_SOURCES = \
man.cc
-libpaludisargs_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisargs_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-libpaludisargs_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis.la
- $(top_builddir)/paludis/util/libpaludisutil.la
+libpaludisargs_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
TESTS_ENVIRONMENT = env PALUDIS_OPTIONS="" \
TEST_SCRIPT_DIR="$(srcdir)/" \
@@ -56,16 +56,16 @@ TESTS_ENVIRONMENT = env PALUDIS_OPTIONS="" \
PALUDIS_DISTRIBUTION="gentoo" \
bash $(top_srcdir)/test/run_test.sh
-lib_LTLIBRARIES = libpaludisargs.la
-noinst_LIBRARIES = libpaludisman.a
+lib_LTLIBRARIES = libpaludisargs_@PALUDIS_PC_SLOT@.la
+noinst_LIBRARIES = libpaludisman_@PALUDIS_PC_SLOT@.a
check_PROGRAMS = $(TESTS)
test_ldadd = \
$(top_builddir)/paludis/util/test_extras.o \
- libpaludisargs.la \
+ libpaludisargs_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/util/libpaludisutil.la
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
args_TEST_SOURCES = args_TEST.cc
args_TEST_LDADD = $(test_ldadd)
@@ -73,7 +73,7 @@ args_TEST_LDADD = $(test_ldadd)
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-DISTCHECK_DEPS = libpaludisargs.la libpaludisman.a
+DISTCHECK_DEPS = libpaludisargs_@PALUDIS_PC_SLOT@.la libpaludisman_@PALUDIS_PC_SLOT@.a
distcheck-deps-local : $(DISTCHECK_DEPS)
diff --git a/paludis/environments/adapted/Makefile.am b/paludis/environments/adapted/Makefile.am
index edfee3f..4ca6731 100644
--- a/paludis/environments/adapted/Makefile.am
+++ b/paludis/environments/adapted/Makefile.am
@@ -8,17 +8,17 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-libpaludisadaptedenvironment_la_SOURCES = \
+libpaludisadaptedenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
adapted_environment.cc adapted_environment.hh \
registration.cc
-libpaludisadaptedenvironment_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisadaptedenvironment_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-libpaludisadaptedenvironment_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludis.la
+libpaludisadaptedenvironment_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
-lib_LTLIBRARIES = libpaludisadaptedenvironment.la
+lib_LTLIBRARIES = libpaludisadaptedenvironment_@PALUDIS_PC_SLOT@.la
paludis_environment_adapted_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/environments/adapted
paludis_environment_adapted_include_HEADERS = \
@@ -43,12 +43,12 @@ check_SCRIPTS =
adapted_environment_TEST_SOURCES = adapted_environment_TEST.cc
adapted_environment_TEST_LDADD = \
- libpaludisadaptedenvironment.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ libpaludisadaptedenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
BUILT_SOURCES =
@@ -63,3 +63,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/paludis/environments/no_config/Makefile.am b/paludis/environments/no_config/Makefile.am
index 226ea11..a340722 100644
--- a/paludis/environments/no_config/Makefile.am
+++ b/paludis/environments/no_config/Makefile.am
@@ -9,18 +9,18 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-libpaludisnoconfigenvironment_la_SOURCES = \
+libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
no_config_environment.cc no_config_environment.hh \
registration.cc
-libpaludisnoconfigenvironment_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-libpaludisnoconfigenvironment_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludis.la
+libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
libenvdir = $(libdir)/paludis/environments/
-libenv_LTLIBRARIES = libpaludisnoconfigenvironment.la
+libenv_LTLIBRARIES = libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@.la
paludis_environment_no_config_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/environments/no_config
paludis_environment_no_config_include_HEADERS = \
@@ -57,11 +57,11 @@ check_SCRIPTS = no_config_environment_TEST_setup.sh no_config_environment_TEST_c
no_config_environment_TEST_SOURCES = no_config_environment_TEST.cc
no_config_environment_TEST_LDADD = \
- libpaludisnoconfigenvironment.la \
+ libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
BUILT_SOURCES = \
diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
index e0844a9..cead156 100644
--- a/paludis/environments/paludis/Makefile.am
+++ b/paludis/environments/paludis/Makefile.am
@@ -10,7 +10,7 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-libpaludispaludisenvironment_la_SOURCES = \
+libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
bashable_conf.cc bashable_conf.hh \
keywords_conf.cc keywords_conf.hh \
licenses_conf.cc licenses_conf.hh \
@@ -22,13 +22,13 @@ libpaludispaludisenvironment_la_SOURCES = \
paludis_environment.cc paludis_environment.hh \
registration.cc
-libpaludispaludisenvironment_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
if ! MONOLITHIC
-libpaludispaludisenvironment_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludis.la
+libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
endif
@@ -36,11 +36,11 @@ libenvdir = $(libdir)/paludis/environments/
if MONOLITHIC
-noinst_LTLIBRARIES = libpaludispaludisenvironment.la
+noinst_LTLIBRARIES = libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la
else
-libenv_LTLIBRARIES = libpaludispaludisenvironment.la
+libenv_LTLIBRARIES = libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la
endif
@@ -97,19 +97,19 @@ if MONOLITHIC
paludis_environment_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludispaludisenvironment.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
else
paludis_environment_TEST_LDADD = \
- libpaludispaludisenvironment.la \
+ libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
endif
diff --git a/paludis/environments/portage/Makefile.am b/paludis/environments/portage/Makefile.am
index 33ce5d1..53e3e8d 100644
--- a/paludis/environments/portage/Makefile.am
+++ b/paludis/environments/portage/Makefile.am
@@ -9,22 +9,22 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-libpaludisportageenvironment_la_SOURCES = \
+libpaludisportageenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
registration.cc \
portage_environment.cc portage_environment.hh
-libpaludisportageenvironment_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisportageenvironment_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-libpaludisportageenvironment_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludis.la
+libpaludisportageenvironment_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
libenvdir = $(libdir)/paludis/environments/
libexecenvdir = $(libexecdir)/paludis/environments/portage/
libexecenv_SCRIPTS = bashrc
-libenv_LTLIBRARIES = libpaludisportageenvironment.la
+libenv_LTLIBRARIES = libpaludisportageenvironment_@PALUDIS_PC_SLOT@.la
paludis_environment_portage_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/environments/portage
paludis_environment_portage_include_HEADERS = \
@@ -53,11 +53,11 @@ TESTS_ENVIRONMENT = env \
portage_environment_TEST_SOURCES = portage_environment_TEST.cc
portage_environment_TEST_LDADD = \
- libpaludisportageenvironment.la \
+ libpaludisportageenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
check_PROGRAMS = $(TESTS)
@@ -73,3 +73,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/paludis/environments/test/Makefile.am b/paludis/environments/test/Makefile.am
index fa85aea..94a6a54 100644
--- a/paludis/environments/test/Makefile.am
+++ b/paludis/environments/test/Makefile.am
@@ -7,27 +7,27 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-libpaludistestenvironment_la_SOURCES = \
+libpaludistestenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
test_environment.cc test_environment.hh \
registration.cc
-libpaludistestenvironment_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludistestenvironment_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
if ! MONOLITHIC
-libpaludistestenvironment_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludis.la
+libpaludistestenvironment_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
endif
if MONOLITHIC
-noinst_LTLIBRARIES = libpaludistestenvironment.la
+noinst_LTLIBRARIES = libpaludistestenvironment_@PALUDIS_PC_SLOT@.la
else
-lib_LTLIBRARIES = libpaludistestenvironment.la
+lib_LTLIBRARIES = libpaludistestenvironment_@PALUDIS_PC_SLOT@.la
endif
diff --git a/paludis/hooker.cc b/paludis/hooker.cc
index e63d3a6..1b2a064 100644
--- a/paludis/hooker.cc
+++ b/paludis/hooker.cc
@@ -51,7 +51,8 @@ HookFile::~HookFile()
namespace
{
- static const std::string so_suffix(".so." + stringify(100 * PALUDIS_VERSION_MAJOR + PALUDIS_VERSION_MINOR));
+ static const std::string so_suffix("_" + stringify(PALUDIS_VERSION_MAJOR) + "." + stringify(PALUDIS_VERSION_MINOR)
+ + ".so." + stringify(100 * PALUDIS_VERSION_MAJOR + PALUDIS_VERSION_MINOR));
class BashHookFile :
public HookFile
@@ -594,8 +595,10 @@ Hooker::_find_hooks(const Hook & hook) const
if (! load_try)
{
load_try = true;
+ std::string soname("libpaludispythonhooks_" + stringify(PALUDIS_VERSION_MAJOR) + "."
+ + stringify(PALUDIS_VERSION_MINOR) + ".so");
- pyhookfilehandle.handle = dlopen("libpaludispythonhooks.so", RTLD_NOW | RTLD_GLOBAL);
+ pyhookfilehandle.handle = dlopen(soname.c_str(), RTLD_NOW | RTLD_GLOBAL);
if (pyhookfilehandle.handle)
{
pyhookfilehandle.create_py_hook_file_handle =
@@ -610,14 +613,14 @@ Hooker::_find_hooks(const Hook & hook) const
else
{
Log::get_instance()->message("hook.python.dlerror", ll_warning, lc_context) <<
- "dlsym(libpaludispythonhooks.so, create_py_hook_file) "
+ "dlsym(" + soname + ", create_py_hook_file) "
"failed due to error '" << dlerror() << "'";
}
}
else
{
Log::get_instance()->message("hook.python.dlerror", ll_warning, lc_context) <<
- "dlopen(libpaludispythonhooks.so) failed due to error '" << dlerror() << "'";
+ "dlopen(" + soname + ") failed due to error '" << dlerror() << "'";
}
}
}
diff --git a/paludis/hooker_TEST_setup.sh b/paludis/hooker_TEST_setup.sh
index 1ae83be..a0c0dfb 100755
--- a/paludis/hooker_TEST_setup.sh
+++ b/paludis/hooker_TEST_setup.sh
@@ -51,10 +51,10 @@ chmod +x fancy_hook_output/one.hook
mkdir so_hook
-ln -s ../../.libs/libpaludissohooks_TEST.so.${SO_SUFFIX} so_hook
+ln -s ../../.libs/libpaludissohooks_TEST_${PALUDIS_PC_SLOT}.so.${SO_SUFFIX} so_hook
mkdir so_hook_output
-ln -s ../../.libs/libpaludissohooks_TEST.so.${SO_SUFFIX} so_hook_output
+ln -s ../../.libs/libpaludissohooks_TEST_${PALUDIS_PC_SLOT}.so.${SO_SUFFIX} so_hook_output
mkdir py_hook
@@ -223,7 +223,7 @@ chmod +x ordering.common
for a in a b c d e f g h i j k ; do
ln -s ../ordering.common ordering/${a}.hook
done
-ln -s ../../.libs/libpaludissohooks_TEST.so.${SO_SUFFIX} ordering
+ln -s ../../.libs/libpaludissohooks_TEST_${PALUDIS_PC_SLOT}.so.${SO_SUFFIX} ordering
cat <<"END" > ordering/py_hook.py
def hook_run_ordering(env, hook_env):
file("hooker_TEST_dir/ordering.out", "a").write("py_hook\n")
diff --git a/paludis/repositories/cran/Makefile.am b/paludis/repositories/cran/Makefile.am
index 84289bb..e79f838 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -14,16 +14,16 @@ paludis_repositories_libdir = $(libdir)/paludis/repositories
if MONOLITHIC
-noinst_LTLIBRARIES = libpaludiscranrepository.la
+noinst_LTLIBRARIES = libpaludiscranrepository_@PALUDIS_PC_SLOT@.la
else
-paludis_repositories_lib_LTLIBRARIES = libpaludiscranrepository.la
+paludis_repositories_lib_LTLIBRARIES = libpaludiscranrepository_@PALUDIS_PC_SLOT@.la
endif
paludis_repositories_cran_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/cran/
-libpaludiscranrepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludiscranrepository_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_repositories_cran_include_HEADERS = \
cran_package_id.hh \
@@ -39,7 +39,7 @@ paludis_repositories_cran_include_HEADERS = \
dep_spec_pretty_printer.hh \
package_dep_spec.hh
-libpaludiscranrepository_la_SOURCES = \
+libpaludiscranrepository_@PALUDIS_PC_SLOT@_la_SOURCES = \
cran_package_id.cc \
cran_dep_parser.cc \
cran_repository.cc \
@@ -53,9 +53,9 @@ libpaludiscranrepository_la_SOURCES = \
package_dep_spec.cc \
$(paludis_repositories_cran_include_HEADERS)
-libpaludiscranrepository_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+libpaludiscranrepository_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
TESTS = \
@@ -69,17 +69,17 @@ cran_dep_parser_TEST_SOURCES = cran_dep_parser_TEST.cc
cran_dep_parser_TEST_LDADD= \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludiscranrepository.la
+ libpaludiscranrepository_@PALUDIS_PC_SLOT@.la
cran_installed_repository_TEST_SOURCES = cran_installed_repository_TEST.cc
cran_installed_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludiscranrepository.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ libpaludiscranrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
cran_repository_TEST_SOURCES = cran_repository_TEST.cc
@@ -87,10 +87,10 @@ cran_repository_TEST_SOURCES = cran_repository_TEST.cc
cran_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludiscranrepository.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ libpaludiscranrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
description_file_TEST_SOURCES = description_file_TEST.cc
@@ -98,10 +98,10 @@ description_file_TEST_SOURCES = description_file_TEST.cc
description_file_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludiscranrepository.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ libpaludiscranrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
EXTRA_DIST = \
@@ -160,3 +160,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index 3d48904..6e3eae9 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -19,16 +19,16 @@ DEFS= \
-DLIBDIR=\"$(libdir)\"
paludis_repositories_libdir = $(libdir)/paludis/repositories
-paludis_repositories_lib_LTLIBRARIES = libpaludiserepository.la
+paludis_repositories_lib_LTLIBRARIES = libpaludiserepository_@PALUDIS_PC_SLOT@.la
if ENABLE_GLSA
-lib_LTLIBRARIES = libpaludiserepositoryxmlthings.la
+lib_LTLIBRARIES = libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@.la
endif
paludis_repositories_e_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/e/
-libpaludiserepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludiserepository_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_repositories_e_include_HEADERS = \
aa_visitor.hh \
@@ -89,7 +89,7 @@ paludis_repositories_e_include_HEADERS = \
vdb_repository.hh \
vdb_unmerger.hh
-libpaludiserepository_la_SOURCES = \
+libpaludiserepository_@PALUDIS_PC_SLOT@_la_SOURCES = \
aa_visitor.cc \
check_fetched_files_visitor.cc \
dep_parser.cc \
@@ -139,20 +139,20 @@ libpaludiserepository_la_SOURCES = \
vdb_unmerger.cc \
$(paludis_repositories_e_include_HEADERS)
-libpaludiserepository_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+libpaludiserepository_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
e_repository_TEST_SOURCES = e_repository_TEST.cc
e_repository_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
@@ -161,12 +161,12 @@ e_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
vdb_repository_TEST_SOURCES = vdb_repository_TEST.cc
vdb_repository_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
@@ -175,12 +175,12 @@ vdb_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
exndbam_repository_TEST_SOURCES = exndbam_repository_TEST.cc
exndbam_repository_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
@@ -189,11 +189,11 @@ exndbam_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
vdb_merger_TEST_SOURCES = vdb_merger_TEST.cc
vdb_merger_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
@@ -202,11 +202,11 @@ vdb_merger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
vdb_unmerger_TEST_SOURCES = vdb_unmerger_TEST.cc
vdb_unmerger_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
@@ -215,13 +215,13 @@ vdb_unmerger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
e_repository_sets_TEST_SOURCES = e_repository_sets_TEST.cc
e_repository_sets_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
@@ -230,72 +230,72 @@ e_repository_sets_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
dep_spec_pretty_printer_TEST_SOURCES = dep_spec_pretty_printer_TEST.cc
dep_spec_pretty_printer_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
dep_parser_TEST_SOURCES = dep_parser_TEST.cc
dep_parser_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
aa_visitor_TEST_SOURCES = aa_visitor_TEST.cc
aa_visitor_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
fetch_visitor_TEST_SOURCES = fetch_visitor_TEST.cc
fetch_visitor_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
source_uri_finder_TEST_SOURCES = source_uri_finder_TEST.cc
source_uri_finder_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
fix_locked_dependencies_TEST_SOURCES = fix_locked_dependencies_TEST.cc
fix_locked_dependencies_TEST_LDADD = \
- libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
@@ -450,15 +450,15 @@ e_repository_params-se.cc : e_repository_params.se $(top_srcdir)/misc/make_se.ba
if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/e_repository_params.se > $@ ; then rm -f $@ ; exit 1 ; fi
-libpaludiserepositoryxmlthings_la_SOURCES = xml_things.cc xml_things.hh
-libpaludiserepositoryxmlthings_la_CXXFLAGS = $(AM_CXXFLAGS) @LIBXML2DEPS_CFLAGS@
+libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@_la_SOURCES = xml_things.cc xml_things.hh
+libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) @LIBXML2DEPS_CFLAGS@
-libpaludiserepositoryxmlthings_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludis.la \
+libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
@LIBXML2DEPS_LIBS@
-libpaludiserepositoryxmlthings_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
if ENABLE_GLSA
@@ -468,10 +468,10 @@ xml_things_TEST_SOURCES = xml_things_TEST.cc
xml_things_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludiserepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
diff --git a/paludis/repositories/e/glsa.cc b/paludis/repositories/e/glsa.cc
index 9085b66..9022d6c 100644
--- a/paludis/repositories/e/glsa.cc
+++ b/paludis/repositories/e/glsa.cc
@@ -23,6 +23,7 @@
#include <paludis/util/mutex.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <paludis/util/indirect_iterator-impl.hh>
+#include <paludis/about.hh>
#include <list>
#include <dlfcn.h>
#include <stdint.h>
@@ -225,7 +226,8 @@ GLSA::create_from_xml_file(const std::string & filename)
Lock lock(libxmlhandle.mutex);
if (0 == libxmlhandle.handle)
- libxmlhandle.handle = dlopen("libpaludiserepositoryxmlthings.so",
+ libxmlhandle.handle = dlopen(("libpaludiserepositoryxmlthings_" + stringify(PALUDIS_VERSION_MAJOR) + "."
+ + stringify(PALUDIS_VERSION_MINOR) + ".so").c_str(),
RTLD_NOW | RTLD_GLOBAL);
if (0 == libxmlhandle.handle)
throw NotAvailableError("Cannot create GLSA from XML file '" + filename + "' due to error '"
diff --git a/paludis/repositories/e/qa/Makefile.am b/paludis/repositories/e/qa/Makefile.am
index d3316af..1698b35 100644
--- a/paludis/repositories/e/qa/Makefile.am
+++ b/paludis/repositories/e/qa/Makefile.am
@@ -64,9 +64,9 @@ paludis_repositories_e_include_HEADERS = \
repo_name.hh \
categories.hh
-lib_LTLIBRARIES = libpaludiserepositoryqa.la
+lib_LTLIBRARIES = libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la
-libpaludiserepositoryqa_la_SOURCES = \
+libpaludiserepositoryqa_@PALUDIS_PC_SLOT@_la_SOURCES = \
qa.cc \
eapi_supported.cc \
metadata_keys.cc \
@@ -103,14 +103,14 @@ libpaludiserepositoryqa_la_SOURCES = \
categories.cc \
$(paludis_repositories_e_include_HEADERS)
-libpaludiserepositoryqa_la_LDFLAGS = \
+libpaludiserepositoryqa_@PALUDIS_PC_SLOT@_la_LDFLAGS = \
-version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 \
$(PCREPLUSPLUS_LIBS)
-libpaludiserepositoryqa_la_LIBADD = \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la
+libpaludiserepositoryqa_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
dist_check_SCRIPTS = \
visibility_TEST_setup.sh \
@@ -163,123 +163,123 @@ check_PROGRAMS = $(TESTS)
spec_keys_TEST_SOURCES = spec_keys_TEST.cc
spec_keys_TEST_LDADD = \
- libpaludiserepositoryqa.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
stray_files_TEST_SOURCES = stray_files_TEST.cc
stray_files_TEST_LDADD = \
- libpaludiserepositoryqa.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
extractors_TEST_SOURCES = extractors_TEST.cc
extractors_TEST_LDADD = \
- libpaludiserepositoryqa.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
homepage_key_TEST_SOURCES = homepage_key_TEST.cc
homepage_key_TEST_LDADD = \
- libpaludiserepositoryqa.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
visibility_TEST_SOURCES = visibility_TEST.cc
visibility_TEST_LDADD = \
- libpaludiserepositoryqa.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
default_functions_TEST_SOURCES = default_functions_TEST.cc
default_functions_TEST_LDADD = \
- libpaludiserepositoryqa.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
kv_variables_TEST_SOURCES = kv_variables_TEST.cc
kv_variables_TEST_LDADD = \
- libpaludiserepositoryqa.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
misc_files_TEST_SOURCES = misc_files_TEST.cc
misc_files_TEST_LDADD = \
- libpaludiserepositoryqa.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
manifest_TEST_SOURCES = manifest_TEST.cc
manifest_TEST_LDADD = \
- libpaludiserepositoryqa.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
subshell_die_TEST_SOURCES = subshell_die_TEST.cc
subshell_die_TEST_LDADD = \
- libpaludiserepositoryqa.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
function_keyword_TEST_SOURCES = function_keyword_TEST.cc
function_keyword_TEST_LDADD = \
- libpaludiserepositoryqa.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludiserepositoryqa_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
endif
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index e41e7df..9d8dcb5 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -34,27 +34,27 @@ EXTRA_DIST = \
dep_parser_TEST.cc
fake_repository_TEST_LDADD = \
- libpaludisfakerepository.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
fake_installed_repository_TEST_LDADD = \
- libpaludisfakerepository.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
dep_parser_TEST_LDADD = \
- libpaludisfakerepository.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
fake_repository_TEST_SOURCES = \
@@ -66,20 +66,20 @@ fake_installed_repository_TEST_SOURCES = \
dep_parser_TEST_SOURCES = \
dep_parser_TEST.cc
-paludis_repositories_lib_LTLIBRARIES = libpaludisfakerepository.la
+paludis_repositories_lib_LTLIBRARIES = libpaludisfakerepository_@PALUDIS_PC_SLOT@.la
-libpaludisfakerepository_la_SOURCES = \
+libpaludisfakerepository_@PALUDIS_PC_SLOT@_la_SOURCES = \
dep_parser.cc dep_parser.hh \
fake_repository_base.cc fake_repository_base.hh \
fake_repository.cc fake_repository.hh \
fake_installed_repository.cc fake_installed_repository.hh \
fake_package_id.cc fake_package_id.hh
-libpaludisfakerepository_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la
+libpaludisfakerepository_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
-libpaludisfakerepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisfakerepository_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_repositories_fake_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/fake/
paludis_repositories_fake_include_HEADERS = \
diff --git a/paludis/repositories/gems/Makefile.am b/paludis/repositories/gems/Makefile.am
index 3b22192..2431eae 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -13,10 +13,10 @@ DEFS = \
paludis_repositories_libdir = $(libdir)/paludis/repositories
paludis_gems_libexecdir = $(libexecdir)/paludis/gems
-paludis_repositories_lib_LTLIBRARIES = libpaludisgemsrepository.la
+paludis_repositories_lib_LTLIBRARIES = libpaludisgemsrepository_@PALUDIS_PC_SLOT@.la
paludis_repositories_gems_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/gems/
-libpaludisgemsrepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisgemsrepository_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_repositories_gems_include_HEADERS = \
gems_repository.hh \
@@ -27,7 +27,7 @@ paludis_repositories_gems_include_HEADERS = \
gem_specifications.hh \
params-fwd.hh params.hh params-sr.hh
-libpaludisgemsrepository_la_SOURCES = \
+libpaludisgemsrepository_@PALUDIS_PC_SLOT@_la_SOURCES = \
gems_repository.cc \
installed_gems_repository.cc \
params.cc \
@@ -38,9 +38,9 @@ libpaludisgemsrepository_la_SOURCES = \
registration.cc \
$(paludis_repositories_gems_include_HEADERS)
-libpaludisgemsrepository_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+libpaludisgemsrepository_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-lsyck
gems_repository_TEST_SOURCES = gems_repository_TEST.cc
@@ -50,47 +50,47 @@ gem_specification_TEST_SOURCES = gem_specification_TEST.cc
gem_specifications_TEST_SOURCES = gem_specifications_TEST.cc
gems_repository_TEST_LDADD = \
- libpaludisgemsrepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisgemsrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
-lsyck
installed_gems_repository_TEST_LDADD = \
- libpaludisgemsrepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisgemsrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
-lsyck
yaml_TEST_LDADD = \
- libpaludisgemsrepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisgemsrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
-lsyck
gem_specification_TEST_LDADD = \
- libpaludisgemsrepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisgemsrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
-lsyck
gem_specifications_TEST_LDADD = \
- libpaludisgemsrepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisgemsrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
-lsyck
@@ -154,3 +154,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/paludis/repositories/unavailable/Makefile.am b/paludis/repositories/unavailable/Makefile.am
index 8c0c5da..d7c33b7 100644
--- a/paludis/repositories/unavailable/Makefile.am
+++ b/paludis/repositories/unavailable/Makefile.am
@@ -12,10 +12,10 @@ DEFS= \
-DLIBDIR=\"$(libdir)\"
paludis_repositories_libdir = $(libdir)/paludis/repositories
-paludis_repositories_lib_LTLIBRARIES = libpaludisunavailablerepository.la
+paludis_repositories_lib_LTLIBRARIES = libpaludisunavailablerepository_@PALUDIS_PC_SLOT@.la
paludis_repositories_unavailable_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/unavailable/
-libpaludisunavailablerepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisunavailablerepository_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_repositories_unavailable_include_HEADERS = \
unavailable_repository.hh unavailable_repository-fwd.hh \
@@ -24,7 +24,7 @@ paludis_repositories_unavailable_include_HEADERS = \
unavailable_repository_store.hh \
unavailable_repository_file.hh unavailable_repository_file-fwd.hh
-libpaludisunavailablerepository_la_SOURCES = \
+libpaludisunavailablerepository_@PALUDIS_PC_SLOT@_la_SOURCES = \
unavailable_repository.cc \
unavailable_id.cc \
unavailable_mask.cc \
@@ -33,20 +33,20 @@ libpaludisunavailablerepository_la_SOURCES = \
registration.cc \
$(paludis_repositories_unavailable_include_HEADERS)
-libpaludisunavailablerepository_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+libpaludisunavailablerepository_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
unavailable_repository_TEST_SOURCES = unavailable_repository_TEST.cc
unavailable_repository_TEST_LDADD = \
- libpaludisunavailablerepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisunavailablerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
diff --git a/paludis/repositories/unpackaged/Makefile.am b/paludis/repositories/unpackaged/Makefile.am
index 3bf0cf7..81ecb97 100644
--- a/paludis/repositories/unpackaged/Makefile.am
+++ b/paludis/repositories/unpackaged/Makefile.am
@@ -13,10 +13,10 @@ DEFS= \
-DLIBDIR=\"$(libdir)\"
paludis_repositories_libdir = $(libdir)/paludis/repositories
-paludis_repositories_lib_LTLIBRARIES = libpaludisunpackagedrepository.la
+paludis_repositories_lib_LTLIBRARIES = libpaludisunpackagedrepository_@PALUDIS_PC_SLOT@.la
paludis_repositories_unpackaged_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/unpackaged/
-libpaludisunpackagedrepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisunpackagedrepository_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_repositories_unpackaged_include_HEADERS = \
dep_parser.hh \
@@ -30,7 +30,7 @@ paludis_repositories_unpackaged_include_HEADERS = \
installed_repository-sr.hh \
installed_id.hh
-libpaludisunpackagedrepository_la_SOURCES = \
+libpaludisunpackagedrepository_@PALUDIS_PC_SLOT@_la_SOURCES = \
dep_parser.cc \
dep_printer.cc \
exceptions.cc \
@@ -43,41 +43,41 @@ libpaludisunpackagedrepository_la_SOURCES = \
registration.cc \
$(paludis_repositories_unpackaged_include_HEADERS)
-libpaludisunpackagedrepository_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+libpaludisunpackagedrepository_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
unpackaged_repository_TEST_SOURCES = unpackaged_repository_TEST.cc
unpackaged_repository_TEST_LDADD = \
- libpaludisunpackagedrepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisunpackagedrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
installed_repository_TEST_SOURCES = installed_repository_TEST.cc
installed_repository_TEST_LDADD = \
- libpaludisunpackagedrepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisunpackagedrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
dep_parser_TEST_SOURCES = dep_parser_TEST.cc
dep_parser_TEST_LDADD = \
- libpaludisunpackagedrepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisunpackagedrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
diff --git a/paludis/repositories/virtuals/Makefile.am b/paludis/repositories/virtuals/Makefile.am
index 189e022..c9b6cc9 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -13,23 +13,23 @@ paludis_repositories_libdir = $(libdir)/paludis/repositories
if MONOLITHIC
-noinst_LTLIBRARIES = libpaludisvirtualsrepository.la
+noinst_LTLIBRARIES = libpaludisvirtualsrepository_@PALUDIS_PC_SLOT@.la
else
-paludis_repositories_lib_LTLIBRARIES = libpaludisvirtualsrepository.la
+paludis_repositories_lib_LTLIBRARIES = libpaludisvirtualsrepository_@PALUDIS_PC_SLOT@.la
endif
paludis_repositories_virtuals_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/virtuals/
-libpaludisvirtualsrepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisvirtualsrepository_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_repositories_virtuals_include_HEADERS = \
virtuals_repository.hh \
installed_virtuals_repository.hh \
package_id.hh
-libpaludisvirtualsrepository_la_SOURCES = \
+libpaludisvirtualsrepository_@PALUDIS_PC_SLOT@_la_SOURCES = \
virtuals_repository.cc \
installed_virtuals_repository.cc \
package_id.cc \
@@ -38,9 +38,9 @@ libpaludisvirtualsrepository_la_SOURCES = \
if ! MONOLITHIC
-libpaludisvirtualsrepository_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+libpaludisvirtualsrepository_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
endif
@@ -66,21 +66,21 @@ TESTS_ENVIRONMENT = env \
bash $(top_srcdir)/test/run_test.sh
virtuals_repository_TEST_LDADD = \
- libpaludisvirtualsrepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisvirtualsrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
installed_virtuals_repository_TEST_LDADD = \
- libpaludisvirtualsrepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludisvirtualsrepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
virtuals_repository_TEST_SOURCES = \
@@ -99,3 +99,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/paludis/selinux/Makefile.am b/paludis/selinux/Makefile.am
index 2a0ebf4..f46c9a4 100644
--- a/paludis/selinux/Makefile.am
+++ b/paludis/selinux/Makefile.am
@@ -7,27 +7,27 @@ paludis_selinux_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/se
paludis_selinux_include_HEADERS = \
security_context.hh
-libpaludisselinux_la_SOURCES = \
+libpaludisselinux_@PALUDIS_PC_SLOT@_la_SOURCES = \
$(paludis_selinux_include_HEADERS) \
security_context.cc
if ! MONOLITHIC
-libpaludisselinux_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+libpaludisselinux_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
@DYNAMIC_LD_LIBS@
endif
-libpaludisselinux_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisselinux_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
if MONOLITHIC
-noinst_LTLIBRARIES = libpaludisselinux.la
+noinst_LTLIBRARIES = libpaludisselinux_@PALUDIS_PC_SLOT@.la
else
-lib_LTLIBRARIES = libpaludisselinux.la
+lib_LTLIBRARIES = libpaludisselinux_@PALUDIS_PC_SLOT@.la
endif
@@ -41,7 +41,7 @@ AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-DISTCHECK_DEPS = libpaludisselinux.la
+DISTCHECK_DEPS = libpaludisselinux_@PALUDIS_PC_SLOT@.la
distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index 12cf57e..5d4e7cd 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -18,7 +18,7 @@ $1_TEST_SOURCES = $1_TEST.cc
$1_TEST_LDADD = \
test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludisutil.la
+ libpaludisutil_@PALUDIS_PC_SLOT@.la
$1_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS)
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
@@ -78,9 +78,9 @@ EXTRA_DIST = util.hh.m4 Makefile.am.m4 files.m4 srlist srcleanlist selist seclea
echo_functions.bash.in
SUBDIRS = .
-libpaludisutil_la_SOURCES = filelist
-libpaludisutil_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 $(PTHREAD_LIBS)
-libpaludisutil_la_LIBADD = $(PTHREAD_LIBS)
+libpaludisutil_@PALUDIS_PC_SLOT@_la_SOURCES = filelist
+libpaludisutil_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 $(PTHREAD_LIBS)
+libpaludisutil_@PALUDIS_PC_SLOT@_la_LIBADD = $(PTHREAD_LIBS)
TESTS = testlist
@@ -92,7 +92,7 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
-lib_LTLIBRARIES = libpaludisutil.la
+lib_LTLIBRARIES = libpaludisutil_@PALUDIS_PC_SLOT@.la
paludis_util_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/util/
paludis_util_include_HEADERS = headerlist srheaderlist seheaderlist
@@ -115,7 +115,7 @@ changequote(`<', `>')
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-DISTCHECK_DEPS = libpaludisutil.la
+DISTCHECK_DEPS = libpaludisutil_@PALUDIS_PC_SLOT@.la
distcheck-deps-local : $(DISTCHECK_DEPS)
@@ -124,3 +124,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/python/Makefile.am b/python/Makefile.am
index dd3201a..994cdab 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -139,18 +139,18 @@ TESTS_ENVIRONMENT = env \
if ENABLE_PYTHON
-lib_LTLIBRARIES = libpaludispython.la
+lib_LTLIBRARIES = libpaludispython_@PALUDIS_PC_SLOT@.la
-libpaludispython_la_CXXFLAGS = $(AM_CXXFLAGS) -I. -I@PYTHON_INCLUDE_DIR@
-libpaludispython_la_LDFLAGS = \
+libpaludispython_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) -I. -I@PYTHON_INCLUDE_DIR@
+libpaludispython_@PALUDIS_PC_SLOT@_la_LDFLAGS = \
@BOOST_PYTHON_LIB@ \
-version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 \
$(PTHREAD_LIBS)
-check_LTLIBRARIES = libadditionaltests.la
+check_LTLIBRARIES = libadditionaltests_@PALUDIS_PC_SLOT@.la
-libadditionaltests_la_CXXFLAGS = $(AM_CXXFLAGS) -I. -I@PYTHON_INCLUDE_DIR@
-libadditionaltests_la_LDFLAGS = @BOOST_PYTHON_LIB@ -rpath /nowhere
+libadditionaltests_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) -I. -I@PYTHON_INCLUDE_DIR@
+libadditionaltests_@PALUDIS_PC_SLOT@_la_LDFLAGS = @BOOST_PYTHON_LIB@ -rpath /nowhere
paludis_python_so.o : paludis_python_so.cc
if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -164,34 +164,34 @@ additional_tests_so.o : additional_tests_so.cc
if ENABLE_QA
-libpaludispython_la_SOURCES = $(IF_PYTHON_SOURCES) $(IF_PYTHON_QA_SOURCES)
+libpaludispython_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_PYTHON_SOURCES) $(IF_PYTHON_QA_SOURCES)
TESTS = $(IF_PYTHON_TESTS) $(IF_PYTHON_QA_TESTS)
else
-libpaludispython_la_SOURCES = $(IF_PYTHON_SOURCES)
+libpaludispython_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_PYTHON_SOURCES)
TESTS = $(IF_PYTHON_TESTS)
endif
-libpaludispython_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/environments/paludis/libpaludispaludisenvironment.la \
- $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
- $(top_builddir)/paludis/environments/adapted/libpaludisadaptedenvironment.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la
+libpaludispython_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/paludis/libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/adapted/libpaludisadaptedenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la
-libadditionaltests_la_SOURCES = additional_tests.hh additional_tests.cc
-libadditionaltests_la_LIBADD = $(libpaludispython_la_LIBADD)
+libadditionaltests_@PALUDIS_PC_SLOT@_la_SOURCES = additional_tests.hh additional_tests.cc
+libadditionaltests_@PALUDIS_PC_SLOT@_la_LIBADD = $(libpaludispython_@PALUDIS_PC_SLOT@_la_LIBADD)
check_DATA = .libs/paludis.so .libs/additional_tests.so
pythonlibdir = @PYTHON_INSTALL_DIR@
pythonlib_DATA = paludis.so paludis_output_wrapper.py
-.libs/paludis.so : libpaludispython.la paludis_python_so.o
+.libs/paludis.so : libpaludispython_@PALUDIS_PC_SLOT@.la paludis_python_so.o
mkdir -p .libs
$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
@@ -199,25 +199,25 @@ pythonlib_DATA = paludis.so paludis_output_wrapper.py
-I@PYTHON_INCLUDE_DIR@ @BOOST_PYTHON_LIB@ $(PTHREAD_LIBS) \
-o $@ \
.libs/paludis_python_so.o \
- -L$(top_builddir)/python/.libs -lpaludispython
+ -L$(top_builddir)/python/.libs -lpaludispython_@PALUDIS_PC_SLOT@
-paludis.so : libpaludispython.la paludis_python_so.o
+paludis.so : libpaludispython_@PALUDIS_PC_SLOT@.la paludis_python_so.o
$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) \
-I@PYTHON_INCLUDE_DIR@ @BOOST_PYTHON_LIB@ $(PTHREAD_LIBS) \
-o $@ \
.libs/paludis_python_so.o \
- -L$(top_builddir)/python/.libs -lpaludispython
+ -L$(top_builddir)/python/.libs -lpaludispython_@PALUDIS_PC_SLOT@
-.libs/additional_tests.so : libadditionaltests.la additional_tests_so.o
+.libs/additional_tests.so : libadditionaltests_@PALUDIS_PC_SLOT@.la additional_tests_so.o
$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) \
-I@PYTHON_INCLUDE_DIR@ @BOOST_PYTHON_LIB@ $(PTHREAD_LIBS) \
-o $@ \
.libs/additional_tests_so.o \
- -L$(top_builddir)/python/.libs -ladditionaltests
+ -L$(top_builddir)/python/.libs -ladditionaltests_@PALUDIS_PC_SLOT@
endif
@@ -237,3 +237,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 89639c0..99c17ac 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -122,10 +122,10 @@ TESTS_ENVIRONMENT = env \
if ENABLE_RUBY
-lib_LTLIBRARIES = libpaludisruby.la
+lib_LTLIBRARIES = libpaludisruby_@PALUDIS_PC_SLOT@.la
-libpaludisruby_la_CXXFLAGS = $(AM_CXXFLAGS) -I. -I@RUBY_SITEARCHDIR@ -I@RUBY_ARCHDIR@
-libpaludisruby_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisruby_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) -I. -I@RUBY_SITEARCHDIR@ -I@RUBY_ARCHDIR@
+libpaludisruby_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_ruby_so.o : paludis_ruby_so.cc
if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -134,29 +134,29 @@ paludis_ruby_so.o : paludis_ruby_so.cc
if ENABLE_QA
-libpaludisruby_la_SOURCES = $(IF_RUBY_SOURCES) $(IF_RUBY_QA_SOURCES)
+libpaludisruby_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_RUBY_SOURCES) $(IF_RUBY_QA_SOURCES)
TESTS = $(IF_RUBY_TESTS) $(IF_RUBY_QA_TESTS)
else
-libpaludisruby_la_SOURCES = $(IF_RUBY_SOURCES)
+libpaludisruby_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_RUBY_SOURCES)
TESTS = $(IF_RUBY_TESTS)
endif
-libpaludisruby_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environments/paludis/libpaludispaludisenvironment.la \
- $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
- $(top_builddir)/paludis/environments/adapted/libpaludisadaptedenvironment.la \
+libpaludisruby_@PALUDIS_PC_SLOT@_la_LIBADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/paludis/libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/adapted/libpaludisadaptedenvironment_@PALUDIS_PC_SLOT@.la \
$(PTHREAD_LIBS)
check_DATA = .libs/Paludis.so
rubylibdir = @RUBY_INSTALL_DIR@
rubylib_DATA = Paludis.so
-.libs/Paludis.so : libpaludisruby.la paludis_ruby_so.o
+.libs/Paludis.so : libpaludisruby_@PALUDIS_PC_SLOT@.la paludis_ruby_so.o
mkdir -p .libs
$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
@@ -164,16 +164,16 @@ rubylib_DATA = Paludis.so
-I@RUBY_SITEARCHDIR@ -l@RUBY_SONAME@ \
-o $@ \
.libs/paludis_ruby_so.o \
- -L$(top_builddir)/ruby/.libs -lpaludisruby
+ -L$(top_builddir)/ruby/.libs -lpaludisruby_@PALUDIS_PC_SLOT@
-Paludis.so : libpaludisruby.la paludis_ruby_so.o
+Paludis.so : libpaludisruby_@PALUDIS_PC_SLOT@.la paludis_ruby_so.o
$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) $(PTHREAD_LIBS) \
-I@RUBY_SITEARCHDIR@ -l@RUBY_SONAME@ \
-o $@ \
.libs/paludis_ruby_so.o \
- -L$(top_builddir)/ruby/.libs -lpaludisruby
+ -L$(top_builddir)/ruby/.libs -lpaludisruby_@PALUDIS_PC_SLOT@
endif
@@ -193,3 +193,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/src/clients/accerso/Makefile.am b/src/clients/accerso/Makefile.am
index 68d24e5..58c01b8 100644
--- a/src/clients/accerso/Makefile.am
+++ b/src/clients/accerso/Makefile.am
@@ -21,10 +21,10 @@ man_accerso_SOURCES = \
command_line.cc
man_accerso_LDADD = \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/args/libpaludisman.a \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludismanpagethings.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -33,10 +33,10 @@ accerso_SOURCES = \
accerso.cc
accerso_LDADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -83,3 +83,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/src/clients/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am
index 95fd090..ed8c751 100644
--- a/src/clients/adjutrix/Makefile.am
+++ b/src/clients/adjutrix/Makefile.am
@@ -21,10 +21,10 @@ man_adjutrix_SOURCES = \
command_line.cc
man_adjutrix_LDADD = \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/args/libpaludisman.a \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludismanpagethings.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -42,12 +42,12 @@ adjutrix_SOURCES = \
adjutrix.cc
adjutrix_LDADD = \
- $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
- $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/selinux/libpaludisselinux.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/selinux/libpaludisselinux_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -119,3 +119,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/src/clients/contrarius/Makefile.am b/src/clients/contrarius/Makefile.am
index ee95776..6a1a7b4 100644
--- a/src/clients/contrarius/Makefile.am
+++ b/src/clients/contrarius/Makefile.am
@@ -28,10 +28,10 @@ contrarius_SOURCES = \
target_config.cc
contrarius_LDADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environments/adapted/libpaludisadaptedenvironment.la \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/adapted/libpaludisadaptedenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -68,9 +68,9 @@ man_contrarius_SOURCES = \
command_line.cc
man_contrarius_LDADD = \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/args/libpaludisman.a \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -100,3 +100,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/src/clients/gtkpaludis/Makefile.am b/src/clients/gtkpaludis/Makefile.am
index 649942e..a62708f 100644
--- a/src/clients/gtkpaludis/Makefile.am
+++ b/src/clients/gtkpaludis/Makefile.am
@@ -17,8 +17,8 @@ gtkpaludis_SOURCES = \
gtkpaludis_LDADD = \
libgtkpaludis/libgtkpaludis.a \
vtemm/libvtemm.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(gtkmm_LIBS) $(gthread_LIBS) $(vte_LIBS)
built-sources : $(BUILT_SOURCES)
@@ -31,3 +31,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/src/clients/importare/Makefile.am b/src/clients/importare/Makefile.am
index 6646013..5131613 100644
--- a/src/clients/importare/Makefile.am
+++ b/src/clients/importare/Makefile.am
@@ -16,10 +16,10 @@ man_importare_SOURCES = \
command_line.cc
man_importare_LDADD = \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/args/libpaludisman.a \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludismanpagethings.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -29,9 +29,9 @@ importare_SOURCES = \
importare.cc
importare_LDADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -76,3 +76,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/src/clients/inquisitio/Makefile.am b/src/clients/inquisitio/Makefile.am
index bb7b41f..5099824 100644
--- a/src/clients/inquisitio/Makefile.am
+++ b/src/clients/inquisitio/Makefile.am
@@ -19,10 +19,10 @@ man_inquisitio_SOURCES = \
command_line.hh command_line.cc
man_inquisitio_LDADD = \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/args/libpaludisman.a \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludismanpagethings.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS) \
$(PCREPLUSPLUS_LIBS)
@@ -41,9 +41,9 @@ inquisitio_SOURCES = \
inquisitio.cc
inquisitio_LDADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS) \
$(PCREPLUSPLUS_LIBS)
diff --git a/src/clients/instruo/Makefile.am b/src/clients/instruo/Makefile.am
index 91ba7a9..1bda009 100644
--- a/src/clients/instruo/Makefile.am
+++ b/src/clients/instruo/Makefile.am
@@ -21,10 +21,10 @@ man_instruo_SOURCES = \
command_line.cc
man_instruo_LDADD = \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/args/libpaludisman.a \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludismanpagethings.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -33,10 +33,10 @@ instruo_SOURCES = \
instruo.cc
instruo_LDADD = \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -82,3 +82,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index 53d0f75..b3a87c2 100644
--- a/src/clients/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -23,10 +23,10 @@ man_paludis_SOURCES = \
command_line.cc
man_paludis_LDADD = \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/args/libpaludisman.a \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludismanpagethings.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -47,9 +47,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_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -103,3 +103,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/src/clients/qualudis/Makefile.am b/src/clients/qualudis/Makefile.am
index cd14f73..e8ef47f 100644
--- a/src/clients/qualudis/Makefile.am
+++ b/src/clients/qualudis/Makefile.am
@@ -18,11 +18,11 @@ qualudis_SOURCES = \
qualudis.cc
qualudis_LDADD = \
- $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/selinux/libpaludisselinux.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/selinux/libpaludisselinux_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(PCREPLUSPLUS_LIBS) \
$(LIBXML2DEPS_LIBS) \
@@ -53,10 +53,10 @@ man_qualudis_SOURCES = \
qualudis_command_line.cc
man_qualudis_LDADD = \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/args/libpaludisman.a \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludismanpagethings.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
diff --git a/src/clients/reconcilio/Makefile.am b/src/clients/reconcilio/Makefile.am
index a8be955..b3ad400 100644
--- a/src/clients/reconcilio/Makefile.am
+++ b/src/clients/reconcilio/Makefile.am
@@ -16,10 +16,10 @@ man_reconcilio_SOURCES = \
command_line.cc
man_reconcilio_LDADD = \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/args/libpaludisman.a \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludismanpagethings.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -35,9 +35,9 @@ reconcilio_LDADD = \
broken_linkage_finder/libbrokenlinkagefinder.a \
littlelf/liblittlelf.a \
util/libreconcilioutil.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -47,9 +47,9 @@ reconcilio_LDADD = \
broken_linkage_finder/libbrokenlinkagefinder.a \
littlelf/liblittlelf.a \
util/libreconcilioutil.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
@@ -96,3 +96,4 @@ distcheck-deps : distcheck-deps-subdirs
distcheck-deps-subdirs :
for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) distcheck-deps-local || exit 1 ; \
else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
+
diff --git a/src/clients/reconcilio/broken_linkage_finder/Makefile.am b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
index 4308c18..81eadda 100644
--- a/src/clients/reconcilio/broken_linkage_finder/Makefile.am
+++ b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
@@ -27,8 +27,8 @@ configuration_TEST_LDADD = \
libbrokenlinkagefinder.a \
../util/libreconcilioutil.a \
$(top_builddir)/src/clients/reconcilio/littlelf/liblittlelf.a \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a
diff --git a/src/clients/reconcilio/util/Makefile.am b/src/clients/reconcilio/util/Makefile.am
index acedf20..453edab 100644
--- a/src/clients/reconcilio/util/Makefile.am
+++ b/src/clients/reconcilio/util/Makefile.am
@@ -23,14 +23,14 @@ EXTRA_DIST = \
realpath_TEST_SOURCES = realpath_TEST.cc
realpath_TEST_LDADD = \
libreconcilioutil.a \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a
wildcard_expander_TEST_SOURCES = wildcard_expander_TEST.cc
wildcard_expander_TEST_LDADD = \
libreconcilioutil.a \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a