aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-09-26 00:14:11 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-09-26 00:14:11 +0000
commitb2a0a7793c49986e7fc8bfa81429c82addb1f363 (patch)
treece466e266e67270fee9c747fc92c97e267bff89b
parent595f41a0fb24fef53292a2cbbaa607d89807cc5a (diff)
downloadpaludis-b2a0a7793c49986e7fc8bfa81429c82addb1f363.tar.gz
paludis-b2a0a7793c49986e7fc8bfa81429c82addb1f363.tar.xz
Move config_file into util/.
-rw-r--r--paludis/distribution.cc2
-rw-r--r--paludis/environments/no_config/no_config_environment.cc2
-rw-r--r--paludis/environments/paludis/bashable_conf.cc2
-rw-r--r--paludis/environments/paludis/keywords_conf.cc2
-rw-r--r--paludis/environments/paludis/licenses_conf.cc2
-rw-r--r--paludis/environments/paludis/mirrors_conf.hh2
-rw-r--r--paludis/environments/paludis/package_mask_conf.cc2
-rw-r--r--paludis/environments/paludis/paludis_config.cc2
-rw-r--r--paludis/environments/paludis/paludis_environment.cc2
-rw-r--r--paludis/environments/paludis/use_conf.cc2
-rw-r--r--paludis/environments/portage/portage_environment.cc2
-rw-r--r--paludis/files.m41
-rw-r--r--paludis/repositories/cran/cran_installed_repository.cc2
-rw-r--r--paludis/repositories/cran/cran_package_id.cc2
-rw-r--r--paludis/repositories/cran/cran_repository.cc2
-rw-r--r--paludis/repositories/cran/description_file.hh2
-rw-r--r--paludis/repositories/e/e_repository.cc2
-rw-r--r--paludis/repositories/e/e_repository_mask_file.cc2
-rw-r--r--paludis/repositories/e/e_repository_mask_file.hh2
-rw-r--r--paludis/repositories/e/e_repository_news.cc2
-rw-r--r--paludis/repositories/e/e_repository_news.hh2
-rw-r--r--paludis/repositories/e/e_repository_profile.cc2
-rw-r--r--paludis/repositories/e/e_repository_profile_file.cc2
-rw-r--r--paludis/repositories/e/e_repository_sets.cc2
-rw-r--r--paludis/repositories/e/eapi.cc2
-rw-r--r--paludis/repositories/e/ebin_entries.cc2
-rw-r--r--paludis/repositories/e/ebuild.cc2
-rw-r--r--paludis/repositories/e/exheres_layout.cc2
-rw-r--r--paludis/repositories/e/manifest2_reader.cc2
-rw-r--r--paludis/repositories/e/qa/extractors.cc2
-rw-r--r--paludis/repositories/e/qa/spec_keys.cc2
-rw-r--r--paludis/repositories/e/traditional_layout.cc2
-rw-r--r--paludis/repositories/e/use_desc.cc2
-rw-r--r--paludis/repositories/e/vdb_repository.cc2
-rw-r--r--paludis/repositories/e/xml_things.cc2
-rw-r--r--paludis/repository.cc2
-rw-r--r--paludis/set_file.cc2
-rw-r--r--paludis/util/config_file.cc (renamed from paludis/config_file.cc)4
-rw-r--r--paludis/util/config_file.hh (renamed from paludis/config_file.hh)2
-rw-r--r--paludis/util/config_file.se (renamed from paludis/config_file.se)0
-rw-r--r--paludis/util/config_file_TEST.cc (renamed from paludis/config_file_TEST.cc)2
-rwxr-xr-xpaludis/util/config_file_TEST_cleanup.sh (renamed from paludis/config_file_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/util/config_file_TEST_setup.sh (renamed from paludis/config_file_TEST_setup.sh)0
-rw-r--r--paludis/util/files.m41
-rw-r--r--ruby/paludis_ruby.cc2
-rw-r--r--src/clients/adjutrix/display_default_system_resolution.cc2
-rw-r--r--src/clients/contrarius/stage.cc2
-rw-r--r--src/clients/contrarius/target_config.cc2
48 files changed, 45 insertions, 45 deletions
diff --git a/paludis/distribution.cc b/paludis/distribution.cc
index 0aa10b0..5ab7792 100644
--- a/paludis/distribution.cc
+++ b/paludis/distribution.cc
@@ -19,7 +19,7 @@
#include <paludis/distribution.hh>
#include <paludis/hashed_containers.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/util/destringify.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/is_file_with_extension.hh>
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index a214ff2..3c1f6e6 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -27,7 +27,7 @@
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/repositories/repository_maker.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/distribution.hh>
#include <paludis/package_database.hh>
#include <paludis/hook.hh>
diff --git a/paludis/environments/paludis/bashable_conf.cc b/paludis/environments/paludis/bashable_conf.cc
index e02143c..99a5d96 100644
--- a/paludis/environments/paludis/bashable_conf.cc
+++ b/paludis/environments/paludis/bashable_conf.cc
@@ -18,7 +18,7 @@
*/
#include "bashable_conf.hh"
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/pstream.hh>
#include <paludis/util/is_file_with_extension.hh>
diff --git a/paludis/environments/paludis/keywords_conf.cc b/paludis/environments/paludis/keywords_conf.cc
index 5e9d427..56ef1a0 100644
--- a/paludis/environments/paludis/keywords_conf.cc
+++ b/paludis/environments/paludis/keywords_conf.cc
@@ -23,7 +23,7 @@
#include <paludis/name.hh>
#include <paludis/dep_spec.hh>
#include <paludis/match_package.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/package_id.hh>
#include <paludis/environments/paludis/paludis_environment.hh>
#include <paludis/environments/paludis/bashable_conf.hh>
diff --git a/paludis/environments/paludis/licenses_conf.cc b/paludis/environments/paludis/licenses_conf.cc
index 6963d45..c4c65b3 100644
--- a/paludis/environments/paludis/licenses_conf.cc
+++ b/paludis/environments/paludis/licenses_conf.cc
@@ -23,7 +23,7 @@
#include <paludis/name.hh>
#include <paludis/dep_spec.hh>
#include <paludis/match_package.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/package_id.hh>
#include <paludis/environments/paludis/paludis_environment.hh>
#include <paludis/environments/paludis/bashable_conf.hh>
diff --git a/paludis/environments/paludis/mirrors_conf.hh b/paludis/environments/paludis/mirrors_conf.hh
index 1e894de..651ccef 100644
--- a/paludis/environments/paludis/mirrors_conf.hh
+++ b/paludis/environments/paludis/mirrors_conf.hh
@@ -22,7 +22,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/instantiation_policy.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/environment.hh>
#include <paludis/name.hh>
diff --git a/paludis/environments/paludis/package_mask_conf.cc b/paludis/environments/paludis/package_mask_conf.cc
index f087433..4141ec5 100644
--- a/paludis/environments/paludis/package_mask_conf.cc
+++ b/paludis/environments/paludis/package_mask_conf.cc
@@ -23,7 +23,7 @@
#include <paludis/name.hh>
#include <paludis/dep_spec.hh>
#include <paludis/match_package.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/package_id.hh>
#include <paludis/environments/paludis/paludis_environment.hh>
#include <paludis/environments/paludis/bashable_conf.hh>
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index a52d499..8b733f1 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -25,7 +25,7 @@
#include <paludis/environments/paludis/licenses_conf.hh>
#include <paludis/environments/paludis/package_mask_conf.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/distribution.hh>
#include <paludis/util/destringify.hh>
#include <paludis/util/dir_iterator.hh>
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 3cd13ca..9ba72af 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -27,7 +27,7 @@
#include <paludis/repositories/repository_maker.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/hooker.hh>
#include <paludis/hook.hh>
#include <paludis/set_file.hh>
diff --git a/paludis/environments/paludis/use_conf.cc b/paludis/environments/paludis/use_conf.cc
index 26f8796..a8afd22 100644
--- a/paludis/environments/paludis/use_conf.cc
+++ b/paludis/environments/paludis/use_conf.cc
@@ -23,7 +23,7 @@
#include <paludis/name.hh>
#include <paludis/dep_spec.hh>
#include <paludis/match_package.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/package_id.hh>
#include <paludis/environments/paludis/paludis_environment.hh>
#include <paludis/environments/paludis/bashable_conf.hh>
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 53aa44a..22abf19 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -32,7 +32,7 @@
#include <paludis/util/options.hh>
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/repositories/repository_maker.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/hooker.hh>
#include <paludis/hook.hh>
#include <paludis/mask.hh>
diff --git a/paludis/files.m4 b/paludis/files.m4
index 15dd880..a5d5b2c 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -10,7 +10,6 @@ dnl on this file at present...
add(`about', `hh', `test')
add(`action', `hh', `cc', `fwd', `se', `sr')
-add(`config_file', `hh', `cc', `se', `test', `testscript')
add(`contents', `hh', `cc', `fwd')
add(`dep_label', `hh', `cc', `fwd')
add(`dep_spec', `hh', `cc', `se', `test', `fwd')
diff --git a/paludis/repositories/cran/cran_installed_repository.cc b/paludis/repositories/cran/cran_installed_repository.cc
index 8dc8880..ace3311 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -24,7 +24,7 @@
#include <paludis/repository_info.hh>
#include <paludis/dep_spec.hh>
#include <paludis/dep_tag.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/set_file.hh>
#include <paludis/action.hh>
#include <paludis/repositories/cran/cran_package_id.hh>
diff --git a/paludis/repositories/cran/cran_package_id.cc b/paludis/repositories/cran/cran_package_id.cc
index cedfef3..aaa840a 100644
--- a/paludis/repositories/cran/cran_package_id.cc
+++ b/paludis/repositories/cran/cran_package_id.cc
@@ -26,7 +26,7 @@
#include <paludis/repositories/cran/normalise.hh>
#include <paludis/repositories/cran/cran_repository.hh>
#include <paludis/repositories/cran/cran_installed_repository.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/repository.hh>
#include <paludis/util/log.hh>
#include <paludis/util/strip.hh>
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index 9170ad9..54719c6 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -19,7 +19,7 @@
*/
#include <paludis/hashed_containers.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/dep_spec.hh>
#include <paludis/environment.hh>
#include <paludis/action.hh>
diff --git a/paludis/repositories/cran/description_file.hh b/paludis/repositories/cran/description_file.hh
index 853280e..43971b4 100644
--- a/paludis/repositories/cran/description_file.hh
+++ b/paludis/repositories/cran/description_file.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_CRAN_DESCRIPTION_FILE_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_CRAN_DESCRIPTION_FILE_HH 1
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/util/attributes.hh>
namespace paludis
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 69b51da..9c2376d 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -38,7 +38,7 @@
#endif
#include <paludis/repository_info.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/distribution.hh>
#include <paludis/dep_spec.hh>
#include <paludis/environment.hh>
diff --git a/paludis/repositories/e/e_repository_mask_file.cc b/paludis/repositories/e/e_repository_mask_file.cc
index a1b5ae6..4f3dc63 100644
--- a/paludis/repositories/e/e_repository_mask_file.cc
+++ b/paludis/repositories/e/e_repository_mask_file.cc
@@ -22,7 +22,7 @@
#include <paludis/util/options.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/strip.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/mask.hh>
#include <libwrapiter/libwrapiter_forward_iterator-impl.hh>
diff --git a/paludis/repositories/e/e_repository_mask_file.hh b/paludis/repositories/e/e_repository_mask_file.hh
index 464fa95..1587a32 100644
--- a/paludis/repositories/e/e_repository_mask_file.hh
+++ b/paludis/repositories/e/e_repository_mask_file.hh
@@ -23,7 +23,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/mask-fwd.hh>
#include <libwrapiter/libwrapiter_forward_iterator-fwd.hh>
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index 1ed2768..56c7e50 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/e/e_repository.hh>
#include <paludis/repositories/e/e_repository_news.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/environment.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/fs_entry.hh>
diff --git a/paludis/repositories/e/e_repository_news.hh b/paludis/repositories/e/e_repository_news.hh
index 32ed764..732c87d 100644
--- a/paludis/repositories/e/e_repository_news.hh
+++ b/paludis/repositories/e/e_repository_news.hh
@@ -22,7 +22,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/instantiation_policy.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
/** \file
* Declaration for the ERepositoryNews class.
diff --git a/paludis/repositories/e/e_repository_profile.cc b/paludis/repositories/e/e_repository_profile.cc
index df45041..d033409 100644
--- a/paludis/repositories/e/e_repository_profile.cc
+++ b/paludis/repositories/e/e_repository_profile.cc
@@ -34,7 +34,7 @@
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
#include <paludis/util/options.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/dep_tag.hh>
#include <paludis/environment.hh>
#include <paludis/match_package.hh>
diff --git a/paludis/repositories/e/e_repository_profile_file.cc b/paludis/repositories/e/e_repository_profile_file.cc
index 414da40..4436e5b 100644
--- a/paludis/repositories/e/e_repository_profile_file.cc
+++ b/paludis/repositories/e/e_repository_profile_file.cc
@@ -22,7 +22,7 @@
#include <paludis/util/tr1_type_traits.hh>
#include <paludis/util/log.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/options.hh>
#include <paludis/mask.hh>
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index a5e5525..dbeaa1b 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -24,7 +24,7 @@
#include <paludis/repositories/e/dep_parser.hh>
#include <paludis/environment.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/query.hh>
#include <paludis/set_file.hh>
#include <paludis/dep_tag.hh>
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index f2e3545..3798eb9 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -31,7 +31,7 @@
#include <paludis/util/stringify.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/instantiation_policy-impl.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <map>
#include <vector>
diff --git a/paludis/repositories/e/ebin_entries.cc b/paludis/repositories/e/ebin_entries.cc
index d706686..c75ea53 100644
--- a/paludis/repositories/e/ebin_entries.cc
+++ b/paludis/repositories/e/ebin_entries.cc
@@ -23,7 +23,7 @@
#include <paludis/repositories/e/eapi.hh>
#include <paludis/repositories/e/dep_parser.hh>
#include <paludis/repositories/e/dep_spec_pretty_printer.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/dep_spec_flattener.hh>
#include <paludis/environment.hh>
#include <paludis/package_id.hh>
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index abee083..de01dec 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -35,7 +35,7 @@
#include <paludis/about.hh>
#include <paludis/environment.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/package_id.hh>
#include <paludis/metadata_key.hh>
#include <paludis/action.hh>
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index 7bfbfc9..3c0f0c6 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/e/e_repository_entries.hh>
#include <paludis/repositories/e/e_repository_exceptions.hh>
#include <paludis/repositories/e/e_repository.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/hashed_containers.hh>
#include <paludis/package_id.hh>
#include <paludis/package_database.hh>
diff --git a/paludis/repositories/e/manifest2_reader.cc b/paludis/repositories/e/manifest2_reader.cc
index 7d81e16..c2d03c0 100644
--- a/paludis/repositories/e/manifest2_reader.cc
+++ b/paludis/repositories/e/manifest2_reader.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/e/manifest2_reader.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/util/destringify.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/iterator.hh>
diff --git a/paludis/repositories/e/qa/extractors.cc b/paludis/repositories/e/qa/extractors.cc
index a312d97..6b173aa 100644
--- a/paludis/repositories/e/qa/extractors.cc
+++ b/paludis/repositories/e/qa/extractors.cc
@@ -22,7 +22,7 @@
#include <paludis/metadata_key.hh>
#include <paludis/qa.hh>
#include <paludis/dep_spec.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/system.hh>
#include <paludis/util/visitor-impl.hh>
diff --git a/paludis/repositories/e/qa/spec_keys.cc b/paludis/repositories/e/qa/spec_keys.cc
index bbe504a..6f4df10 100644
--- a/paludis/repositories/e/qa/spec_keys.cc
+++ b/paludis/repositories/e/qa/spec_keys.cc
@@ -22,7 +22,7 @@
#include <paludis/metadata_key.hh>
#include <paludis/qa.hh>
#include <paludis/dep_spec.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/repositories/e/eapi.hh>
#include <paludis/repositories/e/e_repository_id.hh>
#include <paludis/util/stringify.hh>
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index 49a535b..e515465 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/e/traditional_layout.hh>
#include <paludis/repositories/e/e_repository_entries.hh>
#include <paludis/repositories/e/e_repository.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/package_id.hh>
#include <paludis/hashed_containers.hh>
#include <paludis/package_database.hh>
diff --git a/paludis/repositories/e/use_desc.cc b/paludis/repositories/e/use_desc.cc
index 3a370e5..04fcbf2 100644
--- a/paludis/repositories/e/use_desc.cc
+++ b/paludis/repositories/e/use_desc.cc
@@ -27,7 +27,7 @@
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/strip.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <libwrapiter/libwrapiter_output_iterator.hh>
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 608a9d3..99559e1 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -29,7 +29,7 @@
#include <paludis/repositories/e/e_repository.hh>
#include <paludis/action.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/dep_spec.hh>
#include <paludis/dep_spec_flattener.hh>
#include <paludis/dep_tag.hh>
diff --git a/paludis/repositories/e/xml_things.cc b/paludis/repositories/e/xml_things.cc
index da67be4..d3cc221 100644
--- a/paludis/repositories/e/xml_things.cc
+++ b/paludis/repositories/e/xml_things.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/e/glsa.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/join.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <set>
#include <list>
diff --git a/paludis/repository.cc b/paludis/repository.cc
index fc74aa7..5f98cb87 100644
--- a/paludis/repository.cc
+++ b/paludis/repository.cc
@@ -29,7 +29,7 @@
#include <paludis/util/sequence-impl.hh>
#include <paludis/util/set.hh>
#include <paludis/util/set-impl.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <libwrapiter/libwrapiter_output_iterator.hh>
#include <map>
diff --git a/paludis/set_file.cc b/paludis/set_file.cc
index d565c23..6f6aa76 100644
--- a/paludis/set_file.cc
+++ b/paludis/set_file.cc
@@ -26,7 +26,7 @@
#include <paludis/util/sequence.hh>
#include <paludis/util/options.hh>
#include <paludis/util/mutex.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/environment.hh>
#include <paludis/query.hh>
#include <paludis/package_database.hh>
diff --git a/paludis/config_file.cc b/paludis/util/config_file.cc
index d2e8204..56332a3 100644
--- a/paludis/config_file.cc
+++ b/paludis/util/config_file.cc
@@ -18,7 +18,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/log.hh>
@@ -45,7 +45,7 @@
using namespace paludis;
-#include <paludis/config_file-se.cc>
+#include <paludis/util/config_file-se.cc>
ConfigFileError::ConfigFileError(const std::string & f, const std::string & m) throw () :
ConfigurationError("Configuration file error: " + (f.empty() ? m : f + ": " + m))
diff --git a/paludis/config_file.hh b/paludis/util/config_file.hh
index 9d004fd..d554e11 100644
--- a/paludis/config_file.hh
+++ b/paludis/util/config_file.hh
@@ -40,7 +40,7 @@
namespace paludis
{
-#include <paludis/config_file-se.hh>
+#include <paludis/util/config_file-se.hh>
class FSEntry;
diff --git a/paludis/config_file.se b/paludis/util/config_file.se
index ba08870..ba08870 100644
--- a/paludis/config_file.se
+++ b/paludis/util/config_file.se
diff --git a/paludis/config_file_TEST.cc b/paludis/util/config_file_TEST.cc
index 52a2632..5176a3d 100644
--- a/paludis/config_file_TEST.cc
+++ b/paludis/util/config_file_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/system.hh>
diff --git a/paludis/config_file_TEST_cleanup.sh b/paludis/util/config_file_TEST_cleanup.sh
index b4ed3db..b4ed3db 100755
--- a/paludis/config_file_TEST_cleanup.sh
+++ b/paludis/util/config_file_TEST_cleanup.sh
diff --git a/paludis/config_file_TEST_setup.sh b/paludis/util/config_file_TEST_setup.sh
index fd0bb10..fd0bb10 100755
--- a/paludis/config_file_TEST_setup.sh
+++ b/paludis/util/config_file_TEST_setup.sh
diff --git a/paludis/util/files.m4 b/paludis/util/files.m4
index 402c3b5..d7e8cf2 100644
--- a/paludis/util/files.m4
+++ b/paludis/util/files.m4
@@ -10,6 +10,7 @@ dnl on this file at present...
add(`action_queue', `hh', `cc', `test')
add(`attributes', `hh')
+add(`config_file', `hh', `cc', `se', `test', `testscript')
add(`clone', `hh', `impl')
add(`condition_variable', `hh', `cc', `test')
add(`destringify', `hh', `cc', `test')
diff --git a/ruby/paludis_ruby.cc b/ruby/paludis_ruby.cc
index 1a8e77f..7ca460b 100644
--- a/ruby/paludis_ruby.cc
+++ b/ruby/paludis_ruby.cc
@@ -20,7 +20,7 @@
#include <paludis/paludis.hh>
#include <paludis_ruby.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/dep_list/exceptions.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/instantiation_policy-impl.hh>
diff --git a/src/clients/adjutrix/display_default_system_resolution.cc b/src/clients/adjutrix/display_default_system_resolution.cc
index 17b1350..b48332f 100644
--- a/src/clients/adjutrix/display_default_system_resolution.cc
+++ b/src/clients/adjutrix/display_default_system_resolution.cc
@@ -20,7 +20,7 @@
#include "display_default_system_resolution.hh"
#include "command_line.hh"
#include <output/colour.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/repositories/fake/fake_installed_repository.hh>
#include <paludis/util/log.hh>
#include <paludis/util/tokeniser.hh>
diff --git a/src/clients/contrarius/stage.cc b/src/clients/contrarius/stage.cc
index edc3444..f490445 100644
--- a/src/clients/contrarius/stage.cc
+++ b/src/clients/contrarius/stage.cc
@@ -20,7 +20,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/sequence.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <paludis/package_database.hh>
#include <paludis/environments/adapted/adapted_environment.hh>
#include <paludis/query.hh>
diff --git a/src/clients/contrarius/target_config.cc b/src/clients/contrarius/target_config.cc
index 9057c14..7574e46 100644
--- a/src/clients/contrarius/target_config.cc
+++ b/src/clients/contrarius/target_config.cc
@@ -22,7 +22,7 @@
#include <paludis/util/stringify.hh>
#include <paludis/util/instantiation_policy-impl.hh>
#include <paludis/util/options.hh>
-#include <paludis/config_file.hh>
+#include <paludis/util/config_file.hh>
#include <list>
#include <string>
#include <vector>