aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-23 16:23:16 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-23 16:23:43 +0000
commit21e8e56a7cb657ced234c0eb0bba3253c8f02616 (patch)
tree3ae23e3bf844b255600ecab8d2b5bc4fe4ae4a7b
parent3dec9c48b1e0c0b79bdeb0afe4e4e8e8362cef88 (diff)
downloadpaludis-21e8e56a7cb657ced234c0eb0bba3253c8f02616.tar.gz
paludis-21e8e56a7cb657ced234c0eb0bba3253c8f02616.tar.xz
Move broken_linkage_finder to paludis/
-rw-r--r--.gitignore2
-rw-r--r--configure.ac1
-rw-r--r--paludis/broken_linkage_configuration.cc (renamed from src/clients/reconcilio/broken_linkage_finder/configuration.cc)46
-rw-r--r--paludis/broken_linkage_configuration.hh (renamed from src/clients/reconcilio/broken_linkage_finder/configuration.hh)23
-rw-r--r--paludis/broken_linkage_configuration_TEST.cc (renamed from src/clients/reconcilio/broken_linkage_finder/configuration_TEST.cc)7
-rwxr-xr-xpaludis/broken_linkage_configuration_TEST_cleanup.sh11
-rwxr-xr-xpaludis/broken_linkage_configuration_TEST_setup.sh (renamed from src/clients/reconcilio/broken_linkage_finder/configuration_TEST_setup.sh)4
-rw-r--r--paludis/broken_linkage_finder.cc (renamed from src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc)13
-rw-r--r--paludis/broken_linkage_finder.hh70
-rw-r--r--paludis/elf_linkage_checker.cc (renamed from src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc)1
-rw-r--r--paludis/elf_linkage_checker.hh (renamed from src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.hh)9
-rw-r--r--paludis/files.m45
-rw-r--r--paludis/libtool_linkage_checker.cc (renamed from src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc)3
-rw-r--r--paludis/libtool_linkage_checker.hh (renamed from src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.hh)9
-rw-r--r--paludis/linkage_checker.cc (renamed from src/clients/reconcilio/broken_linkage_finder/linkage_checker.cc)4
-rw-r--r--paludis/linkage_checker.hh (renamed from src/clients/reconcilio/broken_linkage_finder/linkage_checker.hh)9
-rw-r--r--src/clients/reconcilio/Makefile.am3
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.hh67
-rwxr-xr-xsrc/clients/reconcilio/broken_linkage_finder/configuration_TEST_cleanup.sh11
-rw-r--r--src/clients/reconcilio/fix_linkage.cc3
20 files changed, 146 insertions, 155 deletions
diff --git a/.gitignore b/.gitignore
index 781e3a0..de4d932 100644
--- a/.gitignore
+++ b/.gitignore
@@ -189,6 +189,7 @@ paludis-*.*.*.tar.bz2
/paludis/about.hh
/paludis/about_TEST
/paludis/args/args_TEST
+/paludis/broken_linkage_configuration_TEST
/paludis/dep_list_TEST
/paludis/dep_list_TEST_blockers
/paludis/dep_spec_TEST
@@ -445,7 +446,6 @@ paludis-*.*.*.tar.bz2
/src/clients/inquisitio/inquisitio
/src/clients/instruo/instruo
/src/clients/paludis/paludis
-/src/clients/reconcilio/broken_linkage_finder/configuration_TEST
/src/clients/reconcilio/reconcilio
/stamp-h1
/test/test_fail_TEST
diff --git a/configure.ac b/configure.ac
index 673ed02..c7e5143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1646,7 +1646,6 @@ AC_OUTPUT(
src/clients/instruo/Makefile
src/clients/paludis/Makefile
src/clients/reconcilio/Makefile
- src/clients/reconcilio/broken_linkage_finder/Makefile
src/output/Makefile
test/Makefile
vim/Makefile
diff --git a/src/clients/reconcilio/broken_linkage_finder/configuration.cc b/paludis/broken_linkage_configuration.cc
index e11f1ad..014b928 100644
--- a/src/clients/reconcilio/broken_linkage_finder/configuration.cc
+++ b/paludis/broken_linkage_configuration.cc
@@ -17,8 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "configuration.hh"
-
+#include <paludis/broken_linkage_configuration.hh>
#include <paludis/util/realpath.hh>
#include <paludis/util/wildcard_expander.hh>
#include <paludis/util/config_file.hh>
@@ -38,12 +37,11 @@
#include <vector>
using namespace paludis;
-using namespace broken_linkage_finder;
namespace paludis
{
template <>
- struct Implementation<Configuration>
+ struct Implementation<BrokenLinkageConfiguration>
{
std::vector<std::string> ld_library_mask;
std::vector<FSEntry> search_dirs;
@@ -58,7 +56,7 @@ namespace paludis
};
template <>
- struct WrappedForwardIteratorTraits<Configuration::DirsIteratorTag>
+ struct WrappedForwardIteratorTraits<BrokenLinkageConfiguration::DirsIteratorTag>
{
typedef std::vector<FSEntry>::const_iterator UnderlyingIterator;
};
@@ -138,8 +136,8 @@ namespace
}
}
-Configuration::Configuration(const FSEntry & root) :
- PrivateImplementationPattern<Configuration>(new Implementation<Configuration>)
+BrokenLinkageConfiguration::BrokenLinkageConfiguration(const FSEntry & root) :
+ PrivateImplementationPattern<BrokenLinkageConfiguration>(new Implementation<BrokenLinkageConfiguration>)
{
Context ctx("When loading broken linkage checker configuration for '" + stringify(root) + "':");
@@ -162,12 +160,12 @@ Configuration::Configuration(const FSEntry & root) :
join(_imp->ld_so_conf.begin(), _imp->ld_so_conf.end(), " ") << "\"";
}
-Configuration::~Configuration()
+BrokenLinkageConfiguration::~BrokenLinkageConfiguration()
{
}
void
-Implementation<Configuration>::load_from_environment()
+Implementation<BrokenLinkageConfiguration>::load_from_environment()
{
using namespace std::tr1::placeholders;
@@ -182,7 +180,7 @@ Implementation<Configuration>::load_from_environment()
}
void
-Implementation<Configuration>::load_from_etc_revdep_rebuild(const FSEntry & root)
+Implementation<BrokenLinkageConfiguration>::load_from_etc_revdep_rebuild(const FSEntry & root)
{
using namespace std::tr1::placeholders;
@@ -230,7 +228,7 @@ Implementation<Configuration>::load_from_etc_revdep_rebuild(const FSEntry & root
}
void
-Implementation<Configuration>::load_from_etc_profile_env(const FSEntry & root)
+Implementation<BrokenLinkageConfiguration>::load_from_etc_profile_env(const FSEntry & root)
{
using namespace std::tr1::placeholders;
@@ -259,7 +257,7 @@ Implementation<Configuration>::load_from_etc_profile_env(const FSEntry & root)
}
void
-Implementation<Configuration>::load_from_etc_ld_so_conf(const FSEntry & root)
+Implementation<BrokenLinkageConfiguration>::load_from_etc_ld_so_conf(const FSEntry & root)
{
FSEntry etc_ld_so_conf(root / "etc" / "ld.so.conf");
Context ctx("When reading '" + stringify(etc_ld_so_conf) + "':");
@@ -284,7 +282,7 @@ Implementation<Configuration>::load_from_etc_ld_so_conf(const FSEntry & root)
}
void
-Implementation<Configuration>::add_defaults()
+Implementation<BrokenLinkageConfiguration>::add_defaults()
{
Context ctx("When adding default settings:");
@@ -317,41 +315,41 @@ Implementation<Configuration>::add_defaults()
default_ld_so_conf, std::back_inserter(ld_so_conf));
}
-Configuration::DirsIterator
-Configuration::begin_search_dirs() const
+BrokenLinkageConfiguration::DirsIterator
+BrokenLinkageConfiguration::begin_search_dirs() const
{
return DirsIterator(_imp->search_dirs.begin());
}
-Configuration::DirsIterator
-Configuration::end_search_dirs() const
+BrokenLinkageConfiguration::DirsIterator
+BrokenLinkageConfiguration::end_search_dirs() const
{
return DirsIterator(_imp->search_dirs.end());
}
-Configuration::DirsIterator
-Configuration::begin_ld_so_conf() const
+BrokenLinkageConfiguration::DirsIterator
+BrokenLinkageConfiguration::begin_ld_so_conf() const
{
return DirsIterator(_imp->ld_so_conf.begin());
}
-Configuration::DirsIterator
-Configuration::end_ld_so_conf() const
+BrokenLinkageConfiguration::DirsIterator
+BrokenLinkageConfiguration::end_ld_so_conf() const
{
return DirsIterator(_imp->ld_so_conf.end());
}
bool
-Configuration::dir_is_masked(const FSEntry & dir) const
+BrokenLinkageConfiguration::dir_is_masked(const FSEntry & dir) const
{
return std::binary_search(_imp->search_dirs_mask.begin(), _imp->search_dirs_mask.end(), dir);
}
bool
-Configuration::lib_is_masked(const std::string & lib) const
+BrokenLinkageConfiguration::lib_is_masked(const std::string & lib) const
{
return std::binary_search(_imp->ld_library_mask.begin(), _imp->ld_library_mask.end(), lib);
}
-template class WrappedForwardIterator<Configuration::DirsIteratorTag, const paludis::FSEntry>;
+template class WrappedForwardIterator<BrokenLinkageConfiguration::DirsIteratorTag, const paludis::FSEntry>;
diff --git a/src/clients/reconcilio/broken_linkage_finder/configuration.hh b/paludis/broken_linkage_configuration.hh
index c8bd7ef..97d4d43 100644
--- a/src/clients/reconcilio/broken_linkage_finder/configuration.hh
+++ b/paludis/broken_linkage_configuration.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_RECONCILIO_BROKEN_LINKAGE_FINDER_CONFIGURATION_HH
-#define PALUDIS_GUARD_RECONCILIO_BROKEN_LINKAGE_FINDER_CONFIGURATION_HH
+#ifndef PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_CONFIGURATION_HH
+#define PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_CONFIGURATION_HH 1
#include <paludis/util/attributes.hh>
#include <paludis/util/fs_entry-fwd.hh>
@@ -28,15 +28,15 @@
#include <string>
-namespace broken_linkage_finder
+namespace paludis
{
- class Configuration :
- private paludis::PrivateImplementationPattern<Configuration>,
- private paludis::InstantiationPolicy<Configuration, paludis::instantiation_method::NonCopyableTag>
+ class PALUDIS_VISIBLE BrokenLinkageConfiguration :
+ private paludis::PrivateImplementationPattern<BrokenLinkageConfiguration>,
+ private paludis::InstantiationPolicy<BrokenLinkageConfiguration, paludis::instantiation_method::NonCopyableTag>
{
public:
- Configuration(const paludis::FSEntry &);
- ~Configuration();
+ BrokenLinkageConfiguration(const paludis::FSEntry &);
+ ~BrokenLinkageConfiguration();
struct DirsIteratorTag;
typedef paludis::WrappedForwardIterator<DirsIteratorTag, const paludis::FSEntry> DirsIterator;
@@ -48,14 +48,11 @@ namespace broken_linkage_finder
bool dir_is_masked(const paludis::FSEntry &) const PALUDIS_ATTRIBUTE((warn_unused_result));
bool lib_is_masked(const std::string &) const PALUDIS_ATTRIBUTE((warn_unused_result));
};
-}
#ifdef PALUDIS_HAVE_EXTERN_TEMPLATE
-namespace paludis
-{
- extern template class WrappedForwardIterator<broken_linkage_finder::Configuration::DirsIteratorTag, const FSEntry>;
-}
+ extern template class WrappedForwardIterator<BrokenLinkageConfiguration::DirsIteratorTag, const FSEntry>;
#endif
+}
#endif
diff --git a/src/clients/reconcilio/broken_linkage_finder/configuration_TEST.cc b/paludis/broken_linkage_configuration_TEST.cc
index 8f65a32..29373cb 100644
--- a/src/clients/reconcilio/broken_linkage_finder/configuration_TEST.cc
+++ b/paludis/broken_linkage_configuration_TEST.cc
@@ -17,8 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "configuration.hh"
-
+#include <paludis/broken_linkage_configuration.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/join.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -29,8 +28,6 @@
#include <unistd.h>
#include <cstdlib>
-using namespace broken_linkage_finder;
-
using namespace test;
using namespace paludis;
@@ -46,7 +43,7 @@ namespace test_cases
setenv("SEARCH_DIRS_MASK", "/quuxlib/quux", 1);
setenv("LD_LIBRARY_MASK", "libquux.so", 1);
- Configuration config(FSEntry::cwd() / "configuration_TEST_dir");
+ BrokenLinkageConfiguration config(FSEntry::cwd() / "broken_linkage_configuration_TEST_dir");
TEST_CHECK_EQUAL(join(config.begin_search_dirs(), config.end_search_dirs(), " "),
"/alib /barbin /barlib/foo /bazbin /bin /blib /foobin /foolib/bar /lib32 /lib64 /quuxlib /sbin /usr/bin /usr/lib* /usr/sbin");
diff --git a/paludis/broken_linkage_configuration_TEST_cleanup.sh b/paludis/broken_linkage_configuration_TEST_cleanup.sh
new file mode 100755
index 0000000..ac3cfe9
--- /dev/null
+++ b/paludis/broken_linkage_configuration_TEST_cleanup.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# vim: set ft=sh sw=4 sts=4 et :
+
+if [ -d broken_linkage_configuration_TEST_dir ] ; then
+ rm -fr broken_linkage_configuration_TEST_dir
+else
+ true
+fi
+
+
+
diff --git a/src/clients/reconcilio/broken_linkage_finder/configuration_TEST_setup.sh b/paludis/broken_linkage_configuration_TEST_setup.sh
index 59a952b..9655911 100755
--- a/src/clients/reconcilio/broken_linkage_finder/configuration_TEST_setup.sh
+++ b/paludis/broken_linkage_configuration_TEST_setup.sh
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# vim: set ft=sh sw=4 sts=4 et :
-mkdir configuration_TEST_dir || exit 1
-cd configuration_TEST_dir || exit 1
+mkdir broken_linkage_configuration_TEST_dir || exit 1
+cd broken_linkage_configuration_TEST_dir || exit 1
mkdir -p etc/revdep-rebuild
diff --git a/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc b/paludis/broken_linkage_finder.cc
index bb8a502..613efc0 100644
--- a/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc
+++ b/paludis/broken_linkage_finder.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "broken_linkage_finder.hh"
-#include "configuration.hh"
-#include "elf_linkage_checker.hh"
-#include "libtool_linkage_checker.hh"
-#include "linkage_checker.hh"
+#include <paludis/broken_linkage_finder.hh>
+#include <paludis/broken_linkage_configuration.hh>
+#include <paludis/elf_linkage_checker.hh>
+#include <paludis/libtool_linkage_checker.hh>
+#include <paludis/linkage_checker.hh>
#include <paludis/util/realpath.hh>
#include <paludis/util/fs_entry.hh>
@@ -54,7 +54,6 @@
#include <vector>
using namespace paludis;
-using namespace broken_linkage_finder;
typedef std::multimap<FSEntry, std::tr1::shared_ptr<const PackageID> > Files;
typedef std::map<FSEntry, std::set<std::string> > PackageBreakage;
@@ -66,7 +65,7 @@ namespace paludis
struct Implementation<BrokenLinkageFinder>
{
const Environment * env;
- const Configuration config;
+ const BrokenLinkageConfiguration config;
std::string library;
std::vector<std::tr1::shared_ptr<LinkageChecker> > checkers;
diff --git a/paludis/broken_linkage_finder.hh b/paludis/broken_linkage_finder.hh
new file mode 100644
index 0000000..8e42416
--- /dev/null
+++ b/paludis/broken_linkage_finder.hh
@@ -0,0 +1,70 @@
+/* vim: set sw=4 sts=4 et foldmethod=syntax : */
+
+/*
+ * Copyright (c) 2007 David Leverton
+ *
+ * This file is part of the Paludis package manager. Paludis is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU General
+ * Public License version 2, as published by the Free Software Foundation.
+ *
+ * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_FINDER_HH
+#define PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_FINDER_HH
+
+#include <paludis/util/attributes.hh>
+#include <paludis/util/fs_entry-fwd.hh>
+#include <paludis/util/instantiation_policy.hh>
+#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/wrapped_forward_iterator-fwd.hh>
+
+#include <paludis/environment-fwd.hh>
+#include <paludis/package_id-fwd.hh>
+
+#include <tr1/memory>
+
+namespace paludis
+{
+ class PALUDIS_VISIBLE BrokenLinkageFinder :
+ private paludis::PrivateImplementationPattern<BrokenLinkageFinder>,
+ private paludis::InstantiationPolicy<BrokenLinkageFinder, paludis::instantiation_method::NonCopyableTag>
+ {
+ public:
+ BrokenLinkageFinder(const paludis::Environment *, const std::string &);
+ ~BrokenLinkageFinder();
+
+ struct BrokenPackageConstIteratorTag;
+ typedef paludis::WrappedForwardIterator<BrokenPackageConstIteratorTag,
+ const std::tr1::shared_ptr<const paludis::PackageID>
+ > BrokenPackageConstIterator;
+ BrokenPackageConstIterator begin_broken_packages() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ BrokenPackageConstIterator end_broken_packages() const PALUDIS_ATTRIBUTE((warn_unused_result));
+
+ struct BrokenFileConstIteratorTag;
+ typedef paludis::WrappedForwardIterator<BrokenFileConstIteratorTag, const paludis::FSEntry> BrokenFileConstIterator;
+ BrokenFileConstIterator begin_broken_files(const std::tr1::shared_ptr<const paludis::PackageID> &)
+ const PALUDIS_ATTRIBUTE((warn_unused_result));
+ BrokenFileConstIterator end_broken_files(const std::tr1::shared_ptr<const paludis::PackageID> &)
+ const PALUDIS_ATTRIBUTE((warn_unused_result));
+
+ struct MissingRequirementConstIteratorTag;
+ typedef paludis::WrappedForwardIterator<MissingRequirementConstIteratorTag, const std::string> MissingRequirementConstIterator;
+ MissingRequirementConstIterator begin_missing_requirements(
+ const std::tr1::shared_ptr<const paludis::PackageID> &, const paludis::FSEntry &)
+ const PALUDIS_ATTRIBUTE((warn_unused_result));
+ MissingRequirementConstIterator end_missing_requirements(
+ const std::tr1::shared_ptr<const paludis::PackageID> &, const paludis::FSEntry &)
+ const PALUDIS_ATTRIBUTE((warn_unused_result));
+ };
+}
+
+#endif
+
diff --git a/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc b/paludis/elf_linkage_checker.cc
index b5eb101..4f1bea5 100644
--- a/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc
+++ b/paludis/elf_linkage_checker.cc
@@ -45,7 +45,6 @@
#include <vector>
using namespace paludis;
-using namespace broken_linkage_finder;
namespace
{
diff --git a/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.hh b/paludis/elf_linkage_checker.hh
index a26987c..13b755c 100644
--- a/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.hh
+++ b/paludis/elf_linkage_checker.hh
@@ -17,16 +17,15 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_RECONCILIO_BROKEN_LINKAGE_FINDER_ELF_LINKAGE_CHECKER_HH
-#define PALUDIS_GUARD_RECONCILIO_BROKEN_LINKAGE_FINDER_ELF_LINKAGE_CHECKER_HH
-
-#include "linkage_checker.hh"
+#ifndef PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_FINDER_ELF_LINKAGE_CHECKER_HH
+#define PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_FINDER_ELF_LINKAGE_CHECKER_HH
+#include <paludis/linkage_checker.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <tr1/functional>
#include <iosfwd>
-namespace broken_linkage_finder
+namespace paludis
{
class ElfLinkageChecker :
public LinkageChecker,
diff --git a/paludis/files.m4 b/paludis/files.m4
index c29b9f1..228bfb0 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -12,6 +12,8 @@ add(`about', `hh', `test')
add(`about_metadata', `hh', `cc', `fwd')
add(`action', `hh', `cc', `fwd', `se')
add(`action_names', `hh', `cc', `fwd')
+add(`broken_linkage_configuration', `hh', `cc', `test', `testscript')
+add(`broken_linkage_finder', `hh', `cc')
add(`buffer_output_manager', `hh', `cc', `fwd')
add(`choice', `hh', `cc', `fwd')
add(`common_sets', `hh', `cc', `fwd')
@@ -25,6 +27,7 @@ add(`dep_spec', `hh', `cc', `test', `fwd', `se')
add(`dep_spec_flattener', `hh', `cc')
add(`dep_tag', `hh', `cc', `fwd')
add(`distribution', `hh', `cc', `impl', `fwd')
+add(`elf_linkage_checker', `hh', `cc')
add(`elike_annotations', `hh', `cc', `fwd')
add(`elike_choices', `hh', `cc', `fwd')
add(`elike_dep_parser', `hh', `cc', `fwd', `test')
@@ -51,6 +54,8 @@ add(`hook', `hh', `cc', `fwd', `se')
add(`hooker', `hh', `cc', `test', `testscript')
add(`install_task', `hh', `cc', `se')
add(`ipc_output_manager', `hh', `cc', `fwd')
+add(`libtool_linkage_checker', `hh', `cc')
+add(`linkage_checker', `hh', `cc')
add(`literal_metadata_key', `hh', `cc')
add(`mask', `hh', `cc', `fwd', `se')
add(`match_package', `hh', `cc', `se', `fwd')
diff --git a/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc b/paludis/libtool_linkage_checker.cc
index 890bd30..13e5d3f 100644
--- a/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc
+++ b/paludis/libtool_linkage_checker.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "libtool_linkage_checker.hh"
+#include <paludis/libtool_linkage_checker.hh>
#include <paludis/util/realpath.hh>
#include <paludis/util/config_file.hh>
@@ -37,7 +37,6 @@
#include <vector>
using namespace paludis;
-using namespace broken_linkage_finder;
typedef std::vector<std::pair<FSEntry, std::string> > Breakage;
diff --git a/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.hh b/paludis/libtool_linkage_checker.hh
index 905a12a..bdcd0ac 100644
--- a/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.hh
+++ b/paludis/libtool_linkage_checker.hh
@@ -17,14 +17,13 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_RECONCILIO_BROKEN_LINKAGE_FINDER_LIBTOOL_LINKAGE_CHECKER_HH
-#define PALUDIS_GUARD_RECONCILIO_BROKEN_LINKAGE_FINDER_LIBTOOL_LINKAGE_CHECKER_HH
-
-#include "linkage_checker.hh"
+#ifndef PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_FINDER_LIBTOOL_LINKAGE_CHECKER_HH
+#define PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_FINDER_LIBTOOL_LINKAGE_CHECKER_HH
+#include <paludis/linkage_checker.hh>
#include <paludis/util/private_implementation_pattern.hh>
-namespace broken_linkage_finder
+namespace paludis
{
class LibtoolLinkageChecker :
public LinkageChecker,
diff --git a/src/clients/reconcilio/broken_linkage_finder/linkage_checker.cc b/paludis/linkage_checker.cc
index 47f5d41..80d1caa 100644
--- a/src/clients/reconcilio/broken_linkage_finder/linkage_checker.cc
+++ b/paludis/linkage_checker.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "linkage_checker.hh"
+#include <paludis/linkage_checker.hh>
-using namespace broken_linkage_finder;
+using namespace paludis;
LinkageChecker::LinkageChecker()
{
diff --git a/src/clients/reconcilio/broken_linkage_finder/linkage_checker.hh b/paludis/linkage_checker.hh
index 8bad408..e2ab485 100644
--- a/src/clients/reconcilio/broken_linkage_finder/linkage_checker.hh
+++ b/paludis/linkage_checker.hh
@@ -17,11 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_RECONCILIO_BROKEN_LINKAGE_FINDER_LINKAGE_CHECKER_HH
-#define PALUDIS_GUARD_RECONCILIO_BROKEN_LINKAGE_FINDER_LINKAGE_CHECKER_HH
-
-#include "broken_linkage_finder.hh"
+#ifndef PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_FINDER_LINKAGE_CHECKER_HH
+#define PALUDIS_GUARD_PALUDIS_BROKEN_LINKAGE_FINDER_LINKAGE_CHECKER_HH
+#include <paludis/broken_linkage_finder.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/set-fwd.hh>
@@ -31,7 +30,7 @@
#include <tr1/functional>
#include <string>
-namespace broken_linkage_finder
+namespace paludis
{
class LinkageChecker :
private paludis::InstantiationPolicy<LinkageChecker, paludis::instantiation_method::NonCopyableTag>
diff --git a/src/clients/reconcilio/Makefile.am b/src/clients/reconcilio/Makefile.am
index d273d27..9a5d4a4 100644
--- a/src/clients/reconcilio/Makefile.am
+++ b/src/clients/reconcilio/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/misc/common-makefile.am
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
@PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
-SUBDIRS = broken_linkage_finder .
+SUBDIRS = .
bin_PROGRAMS = reconcilio
noinst_PROGRAMS = man-reconcilio
@@ -32,7 +32,6 @@ reconcilio_SOURCES = \
reconcilio.cc
reconcilio_LDADD = \
- broken_linkage_finder/libbrokenlinkagefinder.a \
$(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 \
diff --git a/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.hh b/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.hh
deleted file mode 100644
index 5789c1d..0000000
--- a/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.hh
+++ /dev/null
@@ -1,67 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2007 David Leverton
- *
- * This file is part of the Paludis package manager. Paludis is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef PALUDIS_GUARD_RECONCILIO_BROKEN_LINKAGE_FINDER_HH
-#define PALUDIS_GUARD_RECONCILIO_BROKEN_LINKAGE_FINDER_HH
-
-#include <paludis/util/attributes.hh>
-#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/instantiation_policy.hh>
-#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/util/wrapped_forward_iterator-fwd.hh>
-
-#include <paludis/environment-fwd.hh>
-#include <paludis/package_id-fwd.hh>
-
-#include <tr1/memory>
-
-class BrokenLinkageFinder :
- private paludis::PrivateImplementationPattern<BrokenLinkageFinder>,
- private paludis::InstantiationPolicy<BrokenLinkageFinder, paludis::instantiation_method::NonCopyableTag>
-{
- public:
- BrokenLinkageFinder(const paludis::Environment *, const std::string &);
- ~BrokenLinkageFinder();
-
- struct BrokenPackageConstIteratorTag;
- typedef paludis::WrappedForwardIterator<BrokenPackageConstIteratorTag,
- const std::tr1::shared_ptr<const paludis::PackageID>
- > BrokenPackageConstIterator;
- BrokenPackageConstIterator begin_broken_packages() const PALUDIS_ATTRIBUTE((warn_unused_result));
- BrokenPackageConstIterator end_broken_packages() const PALUDIS_ATTRIBUTE((warn_unused_result));
-
- struct BrokenFileConstIteratorTag;
- typedef paludis::WrappedForwardIterator<BrokenFileConstIteratorTag, const paludis::FSEntry> BrokenFileConstIterator;
- BrokenFileConstIterator begin_broken_files(const std::tr1::shared_ptr<const paludis::PackageID> &)
- const PALUDIS_ATTRIBUTE((warn_unused_result));
- BrokenFileConstIterator end_broken_files(const std::tr1::shared_ptr<const paludis::PackageID> &)
- const PALUDIS_ATTRIBUTE((warn_unused_result));
-
- struct MissingRequirementConstIteratorTag;
- typedef paludis::WrappedForwardIterator<MissingRequirementConstIteratorTag, const std::string> MissingRequirementConstIterator;
- MissingRequirementConstIterator begin_missing_requirements(
- const std::tr1::shared_ptr<const paludis::PackageID> &, const paludis::FSEntry &)
- const PALUDIS_ATTRIBUTE((warn_unused_result));
- MissingRequirementConstIterator end_missing_requirements(
- const std::tr1::shared_ptr<const paludis::PackageID> &, const paludis::FSEntry &)
- const PALUDIS_ATTRIBUTE((warn_unused_result));
-};
-
-#endif
-
diff --git a/src/clients/reconcilio/broken_linkage_finder/configuration_TEST_cleanup.sh b/src/clients/reconcilio/broken_linkage_finder/configuration_TEST_cleanup.sh
deleted file mode 100755
index e241fc5..0000000
--- a/src/clients/reconcilio/broken_linkage_finder/configuration_TEST_cleanup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-if [ -d configuration_TEST_dir ] ; then
- rm -fr configuration_TEST_dir
-else
- true
-fi
-
-
-
diff --git a/src/clients/reconcilio/fix_linkage.cc b/src/clients/reconcilio/fix_linkage.cc
index 38cb413..226bd30 100644
--- a/src/clients/reconcilio/fix_linkage.cc
+++ b/src/clients/reconcilio/fix_linkage.cc
@@ -21,8 +21,6 @@
#include "fix_linkage.hh"
#include "install.hh"
-#include <src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.hh>
-
#include <paludis/util/fs_entry.hh>
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
@@ -31,6 +29,7 @@
#include <paludis/util/stringify.hh>
#include <paludis/util/make_named_values.hh>
+#include <paludis/broken_linkage_finder.hh>
#include <paludis/dep_spec.hh>
#include <paludis/user_dep_spec.hh>
#include <paludis/name.hh>