aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-12 22:44:54 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-12 22:44:54 +0100
commit178d7a834cb3bc89a9fa51600125e4160ad39f28 (patch)
treed0214243b33458fba534df5424664fff06c1bb1b
parentf6b265538d15fe0d0b3e7906e0a2ffcd98fec4d5 (diff)
downloadpaludis-178d7a834cb3bc89a9fa51600125e4160ad39f28.tar.gz
paludis-178d7a834cb3bc89a9fa51600125e4160ad39f28.tar.xz
Don't load environments from .sos
-rw-r--r--configure.ac25
-rw-r--r--paludis/Makefile.am.m48
-rw-r--r--paludis/environment_factory.cc63
-rw-r--r--paludis/environment_factory.hh8
-rw-r--r--paludis/environments/no_config/Makefile.am12
-rw-r--r--paludis/environments/no_config/registration.cc24
-rw-r--r--paludis/environments/paludis/Makefile.am26
-rw-r--r--paludis/environments/paludis/registration.cc22
-rw-r--r--paludis/environments/portage/Makefile.am16
-rw-r--r--paludis/environments/portage/registration.cc22
-rw-r--r--paludis/environments/test/Makefile.am23
-rw-r--r--paludis/environments/test/registration.cc16
-rw-r--r--paludis/repositories/accounts/Makefile.am1
-rw-r--r--paludis/repositories/cran/Makefile.am3
-rw-r--r--paludis/repositories/e/Makefile.am19
-rw-r--r--paludis/repositories/e/qa/Makefile.am10
-rw-r--r--paludis/repositories/fake/Makefile.am3
-rw-r--r--paludis/repositories/gems/Makefile.am5
-rw-r--r--paludis/repositories/unavailable/Makefile.am1
-rw-r--r--paludis/repositories/unpackaged/Makefile.am3
-rw-r--r--paludis/repositories/unwritten/Makefile.am1
-rw-r--r--paludis/repositories/virtuals/Makefile.am2
-rw-r--r--paludis/resolver/Makefile.am4
-rw-r--r--python/Makefile.am5
-rw-r--r--ruby/Makefile.am3
-rw-r--r--src/clients/accerso/Makefile.am1
-rw-r--r--src/clients/adjutrix/Makefile.am1
-rw-r--r--src/clients/appareo/Makefile.am1
-rw-r--r--src/clients/instruo/Makefile.am1
-rw-r--r--src/clients/qualudis/Makefile.am1
30 files changed, 122 insertions, 208 deletions
diff --git a/configure.ac b/configure.ac
index 2db7fde..599b5e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1351,7 +1351,8 @@ REPOSITORY_GROUP_IF(dummy)
dnl }}}
dnl {{{ environments
-ALL_ENVIRONMENTS="no_config paludis portage test"
+m4_define(ALL_ENVIRONMENTS_m4, [no_config,paludis,portage,test])
+ALL_ENVIRONMENTS=`echo ALL_ENVIRONMENTS_m4 | tr , ' '`
DEFAULT_ENVIRONMENTS="no_config paludis test"
AC_MSG_CHECKING([which environments to build...])
AC_ARG_WITH([environments],
@@ -1374,6 +1375,28 @@ AC_MSG_RESULT([$environments])
BUILD_ENVIRONMENTS="$environments"
AC_SUBST([ALL_ENVIRONMENTS])
AC_SUBST([BUILD_ENVIRONMENTS])
+
+AC_DEFUN([ENVIRONMENT_GROUP_IF], [
+if echo $environments | tr ' ' '\n' | grep '^$1$' >/dev/null ; then
+ AC_DEFINE_UNQUOTED([ENVIRONMENT_GROUP_IF_$1], [$1], [The $1 environment])
+else
+ AC_DEFINE_UNQUOTED([ENVIRONMENT_GROUP_IF_$1], [], [Do not have the $1 environment])
+fi
+ ])
+
+m4_foreach(envname, [ALL_ENVIRONMENTS_m4], [
+ENVIRONMENT_GROUP_IF(envname)
+])
+
+AC_DEFINE_UNQUOTED(ENVIRONMENT_GROUPS_DECLS,
+ m4_foreach(envname,
+ [ALL_ENVIRONMENTS_m4],
+ [ struct envname; ] ) struct semicolon_goes_where { },
+ [Our environment groups])
+
+dnl make sure the code works even if everything's enabled
+ENVIRONMENT_GROUP_IF(dummy)
+
dnl }}}
dnl {{{ distribution
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index d73ebff..d174108 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -19,7 +19,6 @@ $1_TEST_LDADD = \
ihateautomake.o \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
@@ -81,7 +80,7 @@ EXTRA_DIST = about.hh.in Makefile.am.m4 paludis.hh.m4 files.m4 \
testscriptlist srlist srcleanlist selist secleanlist \
hooker.bash \
stripper_TEST_binary.cc
-SUBDIRS = distributions fetchers syncers util selinux repositories . environments args resolver
+SUBDIRS = distributions fetchers syncers util selinux repositories environments . args resolver
BUILT_SOURCES = srcleanlist secleanlist
libpaludis_@PALUDIS_PC_SLOT@_la_SOURCES = filelist
@@ -115,6 +114,10 @@ libpaludis_@PALUDIS_PC_SLOT@_la_LIBADD = \
$(top_builddir)/paludis/repositories/unpackaged/libpaludisunpackagedrepository.la \
$(top_builddir)/paludis/repositories/unwritten/libpaludisunwrittenrepository.la \
$(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
+ $(top_builddir)/paludis/environments/paludis/libpaludispaludisenvironment.la \
+ $(top_builddir)/paludis/environments/portage/libpaludisportageenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
@DYNAMIC_LD_LIBS@ \
$(PTHREAD_LIBS)
@@ -129,7 +132,6 @@ 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_@PALUDIS_PC_SLOT@.la \
libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(DYNAMIC_LD_LIBS)
diff --git a/paludis/environment_factory.cc b/paludis/environment_factory.cc
index 7cf0bc7..11003ae 100644
--- a/paludis/environment_factory.cc
+++ b/paludis/environment_factory.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008 Ciaran McCreesh
+ * Copyright (c) 2008, 2009 Ciaran McCreesh
*
* 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
@@ -31,8 +31,6 @@
#include <paludis/distribution.hh>
#include <paludis/about.hh>
#include <tr1/unordered_map>
-#include <dlfcn.h>
-#include <stdint.h>
#include <list>
#include "config.h"
@@ -46,17 +44,29 @@ namespace paludis
struct Implementation<EnvironmentFactory>
{
Keys keys;
- std::list<void *> dl_opened;
};
+
+ namespace environment_groups
+ {
+ ENVIRONMENT_GROUPS_DECLS;
+ }
+
+ template <>
+ void register_environment<NoType<0u> >(EnvironmentFactory * const)
+ {
+ }
}
EnvironmentFactory::EnvironmentFactory() :
PrivateImplementationPattern<EnvironmentFactory>(new Implementation<EnvironmentFactory>)
{
- FSEntry so_dir(getenv_with_default("PALUDIS_ENVIRONMENT_SO_DIR", LIBDIR "/paludis/environments"));
- if (! so_dir.is_directory())
- throw InternalError(PALUDIS_HERE, "PALUDIS_ENVIRONMENT_SO_DIR '" + stringify(so_dir) + "' not a directory");
- _load_dir(so_dir);
+ using namespace environment_groups;
+
+ register_environment<ENVIRONMENT_GROUP_IF_dummy>(this);
+ register_environment<ENVIRONMENT_GROUP_IF_no_config>(this);
+ register_environment<ENVIRONMENT_GROUP_IF_paludis>(this);
+ register_environment<ENVIRONMENT_GROUP_IF_portage>(this);
+ register_environment<ENVIRONMENT_GROUP_IF_test>(this);
}
EnvironmentFactory::~EnvironmentFactory()
@@ -109,43 +119,6 @@ EnvironmentFactory::create(const std::string & s) const
}
void
-EnvironmentFactory::_load_dir(const FSEntry & so_dir)
-{
- for (DirIterator d(so_dir), d_end ; d != d_end ; ++d)
- {
- if (d->is_directory())
- _load_dir(*d);
-
- if (! is_file_with_extension(*d, "_" + stringify(PALUDIS_PC_SLOT) + ".so." +
- stringify(100 * PALUDIS_VERSION_MAJOR + PALUDIS_VERSION_MINOR),
- IsFileWithOptions()))
- continue;
-
- /* don't use RTLD_LOCAL, g++ is over happy about template instantiations, and it
- * can lead to multiple singleton instances. */
- void * dl(dlopen(stringify(*d).c_str(), RTLD_GLOBAL | RTLD_NOW));
-
- if (dl)
- {
- _imp->dl_opened.push_back(dl);
-
- void * reg(dlsym(dl, "paludis_initialise_environment_so"));
- if (reg)
- {
- reinterpret_cast<void (*)(EnvironmentFactory * const)>(reinterpret_cast<uintptr_t>(reg))(this);
- }
- else
- throw InternalError(PALUDIS_HERE, "No paludis_initialise_environment_so function defined in '" + stringify(*d) + "'");
- }
- else
- throw InternalError(PALUDIS_HERE, "Couldn't dlopen '" + stringify(*d) + "': " + stringify(dlerror()));
- }
-
- if ((so_dir / ".libs").is_directory())
- _load_dir(so_dir / ".libs");
-}
-
-void
EnvironmentFactory::add_environment_format(
const std::tr1::shared_ptr<const Set<std::string> > & formats,
const CreateFunction & create_function
diff --git a/paludis/environment_factory.hh b/paludis/environment_factory.hh
index b5821bf..6b9b346 100644
--- a/paludis/environment_factory.hh
+++ b/paludis/environment_factory.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008 Ciaran McCreesh
+ * Copyright (c) 2008, 2009 Ciaran McCreesh
*
* 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
@@ -26,6 +26,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/set-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
+#include <paludis/util/no_type.hh>
#include <paludis/environment-fwd.hh>
#include <tr1/memory>
#include <tr1/functional>
@@ -52,8 +53,6 @@ namespace paludis
EnvironmentFactory();
~EnvironmentFactory();
- void _load_dir(const FSEntry &);
-
public:
typedef std::tr1::function<const std::tr1::shared_ptr<Environment>(const std::string &)> CreateFunction;
@@ -88,6 +87,9 @@ namespace paludis
);
};
+ template <typename EnvironmentClass_ = NoType<0u> >
+ void register_environment(EnvironmentFactory * const);
+
#ifdef PALUDIS_HAVE_EXTERN_TEMPLATE
extern template class PrivateImplementationPattern<EnvironmentFactory>;
extern template class InstantiationPolicy<EnvironmentFactory, instantiation_method::SingletonTag>;
diff --git a/paludis/environments/no_config/Makefile.am b/paludis/environments/no_config/Makefile.am
index b870a1a..c44f34f 100644
--- a/paludis/environments/no_config/Makefile.am
+++ b/paludis/environments/no_config/Makefile.am
@@ -8,18 +8,11 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
+libpaludisnoconfigenvironment_la_SOURCES = \
no_config_environment.cc no_config_environment.hh \
registration.cc
-libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-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_@PALUDIS_PC_SLOT@.la
+noinst_LTLIBRARIES = libpaludisnoconfigenvironment.la
paludis_environment_no_config_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/environments/no_config
paludis_environment_no_config_include_HEADERS = \
@@ -53,7 +46,6 @@ 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_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
diff --git a/paludis/environments/no_config/registration.cc b/paludis/environments/no_config/registration.cc
index 13aefa5..8b27039 100644
--- a/paludis/environments/no_config/registration.cc
+++ b/paludis/environments/no_config/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
*
* 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
@@ -27,6 +27,7 @@
#include <paludis/util/sequence.hh>
#include <paludis/util/make_named_values.hh>
#include <list>
+#include "config.h"
using namespace paludis;
@@ -99,13 +100,20 @@ namespace
}
}
-extern "C" void paludis_initialise_environment_so(EnvironmentFactory * const) PALUDIS_VISIBLE;
-
-void paludis_initialise_environment_so(EnvironmentFactory * const factory)
+namespace paludis
{
- std::tr1::shared_ptr<Set<std::string> > no_config_formats(new Set<std::string>);
- no_config_formats->insert("no_config");
- no_config_formats->insert("no-config");
- factory->add_environment_format(no_config_formats, &make_no_config_environment);
+ namespace environment_groups
+ {
+ ENVIRONMENT_GROUPS_DECLS;
+ }
+
+ template <>
+ void register_environment<environment_groups::no_config>(EnvironmentFactory * const factory)
+ {
+ std::tr1::shared_ptr<Set<std::string> > no_config_formats(new Set<std::string>);
+ no_config_formats->insert("no_config");
+ no_config_formats->insert("no-config");
+ factory->add_environment_format(no_config_formats, &make_no_config_environment);
+ }
}
diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
index 1833940..a80e63c 100644
--- a/paludis/environments/paludis/Makefile.am
+++ b/paludis/environments/paludis/Makefile.am
@@ -10,7 +10,7 @@ DEFS= \
-DLIBDIR=\"$(libdir)\" \
-DSHAREDIR=\"$(datarootdir)\"
-libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
+libpaludispaludisenvironment_la_SOURCES = \
action_to_string.cc action_to_string.hh \
bashable_conf.cc bashable_conf.hh \
keywords_conf.cc keywords_conf.hh \
@@ -26,36 +26,17 @@ libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
extra_distribution_data.cc extra_distribution_data.hh \
registration.cc
-libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
shareenvpaludisdir = $(datarootdir)/paludis/environments/paludis/
dist_shareenvpaludis_DATA = \
default_output.conf \
tests_output.conf
-if ! MONOLITHIC
-
-libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
-
-endif
-
libenvdir = $(libdir)/paludis/environments
-if MONOLITHIC
-
-noinst_LTLIBRARIES = libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la
-
-else
-
-libenv_LTLIBRARIES = libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la
-
-endif
+noinst_LTLIBRARIES = libpaludispaludisenvironment.la
-paludis_environment_paludis_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/environments/paludis
-paludis_environment_paludis_include_HEADERS = \
+noinst_HEADERS = \
paludis_config.hh \
paludis_environment.hh \
use_conf.hh \
@@ -105,7 +86,6 @@ check_SCRIPTS = paludis_environment_TEST_setup.sh paludis_environment_TEST_clean
paludis_environment_TEST_SOURCES = paludis_environment_TEST.cc
paludis_environment_TEST_LDADD = \
- libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
diff --git a/paludis/environments/paludis/registration.cc b/paludis/environments/paludis/registration.cc
index e8efc02..943754f 100644
--- a/paludis/environments/paludis/registration.cc
+++ b/paludis/environments/paludis/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
*
* 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
@@ -20,6 +20,7 @@
#include <paludis/environments/paludis/paludis_environment.hh>
#include <paludis/environment_factory.hh>
#include <paludis/util/set.hh>
+#include "config.h"
using namespace paludis;
@@ -32,12 +33,19 @@ namespace
}
}
-extern "C" void paludis_initialise_environment_so(EnvironmentFactory * const) PALUDIS_VISIBLE;
-
-void paludis_initialise_environment_so(EnvironmentFactory * const factory)
+namespace paludis
{
- std::tr1::shared_ptr<Set<std::string> > paludis_formats(new Set<std::string>);
- paludis_formats->insert("paludis");
- factory->add_environment_format(paludis_formats, &make_paludis_environment);
+ namespace environment_groups
+ {
+ ENVIRONMENT_GROUPS_DECLS;
+ }
+
+ template <>
+ void register_environment<environment_groups::paludis>(EnvironmentFactory * const factory)
+ {
+ std::tr1::shared_ptr<Set<std::string> > paludis_formats(new Set<std::string>);
+ paludis_formats->insert("paludis");
+ factory->add_environment_format(paludis_formats, &make_paludis_environment);
+ }
}
diff --git a/paludis/environments/portage/Makefile.am b/paludis/environments/portage/Makefile.am
index ffa45d8..7df95f8 100644
--- a/paludis/environments/portage/Makefile.am
+++ b/paludis/environments/portage/Makefile.am
@@ -9,25 +9,16 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-libpaludisportageenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
+libpaludisportageenvironment_la_SOURCES = \
registration.cc \
portage_environment.cc portage_environment.hh
-libpaludisportageenvironment_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-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_@PALUDIS_PC_SLOT@.la
+noinst_LTLIBRARIES = libpaludisportageenvironment.la
-paludis_environment_portage_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/environments/portage
-paludis_environment_portage_include_HEADERS = \
+noinst_HEADERS = \
portage_environment.hh
EXTRA_DIST = \
@@ -65,7 +56,6 @@ TESTS_ENVIRONMENT = env \
portage_environment_TEST_SOURCES = portage_environment_TEST.cc
portage_environment_TEST_LDADD = \
- libpaludisportageenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
diff --git a/paludis/environments/portage/registration.cc b/paludis/environments/portage/registration.cc
index 69b3a36..eac02bb 100644
--- a/paludis/environments/portage/registration.cc
+++ b/paludis/environments/portage/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
*
* 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
@@ -20,6 +20,7 @@
#include <paludis/environment_factory.hh>
#include <paludis/environments/portage/portage_environment.hh>
#include <paludis/util/set.hh>
+#include "config.h"
using namespace paludis;
@@ -32,12 +33,19 @@ namespace
}
}
-extern "C" void paludis_initialise_environment_so(EnvironmentFactory * const) PALUDIS_VISIBLE;
-
-void paludis_initialise_environment_so(EnvironmentFactory * const factory)
+namespace paludis
{
- std::tr1::shared_ptr<Set<std::string> > portage_formats(new Set<std::string>);
- portage_formats->insert("portage");
- factory->add_environment_format(portage_formats, &make_portage_environment);
+ namespace environment_groups
+ {
+ ENVIRONMENT_GROUPS_DECLS;
+ }
+
+ template <>
+ void register_environment<environment_groups::portage>(EnvironmentFactory * const factory)
+ {
+ std::tr1::shared_ptr<Set<std::string> > portage_formats(new Set<std::string>);
+ portage_formats->insert("portage");
+ factory->add_environment_format(portage_formats, &make_portage_environment);
+ }
}
diff --git a/paludis/environments/test/Makefile.am b/paludis/environments/test/Makefile.am
index 3080d7e..666ab2b 100644
--- a/paludis/environments/test/Makefile.am
+++ b/paludis/environments/test/Makefile.am
@@ -7,29 +7,11 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-libpaludistestenvironment_@PALUDIS_PC_SLOT@_la_SOURCES = \
+libpaludistestenvironment_la_SOURCES = \
test_environment.cc test_environment.hh \
registration.cc
-libpaludistestenvironment_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-if ! MONOLITHIC
-
-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_@PALUDIS_PC_SLOT@.la
-
-else
-
-lib_LTLIBRARIES = libpaludistestenvironment_@PALUDIS_PC_SLOT@.la
-
-endif
+noinst_LTLIBRARIES = libpaludistestenvironment.la
paludis_environment_test_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/environments/test
paludis_environment_test_include_HEADERS = test_environment.hh
@@ -44,3 +26,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/registration.cc b/paludis/environments/test/registration.cc
index 1b4a4c3..dae7c0c 100644
--- a/paludis/environments/test/registration.cc
+++ b/paludis/environments/test/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
*
* 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
@@ -19,12 +19,20 @@
#include <paludis/environment_factory.hh>
#include <paludis/environments/test/test_environment.hh>
+#include "config.h"
using namespace paludis;
-extern "C" void paludis_initialise_environment_so(EnvironmentFactory * const) PALUDIS_VISIBLE;
-
-void paludis_initialise_environment_so(EnvironmentFactory * const)
+namespace paludis
{
+ namespace environment_groups
+ {
+ ENVIRONMENT_GROUPS_DECLS;
+ }
+
+ template <>
+ void register_environment<environment_groups::test>(EnvironmentFactory * const)
+ {
+ }
}
diff --git a/paludis/repositories/accounts/Makefile.am b/paludis/repositories/accounts/Makefile.am
index 81cfc4b..6acb2dc 100644
--- a/paludis/repositories/accounts/Makefile.am
+++ b/paludis/repositories/accounts/Makefile.am
@@ -45,7 +45,6 @@ accounts_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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/cran/Makefile.am b/paludis/repositories/cran/Makefile.am
index cfb793c..ad50c27 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -62,7 +62,6 @@ cran_installed_repository_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(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_installed_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
@@ -74,7 +73,6 @@ cran_repository_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(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_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
@@ -86,7 +84,6 @@ description_file_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(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_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index 8e13e2b..b90967e 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -148,7 +148,6 @@ e_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -160,7 +159,6 @@ depend_rdepend_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -172,7 +170,6 @@ e_repository_TEST_ever_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -184,7 +181,6 @@ e_repository_TEST_phases_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -196,7 +192,6 @@ e_repository_TEST_exlibs_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -208,7 +203,6 @@ e_repository_TEST_replacing_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -220,7 +214,6 @@ vdb_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -232,7 +225,6 @@ exndbam_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -244,7 +236,6 @@ vdb_merger_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -256,7 +247,6 @@ vdb_unmerger_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -268,7 +258,6 @@ e_repository_sets_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -280,7 +269,6 @@ dep_spec_pretty_printer_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -292,7 +280,6 @@ dep_parser_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -304,7 +291,6 @@ aa_visitor_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -316,7 +302,6 @@ fetch_visitor_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -328,7 +313,6 @@ source_uri_finder_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -340,7 +324,6 @@ fix_locked_dependencies_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -352,7 +335,6 @@ ebuild_flat_metadata_cache_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -500,7 +482,6 @@ xml_things_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(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/qa/Makefile.am b/paludis/repositories/e/qa/Makefile.am
index 8f9af3e..01a3f0a 100644
--- a/paludis/repositories/e/qa/Makefile.am
+++ b/paludis/repositories/e/qa/Makefile.am
@@ -162,7 +162,6 @@ spec_keys_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a
spec_keys_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
@@ -173,7 +172,6 @@ extractors_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
@@ -184,7 +182,6 @@ homepage_key_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
@@ -195,7 +192,6 @@ visibility_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
@@ -206,7 +202,6 @@ default_functions_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
@@ -217,7 +212,6 @@ kv_variables_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
@@ -228,7 +222,6 @@ misc_files_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
@@ -239,7 +232,6 @@ manifest_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
@@ -250,7 +242,6 @@ subshell_die_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
@@ -261,7 +252,6 @@ function_keyword_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index abecc9a..5dffa63 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -32,7 +32,6 @@ EXTRA_DIST = \
dep_parser_TEST.cc
fake_repository_TEST_LDADD = \
- $(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_@PALUDIS_PC_SLOT@.la \
@@ -41,7 +40,6 @@ fake_repository_TEST_LDADD = \
fake_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
fake_installed_repository_TEST_LDADD = \
- $(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_@PALUDIS_PC_SLOT@.la \
@@ -50,7 +48,6 @@ fake_installed_repository_TEST_LDADD = \
fake_installed_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
dep_parser_TEST_LDADD = \
- $(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_@PALUDIS_PC_SLOT@.la \
diff --git a/paludis/repositories/gems/Makefile.am b/paludis/repositories/gems/Makefile.am
index 6a1eae7..b8780e0 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -48,7 +48,6 @@ gems_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
-lsyck
@@ -56,7 +55,6 @@ installed_gems_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
-lsyck
@@ -64,7 +62,6 @@ yaml_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
-lsyck
@@ -72,7 +69,6 @@ gem_specification_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
-lsyck
@@ -80,7 +76,6 @@ gem_specifications_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
-lsyck
diff --git a/paludis/repositories/unavailable/Makefile.am b/paludis/repositories/unavailable/Makefile.am
index 519b146..a89442a 100644
--- a/paludis/repositories/unavailable/Makefile.am
+++ b/paludis/repositories/unavailable/Makefile.am
@@ -35,7 +35,6 @@ unavailable_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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/unpackaged/Makefile.am b/paludis/repositories/unpackaged/Makefile.am
index 63ffdf5..9d3e3fe 100644
--- a/paludis/repositories/unpackaged/Makefile.am
+++ b/paludis/repositories/unpackaged/Makefile.am
@@ -42,7 +42,6 @@ unpackaged_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -54,7 +53,6 @@ installed_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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)
@@ -66,7 +64,6 @@ dep_parser_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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/unwritten/Makefile.am b/paludis/repositories/unwritten/Makefile.am
index b7820e0..71fa08a 100644
--- a/paludis/repositories/unwritten/Makefile.am
+++ b/paludis/repositories/unwritten/Makefile.am
@@ -35,7 +35,6 @@ unwritten_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
$(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 bbdbfd4..1d9026f 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -49,7 +49,6 @@ TESTS_ENVIRONMENT = env \
bash $(top_srcdir)/test/run_test.sh
virtuals_repository_TEST_LDADD = \
- $(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_@PALUDIS_PC_SLOT@.la \
@@ -58,7 +57,6 @@ virtuals_repository_TEST_LDADD = \
virtuals_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
installed_virtuals_repository_TEST_LDADD = \
- $(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_@PALUDIS_PC_SLOT@.la \
diff --git a/paludis/resolver/Makefile.am b/paludis/resolver/Makefile.am
index 52e72b0..e9d293b 100644
--- a/paludis/resolver/Makefile.am
+++ b/paludis/resolver/Makefile.am
@@ -103,7 +103,6 @@ resolver_TEST_blockers_LDADD = \
libpaludisresolvertest.a \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
libpaludisresolver.a \
@@ -117,7 +116,6 @@ resolver_TEST_virtuals_LDADD = \
libpaludisresolvertest.a \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
libpaludisresolver.a \
@@ -131,7 +129,6 @@ resolver_TEST_suggestions_LDADD = \
libpaludisresolvertest.a \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
libpaludisresolver.a \
@@ -145,7 +142,6 @@ resolver_TEST_serialisation_LDADD = \
libpaludisresolvertest.a \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
libpaludisresolver.a \
diff --git a/python/Makefile.am b/python/Makefile.am
index eeb96fe..4c774e6 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -184,10 +184,7 @@ endif
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/environments/paludis/libpaludispaludisenvironment_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/environments/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la
+ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
libadditionaltests_@PALUDIS_PC_SLOT@_la_SOURCES = additional_tests.hh additional_tests.cc
libadditionaltests_@PALUDIS_PC_SLOT@_la_LIBADD = $(libpaludispython_@PALUDIS_PC_SLOT@_la_LIBADD)
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 5ad55f5..bf326ec 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -154,9 +154,6 @@ endif
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/test/libpaludistestenvironment_@PALUDIS_PC_SLOT@.la \
$(PTHREAD_LIBS)
check_DATA = .libs/Paludis.so
diff --git a/src/clients/accerso/Makefile.am b/src/clients/accerso/Makefile.am
index 3444845..449997c 100644
--- a/src/clients/accerso/Makefile.am
+++ b/src/clients/accerso/Makefile.am
@@ -36,7 +36,6 @@ accerso_LDADD = \
$(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)
diff --git a/src/clients/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am
index 309b727..c2696ee 100644
--- a/src/clients/adjutrix/Makefile.am
+++ b/src/clients/adjutrix/Makefile.am
@@ -42,7 +42,6 @@ adjutrix_SOURCES = \
adjutrix.cc
adjutrix_LDADD = \
- $(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 \
diff --git a/src/clients/appareo/Makefile.am b/src/clients/appareo/Makefile.am
index b11b8aa..c1a33d7 100644
--- a/src/clients/appareo/Makefile.am
+++ b/src/clients/appareo/Makefile.am
@@ -36,7 +36,6 @@ appareo_LDADD = \
$(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)
diff --git a/src/clients/instruo/Makefile.am b/src/clients/instruo/Makefile.am
index ce16d19..decdd6a 100644
--- a/src/clients/instruo/Makefile.am
+++ b/src/clients/instruo/Makefile.am
@@ -36,7 +36,6 @@ instruo_LDADD = \
$(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)
diff --git a/src/clients/qualudis/Makefile.am b/src/clients/qualudis/Makefile.am
index 19e77d1..4342b42 100644
--- a/src/clients/qualudis/Makefile.am
+++ b/src/clients/qualudis/Makefile.am
@@ -18,7 +18,6 @@ qualudis_SOURCES = \
qualudis.cc
qualudis_LDADD = \
- $(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 \