aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-28 12:30:35 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-28 12:30:35 +0000
commite4f6e0e6d142cab41c153405f62df2a602714fcb (patch)
tree228d4d792d03e92dc69884069e24249dd178e3d0
parentb9d1ac11242b85c0fd91e653c483c39c9f2faa9b (diff)
downloadpaludis-e4f6e0e6d142cab41c153405f62df2a602714fcb.tar.gz
paludis-e4f6e0e6d142cab41c153405f62df2a602714fcb.tar.xz
Move src/ to src/clients/ and src/output/
-rw-r--r--configure.ac21
-rw-r--r--src/Makefile.am23
-rw-r--r--src/clients/Makefile.am11
-rw-r--r--src/clients/adjutrix/Makefile.am (renamed from src/adjutrix/Makefile.am)4
-rw-r--r--src/clients/adjutrix/adjutrix.cc (renamed from src/adjutrix/adjutrix.cc)2
-rwxr-xr-xsrc/clients/adjutrix/args_from_environment_TEST (renamed from src/adjutrix/args_from_environment_TEST)0
-rw-r--r--src/clients/adjutrix/command_line.cc (renamed from src/adjutrix/command_line.cc)0
-rw-r--r--src/clients/adjutrix/command_line.hh (renamed from src/adjutrix/command_line.hh)0
-rw-r--r--src/clients/adjutrix/display_default_system_resolution.cc (renamed from src/adjutrix/display_default_system_resolution.cc)2
-rw-r--r--src/clients/adjutrix/display_default_system_resolution.hh (renamed from src/adjutrix/display_default_system_resolution.hh)0
-rw-r--r--src/clients/adjutrix/display_profiles_use.cc (renamed from src/adjutrix/display_profiles_use.cc)2
-rw-r--r--src/clients/adjutrix/display_profiles_use.hh (renamed from src/adjutrix/display_profiles_use.hh)0
-rw-r--r--src/clients/adjutrix/find_dropped_keywords.cc (renamed from src/adjutrix/find_dropped_keywords.cc)0
-rw-r--r--src/clients/adjutrix/find_dropped_keywords.hh (renamed from src/adjutrix/find_dropped_keywords.hh)0
-rw-r--r--src/clients/adjutrix/find_dropped_keywords.sr (renamed from src/adjutrix/find_dropped_keywords.sr)0
-rw-r--r--src/clients/adjutrix/find_insecure_packages.cc (renamed from src/adjutrix/find_insecure_packages.cc)0
-rw-r--r--src/clients/adjutrix/find_insecure_packages.hh (renamed from src/adjutrix/find_insecure_packages.hh)0
-rw-r--r--src/clients/adjutrix/find_reverse_deps.cc (renamed from src/adjutrix/find_reverse_deps.cc)2
-rw-r--r--src/clients/adjutrix/find_reverse_deps.hh (renamed from src/adjutrix/find_reverse_deps.hh)0
-rw-r--r--src/clients/adjutrix/find_stable_candidates.cc (renamed from src/adjutrix/find_stable_candidates.cc)0
-rw-r--r--src/clients/adjutrix/find_stable_candidates.hh (renamed from src/adjutrix/find_stable_candidates.hh)0
-rw-r--r--src/clients/adjutrix/find_stable_candidates.sr (renamed from src/adjutrix/find_stable_candidates.sr)0
-rwxr-xr-xsrc/clients/adjutrix/find_stable_candidates_TEST (renamed from src/adjutrix/find_stable_candidates_TEST)0
-rwxr-xr-xsrc/clients/adjutrix/find_stable_candidates_TEST_cleanup.sh (renamed from src/adjutrix/find_stable_candidates_TEST_cleanup.sh)0
-rwxr-xr-xsrc/clients/adjutrix/find_stable_candidates_TEST_setup.sh (renamed from src/adjutrix/find_stable_candidates_TEST_setup.sh)0
-rwxr-xr-xsrc/clients/adjutrix/help_TEST (renamed from src/adjutrix/help_TEST)0
-rw-r--r--src/clients/adjutrix/keywords_graph.cc (renamed from src/adjutrix/keywords_graph.cc)2
-rw-r--r--src/clients/adjutrix/keywords_graph.hh (renamed from src/adjutrix/keywords_graph.hh)0
-rw-r--r--src/clients/adjutrix/man_adjutrix.cc (renamed from src/adjutrix/man_adjutrix.cc)0
-rwxr-xr-xsrc/clients/adjutrix/version_TEST (renamed from src/adjutrix/version_TEST)0
-rw-r--r--src/clients/contrarius/Makefile.am (renamed from src/contrarius/Makefile.am)4
-rw-r--r--src/clients/contrarius/command_line.cc (renamed from src/contrarius/command_line.cc)0
-rw-r--r--src/clients/contrarius/command_line.hh (renamed from src/contrarius/command_line.hh)0
-rw-r--r--src/clients/contrarius/contrarius.cc (renamed from src/contrarius/contrarius.cc)0
-rw-r--r--src/clients/contrarius/contrarius_stage_options.sr (renamed from src/contrarius/contrarius_stage_options.sr)0
-rw-r--r--src/clients/contrarius/install.cc (renamed from src/contrarius/install.cc)6
-rw-r--r--src/clients/contrarius/install.hh (renamed from src/contrarius/install.hh)0
-rw-r--r--src/clients/contrarius/man_contrarius.cc (renamed from src/contrarius/man_contrarius.cc)0
-rw-r--r--src/clients/contrarius/stage.cc (renamed from src/contrarius/stage.cc)2
-rw-r--r--src/clients/contrarius/stage.hh (renamed from src/contrarius/stage.hh)2
-rw-r--r--src/clients/contrarius/stage_builder.cc (renamed from src/contrarius/stage_builder.cc)6
-rw-r--r--src/clients/contrarius/stage_builder.hh (renamed from src/contrarius/stage_builder.hh)2
-rw-r--r--src/clients/gtkpaludis/Makefile.am (renamed from src/gtkpaludis/Makefile.am)2
-rw-r--r--src/clients/gtkpaludis/categories_list.cc (renamed from src/gtkpaludis/categories_list.cc)0
-rw-r--r--src/clients/gtkpaludis/categories_list.hh (renamed from src/gtkpaludis/categories_list.hh)0
-rw-r--r--src/clients/gtkpaludis/cellrendererbutton/Makefile.am (renamed from src/gtkpaludis/cellrendererbutton/Makefile.am)0
-rw-r--r--src/clients/gtkpaludis/cellrendererbutton/cellrendererbutton.cc (renamed from src/gtkpaludis/cellrendererbutton/cellrendererbutton.cc)0
-rw-r--r--src/clients/gtkpaludis/cellrendererbutton/cellrendererbutton.hh (renamed from src/gtkpaludis/cellrendererbutton/cellrendererbutton.hh)0
-rw-r--r--src/clients/gtkpaludis/command_line.cc (renamed from src/gtkpaludis/command_line.cc)0
-rw-r--r--src/clients/gtkpaludis/command_line.hh (renamed from src/gtkpaludis/command_line.hh)0
-rwxr-xr-xsrc/clients/gtkpaludis/config_suffix_TEST.py (renamed from src/gtkpaludis/config_suffix_TEST.py)0
-rw-r--r--src/clients/gtkpaludis/gtkpaludis.cc (renamed from src/gtkpaludis/gtkpaludis.cc)0
-rwxr-xr-xsrc/clients/gtkpaludis/help_TEST (renamed from src/gtkpaludis/help_TEST)0
-rw-r--r--src/clients/gtkpaludis/install.cc (renamed from src/gtkpaludis/install.cc)0
-rw-r--r--src/clients/gtkpaludis/install.hh (renamed from src/gtkpaludis/install.hh)0
-rw-r--r--src/clients/gtkpaludis/main_window.cc (renamed from src/gtkpaludis/main_window.cc)0
-rw-r--r--src/clients/gtkpaludis/main_window.hh (renamed from src/gtkpaludis/main_window.hh)0
-rw-r--r--src/clients/gtkpaludis/menu.cc (renamed from src/gtkpaludis/menu.cc)0
-rw-r--r--src/clients/gtkpaludis/menu.hh (renamed from src/gtkpaludis/menu.hh)0
-rw-r--r--src/clients/gtkpaludis/messages.cc (renamed from src/gtkpaludis/messages.cc)0
-rw-r--r--src/clients/gtkpaludis/messages.hh (renamed from src/gtkpaludis/messages.hh)0
-rw-r--r--src/clients/gtkpaludis/package_info.cc (renamed from src/gtkpaludis/package_info.cc)0
-rw-r--r--src/clients/gtkpaludis/package_info.hh (renamed from src/gtkpaludis/package_info.hh)0
-rw-r--r--src/clients/gtkpaludis/package_overview.cc (renamed from src/gtkpaludis/package_overview.cc)0
-rw-r--r--src/clients/gtkpaludis/package_overview.hh (renamed from src/gtkpaludis/package_overview.hh)0
-rw-r--r--src/clients/gtkpaludis/packages_list.cc (renamed from src/gtkpaludis/packages_list.cc)0
-rw-r--r--src/clients/gtkpaludis/packages_list.hh (renamed from src/gtkpaludis/packages_list.hh)0
-rw-r--r--src/clients/gtkpaludis/packages_list.sr (renamed from src/gtkpaludis/packages_list.sr)0
-rw-r--r--src/clients/gtkpaludis/packages_page.cc (renamed from src/gtkpaludis/packages_page.cc)0
-rw-r--r--src/clients/gtkpaludis/packages_page.hh (renamed from src/gtkpaludis/packages_page.hh)0
-rw-r--r--src/clients/gtkpaludis/paludis_thread.cc (renamed from src/gtkpaludis/paludis_thread.cc)0
-rw-r--r--src/clients/gtkpaludis/paludis_thread.hh (renamed from src/gtkpaludis/paludis_thread.hh)0
-rw-r--r--src/clients/gtkpaludis/prod-x-server.cc (renamed from src/gtkpaludis/prod-x-server.cc)0
-rw-r--r--src/clients/gtkpaludis/queue_list.cc (renamed from src/gtkpaludis/queue_list.cc)0
-rw-r--r--src/clients/gtkpaludis/queue_list.hh (renamed from src/gtkpaludis/queue_list.hh)0
-rw-r--r--src/clients/gtkpaludis/queue_options.cc (renamed from src/gtkpaludis/queue_options.cc)0
-rw-r--r--src/clients/gtkpaludis/queue_options.hh (renamed from src/gtkpaludis/queue_options.hh)0
-rw-r--r--src/clients/gtkpaludis/queue_page.cc (renamed from src/gtkpaludis/queue_page.cc)0
-rw-r--r--src/clients/gtkpaludis/queue_page.hh (renamed from src/gtkpaludis/queue_page.hh)0
-rwxr-xr-xsrc/clients/gtkpaludis/quit_TEST.py (renamed from src/gtkpaludis/quit_TEST.py)0
-rwxr-xr-xsrc/clients/gtkpaludis/quit_TEST_cleanup.sh (renamed from src/gtkpaludis/quit_TEST_cleanup.sh)0
-rwxr-xr-xsrc/clients/gtkpaludis/quit_TEST_setup.sh (renamed from src/gtkpaludis/quit_TEST_setup.sh)0
-rw-r--r--src/clients/gtkpaludis/repositories_list.cc (renamed from src/gtkpaludis/repositories_list.cc)0
-rw-r--r--src/clients/gtkpaludis/repositories_list.hh (renamed from src/gtkpaludis/repositories_list.hh)0
-rw-r--r--src/clients/gtkpaludis/repositories_page.cc (renamed from src/gtkpaludis/repositories_page.cc)0
-rw-r--r--src/clients/gtkpaludis/repositories_page.hh (renamed from src/gtkpaludis/repositories_page.hh)0
-rw-r--r--src/clients/gtkpaludis/repository_overview.cc (renamed from src/gtkpaludis/repository_overview.cc)0
-rw-r--r--src/clients/gtkpaludis/repository_overview.hh (renamed from src/gtkpaludis/repository_overview.hh)0
-rw-r--r--src/clients/gtkpaludis/set_overview.cc (renamed from src/gtkpaludis/set_overview.cc)0
-rw-r--r--src/clients/gtkpaludis/set_overview.hh (renamed from src/gtkpaludis/set_overview.hh)0
-rw-r--r--src/clients/gtkpaludis/sets_list.cc (renamed from src/gtkpaludis/sets_list.cc)0
-rw-r--r--src/clients/gtkpaludis/sets_list.hh (renamed from src/gtkpaludis/sets_list.hh)0
-rwxr-xr-xsrc/clients/gtkpaludis/sets_list_TEST.py (renamed from src/gtkpaludis/sets_list_TEST.py)0
-rwxr-xr-xsrc/clients/gtkpaludis/sets_list_TEST_cleanup.sh (renamed from src/gtkpaludis/sets_list_TEST_cleanup.sh)0
-rwxr-xr-xsrc/clients/gtkpaludis/sets_list_TEST_setup.sh (renamed from src/gtkpaludis/sets_list_TEST_setup.sh)0
-rw-r--r--src/clients/gtkpaludis/sets_page.cc (renamed from src/gtkpaludis/sets_page.cc)0
-rw-r--r--src/clients/gtkpaludis/sets_page.hh (renamed from src/gtkpaludis/sets_page.hh)0
-rw-r--r--src/clients/gtkpaludis/sync.cc (renamed from src/gtkpaludis/sync.cc)0
-rw-r--r--src/clients/gtkpaludis/sync.hh (renamed from src/gtkpaludis/sync.hh)2
-rw-r--r--src/clients/gtkpaludis/tasks_page.cc (renamed from src/gtkpaludis/tasks_page.cc)0
-rw-r--r--src/clients/gtkpaludis/tasks_page.hh (renamed from src/gtkpaludis/tasks_page.hh)0
-rwxr-xr-xsrc/clients/gtkpaludis/test_helper.bash (renamed from src/gtkpaludis/test_helper.bash)0
-rwxr-xr-xsrc/clients/gtkpaludis/version_TEST (renamed from src/gtkpaludis/version_TEST)0
-rw-r--r--src/clients/gtkpaludis/vtemm/Makefile.am (renamed from src/gtkpaludis/vtemm/Makefile.am)0
-rw-r--r--src/clients/gtkpaludis/vtemm/converts/Makefile.am (renamed from src/gtkpaludis/vtemm/converts/Makefile.am)0
-rw-r--r--src/clients/gtkpaludis/vtemm/converts/convert.m4 (renamed from src/gtkpaludis/vtemm/converts/convert.m4)0
-rw-r--r--src/clients/gtkpaludis/vtemm/converts/convert_base.m4 (renamed from src/gtkpaludis/vtemm/converts/convert_base.m4)0
-rw-r--r--src/clients/gtkpaludis/vtemm/defs/Makefile.am (renamed from src/gtkpaludis/vtemm/defs/Makefile.am)0
-rw-r--r--src/clients/gtkpaludis/vtemm/defs/enum.pl (renamed from src/gtkpaludis/vtemm/defs/enum.pl)0
-rw-r--r--src/clients/gtkpaludis/vtemm/defs/generate_defs_vte.cc (renamed from src/gtkpaludis/vtemm/defs/generate_defs_vte.cc)0
-rw-r--r--src/clients/gtkpaludis/vtemm/reaper.ccg (renamed from src/gtkpaludis/vtemm/reaper.ccg)0
-rw-r--r--src/clients/gtkpaludis/vtemm/reaper.hg (renamed from src/gtkpaludis/vtemm/reaper.hg)0
-rw-r--r--src/clients/gtkpaludis/vtemm/terminal_widget.ccg (renamed from src/gtkpaludis/vtemm/terminal_widget.ccg)0
-rw-r--r--src/clients/gtkpaludis/vtemm/terminal_widget.hg (renamed from src/gtkpaludis/vtemm/terminal_widget.hg)0
-rwxr-xr-xsrc/clients/gtkpaludis/yay_spi_TEST.py (renamed from src/gtkpaludis/yay_spi_TEST.py)0
-rw-r--r--src/clients/paludis/Makefile.am (renamed from src/paludis/Makefile.am)6
-rw-r--r--src/clients/paludis/applets.cc (renamed from src/paludis/applets.cc)2
-rw-r--r--src/clients/paludis/applets.hh (renamed from src/paludis/applets.hh)0
-rwxr-xr-xsrc/clients/paludis/args_from_environment_TEST (renamed from src/paludis/args_from_environment_TEST)0
-rw-r--r--src/clients/paludis/command_line.cc (renamed from src/paludis/command_line.cc)0
-rw-r--r--src/clients/paludis/command_line.hh (renamed from src/paludis/command_line.hh)0
-rw-r--r--src/clients/paludis/do_contents.cc (renamed from src/paludis/do_contents.cc)2
-rw-r--r--src/clients/paludis/do_contents.hh (renamed from src/paludis/do_contents.hh)0
-rwxr-xr-xsrc/clients/paludis/exception_TEST (renamed from src/paludis/exception_TEST)0
-rwxr-xr-xsrc/clients/paludis/help_TEST (renamed from src/paludis/help_TEST)0
-rw-r--r--src/clients/paludis/install.cc (renamed from src/paludis/install.cc)6
-rw-r--r--src/clients/paludis/install.hh (renamed from src/paludis/install.hh)0
-rwxr-xr-xsrc/clients/paludis/install_TEST (renamed from src/paludis/install_TEST)0
-rwxr-xr-xsrc/clients/paludis/install_TEST_cleanup.sh (renamed from src/paludis/install_TEST_cleanup.sh)0
-rwxr-xr-xsrc/clients/paludis/install_TEST_setup.sh (renamed from src/paludis/install_TEST_setup.sh)0
-rw-r--r--src/clients/paludis/list.cc (renamed from src/paludis/list.cc)2
-rw-r--r--src/clients/paludis/list.hh (renamed from src/paludis/list.hh)0
-rwxr-xr-xsrc/clients/paludis/list_dep_tag_categories_TEST (renamed from src/paludis/list_dep_tag_categories_TEST)0
-rwxr-xr-xsrc/clients/paludis/list_repository_formats_TEST (renamed from src/paludis/list_repository_formats_TEST)0
-rwxr-xr-xsrc/clients/paludis/list_sync_formats_TEST (renamed from src/paludis/list_sync_formats_TEST)0
-rw-r--r--src/clients/paludis/man_paludis.cc (renamed from src/paludis/man_paludis.cc)0
-rw-r--r--src/clients/paludis/news.cc (renamed from src/paludis/news.cc)2
-rw-r--r--src/clients/paludis/news.hh (renamed from src/paludis/news.hh)0
-rw-r--r--src/clients/paludis/owner.cc (renamed from src/paludis/owner.cc)2
-rw-r--r--src/clients/paludis/owner.hh (renamed from src/paludis/owner.hh)0
-rw-r--r--src/clients/paludis/paludis.cc (renamed from src/paludis/paludis.cc)2
-rw-r--r--src/clients/paludis/query.cc (renamed from src/paludis/query.cc)6
-rw-r--r--src/clients/paludis/query.hh (renamed from src/paludis/query.hh)0
-rw-r--r--src/clients/paludis/report.cc (renamed from src/paludis/report.cc)2
-rw-r--r--src/clients/paludis/report.hh (renamed from src/paludis/report.hh)0
-rw-r--r--src/clients/paludis/sync.cc (renamed from src/paludis/sync.cc)2
-rw-r--r--src/clients/paludis/sync.hh (renamed from src/paludis/sync.hh)0
-rw-r--r--src/clients/paludis/uninstall.cc (renamed from src/paludis/uninstall.cc)2
-rw-r--r--src/clients/paludis/uninstall.hh (renamed from src/paludis/uninstall.hh)0
-rwxr-xr-xsrc/clients/paludis/upgrade_TEST (renamed from src/paludis/upgrade_TEST)0
-rwxr-xr-xsrc/clients/paludis/upgrade_TEST_cleanup.sh (renamed from src/paludis/upgrade_TEST_cleanup.sh)0
-rwxr-xr-xsrc/clients/paludis/upgrade_TEST_setup.sh (renamed from src/paludis/upgrade_TEST_setup.sh)0
-rwxr-xr-xsrc/clients/paludis/version_TEST (renamed from src/paludis/version_TEST)0
-rw-r--r--src/clients/qualudis/Makefile.am (renamed from src/qualudis/Makefile.am)6
-rw-r--r--src/clients/qualudis/man_qualudis.cc (renamed from src/qualudis/man_qualudis.cc)0
-rw-r--r--src/clients/qualudis/qualudis.cc (renamed from src/qualudis/qualudis.cc)2
-rw-r--r--src/clients/qualudis/qualudis_command_line.cc (renamed from src/qualudis/qualudis_command_line.cc)0
-rw-r--r--src/clients/qualudis/qualudis_command_line.hh (renamed from src/qualudis/qualudis_command_line.hh)0
-rw-r--r--src/common_args/Makefile.am8
-rw-r--r--src/common_args/debug_build_arg.cc46
-rw-r--r--src/common_args/debug_build_arg.hh42
-rw-r--r--src/output/Makefile.am25
-rw-r--r--src/output/colour.cc (renamed from src/colour.cc)0
-rw-r--r--src/output/colour.hh (renamed from src/colour.hh)0
-rw-r--r--src/output/console_install_task.cc (renamed from src/console_install_task.cc)2
-rw-r--r--src/output/console_install_task.hh (renamed from src/console_install_task.hh)4
-rw-r--r--src/output/console_install_task.sr (renamed from src/console_install_task.sr)0
-rw-r--r--src/output/licence.cc (renamed from src/licence.cc)0
-rw-r--r--src/output/licence.hh (renamed from src/licence.hh)0
-rw-r--r--src/output/use_flag_pretty_printer.cc (renamed from src/use_flag_pretty_printer.cc)0
-rw-r--r--src/output/use_flag_pretty_printer.hh (renamed from src/use_flag_pretty_printer.hh)0
171 files changed, 190 insertions, 76 deletions
diff --git a/configure.ac b/configure.ac
index ccdf02e..9b2aa8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -819,15 +819,18 @@ AC_OUTPUT(
ruby/Makefile
ruby/demos/Makefile
src/Makefile
- src/contrarius/Makefile
- src/paludis/Makefile
- src/gtkpaludis/Makefile
- src/gtkpaludis/cellrendererbutton/Makefile
- src/gtkpaludis/vtemm/Makefile
- src/gtkpaludis/vtemm/converts/Makefile
- src/gtkpaludis/vtemm/defs/Makefile
- src/qualudis/Makefile
- src/adjutrix/Makefile
+ src/output/Makefile
+ src/common_args/Makefile
+ src/clients/Makefile
+ src/clients/contrarius/Makefile
+ src/clients/paludis/Makefile
+ src/clients/gtkpaludis/Makefile
+ src/clients/gtkpaludis/cellrendererbutton/Makefile
+ src/clients/gtkpaludis/vtemm/Makefile
+ src/clients/gtkpaludis/vtemm/converts/Makefile
+ src/clients/gtkpaludis/vtemm/defs/Makefile
+ src/clients/qualudis/Makefile
+ src/clients/adjutrix/Makefile
test/Makefile
zsh-completion/Makefile
)
diff --git a/src/Makefile.am b/src/Makefile.am
index 51291ff..0ff1388 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,28 +1,7 @@
-SUBDIRS = . $(BUILD_CLIENTS)
-DIST_SUBDIRS = . $(ALL_CLIENTS)
+SUBDIRS = output common_args clients
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
-DISTCLEANFILES = console_install_task-sr.hh console_install_task-sr.cc
MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = console_install_task.sr console_install_task-sr.hh console_install_task-sr.cc
-BUILT_SOURCES = console_install_task-sr.hh console_install_task-sr.cc
-
-noinst_LIBRARIES = liboutput.a
-liboutput_a_SOURCES = \
- colour.cc colour.hh \
- console_install_task.cc console_install_task.hh \
- use_flag_pretty_printer.cc use_flag_pretty_printer.hh \
- licence.cc licence.hh
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
-console_install_task-sr.hh : console_install_task.sr $(top_srcdir)/misc/make_sr.bash
- $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/console_install_task.sr > $@
-
-console_install_task-sr.cc : console_install_task.sr $(top_srcdir)/misc/make_sr.bash
- $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/console_install_task.sr > $@
-
-
diff --git a/src/clients/Makefile.am b/src/clients/Makefile.am
new file mode 100644
index 0000000..09aee41
--- /dev/null
+++ b/src/clients/Makefile.am
@@ -0,0 +1,11 @@
+SUBDIRS = . $(BUILD_CLIENTS)
+DIST_SUBDIRS = . $(ALL_CLIENTS)
+
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@
+
+built-sources : $(BUILT_SOURCES)
+ for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
+
diff --git a/src/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am
index 36e3cee..de550ae 100644
--- a/src/adjutrix/Makefile.am
+++ b/src/clients/adjutrix/Makefile.am
@@ -23,7 +23,7 @@ man_adjutrix_SOURCES = \
man_adjutrix_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/src/liboutput.a \
+ $(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
adjutrix_SOURCES = \
@@ -46,7 +46,7 @@ adjutrix_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
- $(top_builddir)/src/liboutput.a \
+ $(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
TESTS_ENVIRONMENT = env \
diff --git a/src/adjutrix/adjutrix.cc b/src/clients/adjutrix/adjutrix.cc
index 4fbfd54..f689770 100644
--- a/src/adjutrix/adjutrix.cc
+++ b/src/clients/adjutrix/adjutrix.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "colour.hh"
+#include <output/colour.hh>
#include "command_line.hh"
#include "find_stable_candidates.hh"
#include "find_dropped_keywords.hh"
diff --git a/src/adjutrix/args_from_environment_TEST b/src/clients/adjutrix/args_from_environment_TEST
index 00b0489..00b0489 100755
--- a/src/adjutrix/args_from_environment_TEST
+++ b/src/clients/adjutrix/args_from_environment_TEST
diff --git a/src/adjutrix/command_line.cc b/src/clients/adjutrix/command_line.cc
index 2aea616..2aea616 100644
--- a/src/adjutrix/command_line.cc
+++ b/src/clients/adjutrix/command_line.cc
diff --git a/src/adjutrix/command_line.hh b/src/clients/adjutrix/command_line.hh
index 8efd519..8efd519 100644
--- a/src/adjutrix/command_line.hh
+++ b/src/clients/adjutrix/command_line.hh
diff --git a/src/adjutrix/display_default_system_resolution.cc b/src/clients/adjutrix/display_default_system_resolution.cc
index 314f9c2..a5d4a29 100644
--- a/src/adjutrix/display_default_system_resolution.cc
+++ b/src/clients/adjutrix/display_default_system_resolution.cc
@@ -19,7 +19,7 @@
#include "display_default_system_resolution.hh"
#include "command_line.hh"
-#include "colour.hh"
+#include <output/colour.hh>
#include <paludis/config_file.hh>
#include <paludis/repositories/portage/portage_repository.hh>
#include <paludis/util/log.hh>
diff --git a/src/adjutrix/display_default_system_resolution.hh b/src/clients/adjutrix/display_default_system_resolution.hh
index 6d6c340..6d6c340 100644
--- a/src/adjutrix/display_default_system_resolution.hh
+++ b/src/clients/adjutrix/display_default_system_resolution.hh
diff --git a/src/adjutrix/display_profiles_use.cc b/src/clients/adjutrix/display_profiles_use.cc
index d3f1d39..6935d07 100644
--- a/src/adjutrix/display_profiles_use.cc
+++ b/src/clients/adjutrix/display_profiles_use.cc
@@ -19,7 +19,7 @@
#include "display_profiles_use.hh"
#include "command_line.hh"
-#include "colour.hh"
+#include <output/colour.hh>
#include <paludis/config_file.hh>
#include <paludis/repositories/portage/portage_repository.hh>
#include <paludis/util/log.hh>
diff --git a/src/adjutrix/display_profiles_use.hh b/src/clients/adjutrix/display_profiles_use.hh
index 8a5b4e0..8a5b4e0 100644
--- a/src/adjutrix/display_profiles_use.hh
+++ b/src/clients/adjutrix/display_profiles_use.hh
diff --git a/src/adjutrix/find_dropped_keywords.cc b/src/clients/adjutrix/find_dropped_keywords.cc
index e8e2643..e8e2643 100644
--- a/src/adjutrix/find_dropped_keywords.cc
+++ b/src/clients/adjutrix/find_dropped_keywords.cc
diff --git a/src/adjutrix/find_dropped_keywords.hh b/src/clients/adjutrix/find_dropped_keywords.hh
index e6bbe22..e6bbe22 100644
--- a/src/adjutrix/find_dropped_keywords.hh
+++ b/src/clients/adjutrix/find_dropped_keywords.hh
diff --git a/src/adjutrix/find_dropped_keywords.sr b/src/clients/adjutrix/find_dropped_keywords.sr
index b197b2a..b197b2a 100644
--- a/src/adjutrix/find_dropped_keywords.sr
+++ b/src/clients/adjutrix/find_dropped_keywords.sr
diff --git a/src/adjutrix/find_insecure_packages.cc b/src/clients/adjutrix/find_insecure_packages.cc
index 9cb5b53..9cb5b53 100644
--- a/src/adjutrix/find_insecure_packages.cc
+++ b/src/clients/adjutrix/find_insecure_packages.cc
diff --git a/src/adjutrix/find_insecure_packages.hh b/src/clients/adjutrix/find_insecure_packages.hh
index a8c1cc0..a8c1cc0 100644
--- a/src/adjutrix/find_insecure_packages.hh
+++ b/src/clients/adjutrix/find_insecure_packages.hh
diff --git a/src/adjutrix/find_reverse_deps.cc b/src/clients/adjutrix/find_reverse_deps.cc
index e0b7285..c7fe91c 100644
--- a/src/adjutrix/find_reverse_deps.cc
+++ b/src/clients/adjutrix/find_reverse_deps.cc
@@ -19,7 +19,7 @@
#include "find_reverse_deps.hh"
#include "command_line.hh"
-#include "colour.hh"
+#include <output/colour.hh>
#include <paludis/util/compare.hh>
#include <paludis/util/collection_concrete.hh>
diff --git a/src/adjutrix/find_reverse_deps.hh b/src/clients/adjutrix/find_reverse_deps.hh
index 048b1f5..048b1f5 100644
--- a/src/adjutrix/find_reverse_deps.hh
+++ b/src/clients/adjutrix/find_reverse_deps.hh
diff --git a/src/adjutrix/find_stable_candidates.cc b/src/clients/adjutrix/find_stable_candidates.cc
index 9d26c7d..9d26c7d 100644
--- a/src/adjutrix/find_stable_candidates.cc
+++ b/src/clients/adjutrix/find_stable_candidates.cc
diff --git a/src/adjutrix/find_stable_candidates.hh b/src/clients/adjutrix/find_stable_candidates.hh
index 2860975..2860975 100644
--- a/src/adjutrix/find_stable_candidates.hh
+++ b/src/clients/adjutrix/find_stable_candidates.hh
diff --git a/src/adjutrix/find_stable_candidates.sr b/src/clients/adjutrix/find_stable_candidates.sr
index 9172a89..9172a89 100644
--- a/src/adjutrix/find_stable_candidates.sr
+++ b/src/clients/adjutrix/find_stable_candidates.sr
diff --git a/src/adjutrix/find_stable_candidates_TEST b/src/clients/adjutrix/find_stable_candidates_TEST
index 9ae9850..9ae9850 100755
--- a/src/adjutrix/find_stable_candidates_TEST
+++ b/src/clients/adjutrix/find_stable_candidates_TEST
diff --git a/src/adjutrix/find_stable_candidates_TEST_cleanup.sh b/src/clients/adjutrix/find_stable_candidates_TEST_cleanup.sh
index 1bdc7c1..1bdc7c1 100755
--- a/src/adjutrix/find_stable_candidates_TEST_cleanup.sh
+++ b/src/clients/adjutrix/find_stable_candidates_TEST_cleanup.sh
diff --git a/src/adjutrix/find_stable_candidates_TEST_setup.sh b/src/clients/adjutrix/find_stable_candidates_TEST_setup.sh
index 2e4855f..2e4855f 100755
--- a/src/adjutrix/find_stable_candidates_TEST_setup.sh
+++ b/src/clients/adjutrix/find_stable_candidates_TEST_setup.sh
diff --git a/src/adjutrix/help_TEST b/src/clients/adjutrix/help_TEST
index 7694394..7694394 100755
--- a/src/adjutrix/help_TEST
+++ b/src/clients/adjutrix/help_TEST
diff --git a/src/adjutrix/keywords_graph.cc b/src/clients/adjutrix/keywords_graph.cc
index f4fef80..901ae1a 100644
--- a/src/adjutrix/keywords_graph.cc
+++ b/src/clients/adjutrix/keywords_graph.cc
@@ -19,7 +19,7 @@
#include "keywords_graph.hh"
#include "command_line.hh"
-#include "colour.hh"
+#include <output/colour.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/compare.hh>
diff --git a/src/adjutrix/keywords_graph.hh b/src/clients/adjutrix/keywords_graph.hh
index 7376143..7376143 100644
--- a/src/adjutrix/keywords_graph.hh
+++ b/src/clients/adjutrix/keywords_graph.hh
diff --git a/src/adjutrix/man_adjutrix.cc b/src/clients/adjutrix/man_adjutrix.cc
index d36aa1d..d36aa1d 100644
--- a/src/adjutrix/man_adjutrix.cc
+++ b/src/clients/adjutrix/man_adjutrix.cc
diff --git a/src/adjutrix/version_TEST b/src/clients/adjutrix/version_TEST
index 7d5c45e..7d5c45e 100755
--- a/src/adjutrix/version_TEST
+++ b/src/clients/adjutrix/version_TEST
diff --git a/src/contrarius/Makefile.am b/src/clients/contrarius/Makefile.am
index e1fd9f2..a5e833d 100644
--- a/src/contrarius/Makefile.am
+++ b/src/clients/contrarius/Makefile.am
@@ -30,7 +30,7 @@ contrarius_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
- $(top_builddir)/src/liboutput.a \
+ $(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
contrarius_stage_options-sr.hh : contrarius_stage_options.sr $(top_srcdir)/misc/make_sr.bash
@@ -64,7 +64,7 @@ man_contrarius_SOURCES = \
man_contrarius_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/src/liboutput.a \
+ $(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
CLEANFILES = *~ version_TEST gmon.out *.gcov *.gcno *.gcda
diff --git a/src/contrarius/command_line.cc b/src/clients/contrarius/command_line.cc
index 15ed0a8..15ed0a8 100644
--- a/src/contrarius/command_line.cc
+++ b/src/clients/contrarius/command_line.cc
diff --git a/src/contrarius/command_line.hh b/src/clients/contrarius/command_line.hh
index 797168f..797168f 100644
--- a/src/contrarius/command_line.hh
+++ b/src/clients/contrarius/command_line.hh
diff --git a/src/contrarius/contrarius.cc b/src/clients/contrarius/contrarius.cc
index ced1f3b..ced1f3b 100644
--- a/src/contrarius/contrarius.cc
+++ b/src/clients/contrarius/contrarius.cc
diff --git a/src/contrarius/contrarius_stage_options.sr b/src/clients/contrarius/contrarius_stage_options.sr
index 1fa8aa7..1fa8aa7 100644
--- a/src/contrarius/contrarius_stage_options.sr
+++ b/src/clients/contrarius/contrarius_stage_options.sr
diff --git a/src/contrarius/install.cc b/src/clients/contrarius/install.cc
index c86b4b7..8fe984d 100644
--- a/src/contrarius/install.cc
+++ b/src/clients/contrarius/install.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "colour.hh"
#include "install.hh"
-#include "licence.hh"
-#include "console_install_task.hh"
+#include <src/output/colour.hh>
+#include <src/output/console_install_task.hh>
+#include <src/output/licence.hh>
#include <iostream>
#include <limits>
diff --git a/src/contrarius/install.hh b/src/clients/contrarius/install.hh
index 30ba877..30ba877 100644
--- a/src/contrarius/install.hh
+++ b/src/clients/contrarius/install.hh
diff --git a/src/contrarius/man_contrarius.cc b/src/clients/contrarius/man_contrarius.cc
index 89c480e..89c480e 100644
--- a/src/contrarius/man_contrarius.cc
+++ b/src/clients/contrarius/man_contrarius.cc
diff --git a/src/contrarius/stage.cc b/src/clients/contrarius/stage.cc
index a9e6d69..b995003 100644
--- a/src/contrarius/stage.cc
+++ b/src/clients/contrarius/stage.cc
@@ -39,7 +39,7 @@ namespace
}
}
-#include <src/contrarius/contrarius_stage_options-sr.cc>
+#include <src/clients/contrarius/contrarius_stage_options-sr.cc>
ContrariusStageOptions::ContrariusStageOptions(const HostTupleName & _target,
const std::string & binutils_name,
diff --git a/src/contrarius/stage.hh b/src/clients/contrarius/stage.hh
index 098d7c8..315bc41 100644
--- a/src/contrarius/stage.hh
+++ b/src/clients/contrarius/stage.hh
@@ -29,7 +29,7 @@
namespace paludis
{
-#include <src/contrarius/contrarius_stage_options-sr.hh>
+#include <src/clients/contrarius/contrarius_stage_options-sr.hh>
class ContrariusStage :
public StageBase
diff --git a/src/contrarius/stage_builder.cc b/src/clients/contrarius/stage_builder.cc
index 487cbae..ba52d7e 100644
--- a/src/contrarius/stage_builder.cc
+++ b/src/clients/contrarius/stage_builder.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/tasks/stage_builder_task.hh>
-#include <src/contrarius/stage.hh>
-#include <src/contrarius/stage_builder.hh>
-#include <src/colour.hh>
+#include <src/clients/contrarius/stage.hh>
+#include <src/clients/contrarius/stage_builder.hh>
+#include <src/output/colour.hh>
#include <iostream>
#include <list>
diff --git a/src/contrarius/stage_builder.hh b/src/clients/contrarius/stage_builder.hh
index da147d8..9c7662d 100644
--- a/src/contrarius/stage_builder.hh
+++ b/src/clients/contrarius/stage_builder.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_SRC_CONTRARIUS_STAGE_BUILDER_HH 1
#include <paludis/tasks/stage_builder_task.hh>
-#include <src/contrarius/stage.hh>
+#include <src/clients/contrarius/stage.hh>
#include <string>
namespace paludis
diff --git a/src/gtkpaludis/Makefile.am b/src/clients/gtkpaludis/Makefile.am
index da6de58..442c604 100644
--- a/src/gtkpaludis/Makefile.am
+++ b/src/clients/gtkpaludis/Makefile.am
@@ -59,7 +59,7 @@ gtkpaludis_SOURCES = \
gtkpaludis.cc
gtkpaludis_LDADD = \
- $(top_builddir)/src/gtkpaludis/vtemm/libvtemm.a \
+ $(top_builddir)/src/clients/gtkpaludis/vtemm/libvtemm.a \
$(top_builddir)/paludis/tasks/libpaludistasks.a \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
diff --git a/src/gtkpaludis/categories_list.cc b/src/clients/gtkpaludis/categories_list.cc
index 8e9ea4f..8e9ea4f 100644
--- a/src/gtkpaludis/categories_list.cc
+++ b/src/clients/gtkpaludis/categories_list.cc
diff --git a/src/gtkpaludis/categories_list.hh b/src/clients/gtkpaludis/categories_list.hh
index 74c818e..74c818e 100644
--- a/src/gtkpaludis/categories_list.hh
+++ b/src/clients/gtkpaludis/categories_list.hh
diff --git a/src/gtkpaludis/cellrendererbutton/Makefile.am b/src/clients/gtkpaludis/cellrendererbutton/Makefile.am
index 3476902..3476902 100644
--- a/src/gtkpaludis/cellrendererbutton/Makefile.am
+++ b/src/clients/gtkpaludis/cellrendererbutton/Makefile.am
diff --git a/src/gtkpaludis/cellrendererbutton/cellrendererbutton.cc b/src/clients/gtkpaludis/cellrendererbutton/cellrendererbutton.cc
index 4104663..4104663 100644
--- a/src/gtkpaludis/cellrendererbutton/cellrendererbutton.cc
+++ b/src/clients/gtkpaludis/cellrendererbutton/cellrendererbutton.cc
diff --git a/src/gtkpaludis/cellrendererbutton/cellrendererbutton.hh b/src/clients/gtkpaludis/cellrendererbutton/cellrendererbutton.hh
index 7aec3dd..7aec3dd 100644
--- a/src/gtkpaludis/cellrendererbutton/cellrendererbutton.hh
+++ b/src/clients/gtkpaludis/cellrendererbutton/cellrendererbutton.hh
diff --git a/src/gtkpaludis/command_line.cc b/src/clients/gtkpaludis/command_line.cc
index 3016e10..3016e10 100644
--- a/src/gtkpaludis/command_line.cc
+++ b/src/clients/gtkpaludis/command_line.cc
diff --git a/src/gtkpaludis/command_line.hh b/src/clients/gtkpaludis/command_line.hh
index 42422ab..42422ab 100644
--- a/src/gtkpaludis/command_line.hh
+++ b/src/clients/gtkpaludis/command_line.hh
diff --git a/src/gtkpaludis/config_suffix_TEST.py b/src/clients/gtkpaludis/config_suffix_TEST.py
index 4ef4fb6..4ef4fb6 100755
--- a/src/gtkpaludis/config_suffix_TEST.py
+++ b/src/clients/gtkpaludis/config_suffix_TEST.py
diff --git a/src/gtkpaludis/gtkpaludis.cc b/src/clients/gtkpaludis/gtkpaludis.cc
index 0dcacbf..0dcacbf 100644
--- a/src/gtkpaludis/gtkpaludis.cc
+++ b/src/clients/gtkpaludis/gtkpaludis.cc
diff --git a/src/gtkpaludis/help_TEST b/src/clients/gtkpaludis/help_TEST
index e2e1fa0..e2e1fa0 100755
--- a/src/gtkpaludis/help_TEST
+++ b/src/clients/gtkpaludis/help_TEST
diff --git a/src/gtkpaludis/install.cc b/src/clients/gtkpaludis/install.cc
index 4d2d7f0..4d2d7f0 100644
--- a/src/gtkpaludis/install.cc
+++ b/src/clients/gtkpaludis/install.cc
diff --git a/src/gtkpaludis/install.hh b/src/clients/gtkpaludis/install.hh
index 9f080eb..9f080eb 100644
--- a/src/gtkpaludis/install.hh
+++ b/src/clients/gtkpaludis/install.hh
diff --git a/src/gtkpaludis/main_window.cc b/src/clients/gtkpaludis/main_window.cc
index ff29aa7..ff29aa7 100644
--- a/src/gtkpaludis/main_window.cc
+++ b/src/clients/gtkpaludis/main_window.cc
diff --git a/src/gtkpaludis/main_window.hh b/src/clients/gtkpaludis/main_window.hh
index 6b37833..6b37833 100644
--- a/src/gtkpaludis/main_window.hh
+++ b/src/clients/gtkpaludis/main_window.hh
diff --git a/src/gtkpaludis/menu.cc b/src/clients/gtkpaludis/menu.cc
index 1c7c20c..1c7c20c 100644
--- a/src/gtkpaludis/menu.cc
+++ b/src/clients/gtkpaludis/menu.cc
diff --git a/src/gtkpaludis/menu.hh b/src/clients/gtkpaludis/menu.hh
index f0e4634..f0e4634 100644
--- a/src/gtkpaludis/menu.hh
+++ b/src/clients/gtkpaludis/menu.hh
diff --git a/src/gtkpaludis/messages.cc b/src/clients/gtkpaludis/messages.cc
index a5aeac1..a5aeac1 100644
--- a/src/gtkpaludis/messages.cc
+++ b/src/clients/gtkpaludis/messages.cc
diff --git a/src/gtkpaludis/messages.hh b/src/clients/gtkpaludis/messages.hh
index 0f6ee81..0f6ee81 100644
--- a/src/gtkpaludis/messages.hh
+++ b/src/clients/gtkpaludis/messages.hh
diff --git a/src/gtkpaludis/package_info.cc b/src/clients/gtkpaludis/package_info.cc
index edbfee6..edbfee6 100644
--- a/src/gtkpaludis/package_info.cc
+++ b/src/clients/gtkpaludis/package_info.cc
diff --git a/src/gtkpaludis/package_info.hh b/src/clients/gtkpaludis/package_info.hh
index 629e020..629e020 100644
--- a/src/gtkpaludis/package_info.hh
+++ b/src/clients/gtkpaludis/package_info.hh
diff --git a/src/gtkpaludis/package_overview.cc b/src/clients/gtkpaludis/package_overview.cc
index be00d8a..be00d8a 100644
--- a/src/gtkpaludis/package_overview.cc
+++ b/src/clients/gtkpaludis/package_overview.cc
diff --git a/src/gtkpaludis/package_overview.hh b/src/clients/gtkpaludis/package_overview.hh
index 3f569e8..3f569e8 100644
--- a/src/gtkpaludis/package_overview.hh
+++ b/src/clients/gtkpaludis/package_overview.hh
diff --git a/src/gtkpaludis/packages_list.cc b/src/clients/gtkpaludis/packages_list.cc
index 319df52..319df52 100644
--- a/src/gtkpaludis/packages_list.cc
+++ b/src/clients/gtkpaludis/packages_list.cc
diff --git a/src/gtkpaludis/packages_list.hh b/src/clients/gtkpaludis/packages_list.hh
index c794353..c794353 100644
--- a/src/gtkpaludis/packages_list.hh
+++ b/src/clients/gtkpaludis/packages_list.hh
diff --git a/src/gtkpaludis/packages_list.sr b/src/clients/gtkpaludis/packages_list.sr
index 4f6e4a6..4f6e4a6 100644
--- a/src/gtkpaludis/packages_list.sr
+++ b/src/clients/gtkpaludis/packages_list.sr
diff --git a/src/gtkpaludis/packages_page.cc b/src/clients/gtkpaludis/packages_page.cc
index 05ef7c7..05ef7c7 100644
--- a/src/gtkpaludis/packages_page.cc
+++ b/src/clients/gtkpaludis/packages_page.cc
diff --git a/src/gtkpaludis/packages_page.hh b/src/clients/gtkpaludis/packages_page.hh
index 50cdbce..50cdbce 100644
--- a/src/gtkpaludis/packages_page.hh
+++ b/src/clients/gtkpaludis/packages_page.hh
diff --git a/src/gtkpaludis/paludis_thread.cc b/src/clients/gtkpaludis/paludis_thread.cc
index 8657953..8657953 100644
--- a/src/gtkpaludis/paludis_thread.cc
+++ b/src/clients/gtkpaludis/paludis_thread.cc
diff --git a/src/gtkpaludis/paludis_thread.hh b/src/clients/gtkpaludis/paludis_thread.hh
index 0e7c55e..0e7c55e 100644
--- a/src/gtkpaludis/paludis_thread.hh
+++ b/src/clients/gtkpaludis/paludis_thread.hh
diff --git a/src/gtkpaludis/prod-x-server.cc b/src/clients/gtkpaludis/prod-x-server.cc
index ba704a7..ba704a7 100644
--- a/src/gtkpaludis/prod-x-server.cc
+++ b/src/clients/gtkpaludis/prod-x-server.cc
diff --git a/src/gtkpaludis/queue_list.cc b/src/clients/gtkpaludis/queue_list.cc
index 26df2d9..26df2d9 100644
--- a/src/gtkpaludis/queue_list.cc
+++ b/src/clients/gtkpaludis/queue_list.cc
diff --git a/src/gtkpaludis/queue_list.hh b/src/clients/gtkpaludis/queue_list.hh
index a6d068a..a6d068a 100644
--- a/src/gtkpaludis/queue_list.hh
+++ b/src/clients/gtkpaludis/queue_list.hh
diff --git a/src/gtkpaludis/queue_options.cc b/src/clients/gtkpaludis/queue_options.cc
index 3c80053..3c80053 100644
--- a/src/gtkpaludis/queue_options.cc
+++ b/src/clients/gtkpaludis/queue_options.cc
diff --git a/src/gtkpaludis/queue_options.hh b/src/clients/gtkpaludis/queue_options.hh
index 6a5ae35..6a5ae35 100644
--- a/src/gtkpaludis/queue_options.hh
+++ b/src/clients/gtkpaludis/queue_options.hh
diff --git a/src/gtkpaludis/queue_page.cc b/src/clients/gtkpaludis/queue_page.cc
index d3b37a1..d3b37a1 100644
--- a/src/gtkpaludis/queue_page.cc
+++ b/src/clients/gtkpaludis/queue_page.cc
diff --git a/src/gtkpaludis/queue_page.hh b/src/clients/gtkpaludis/queue_page.hh
index 6e0bda9..6e0bda9 100644
--- a/src/gtkpaludis/queue_page.hh
+++ b/src/clients/gtkpaludis/queue_page.hh
diff --git a/src/gtkpaludis/quit_TEST.py b/src/clients/gtkpaludis/quit_TEST.py
index 9b23acb..9b23acb 100755
--- a/src/gtkpaludis/quit_TEST.py
+++ b/src/clients/gtkpaludis/quit_TEST.py
diff --git a/src/gtkpaludis/quit_TEST_cleanup.sh b/src/clients/gtkpaludis/quit_TEST_cleanup.sh
index 253db39..253db39 100755
--- a/src/gtkpaludis/quit_TEST_cleanup.sh
+++ b/src/clients/gtkpaludis/quit_TEST_cleanup.sh
diff --git a/src/gtkpaludis/quit_TEST_setup.sh b/src/clients/gtkpaludis/quit_TEST_setup.sh
index 216b4dd..216b4dd 100755
--- a/src/gtkpaludis/quit_TEST_setup.sh
+++ b/src/clients/gtkpaludis/quit_TEST_setup.sh
diff --git a/src/gtkpaludis/repositories_list.cc b/src/clients/gtkpaludis/repositories_list.cc
index f8a1c94..f8a1c94 100644
--- a/src/gtkpaludis/repositories_list.cc
+++ b/src/clients/gtkpaludis/repositories_list.cc
diff --git a/src/gtkpaludis/repositories_list.hh b/src/clients/gtkpaludis/repositories_list.hh
index 8ddc3c4..8ddc3c4 100644
--- a/src/gtkpaludis/repositories_list.hh
+++ b/src/clients/gtkpaludis/repositories_list.hh
diff --git a/src/gtkpaludis/repositories_page.cc b/src/clients/gtkpaludis/repositories_page.cc
index 5388c70..5388c70 100644
--- a/src/gtkpaludis/repositories_page.cc
+++ b/src/clients/gtkpaludis/repositories_page.cc
diff --git a/src/gtkpaludis/repositories_page.hh b/src/clients/gtkpaludis/repositories_page.hh
index 8c97429..8c97429 100644
--- a/src/gtkpaludis/repositories_page.hh
+++ b/src/clients/gtkpaludis/repositories_page.hh
diff --git a/src/gtkpaludis/repository_overview.cc b/src/clients/gtkpaludis/repository_overview.cc
index 13c7ca7..13c7ca7 100644
--- a/src/gtkpaludis/repository_overview.cc
+++ b/src/clients/gtkpaludis/repository_overview.cc
diff --git a/src/gtkpaludis/repository_overview.hh b/src/clients/gtkpaludis/repository_overview.hh
index fd60883..fd60883 100644
--- a/src/gtkpaludis/repository_overview.hh
+++ b/src/clients/gtkpaludis/repository_overview.hh
diff --git a/src/gtkpaludis/set_overview.cc b/src/clients/gtkpaludis/set_overview.cc
index 77b6ddd..77b6ddd 100644
--- a/src/gtkpaludis/set_overview.cc
+++ b/src/clients/gtkpaludis/set_overview.cc
diff --git a/src/gtkpaludis/set_overview.hh b/src/clients/gtkpaludis/set_overview.hh
index a494111..a494111 100644
--- a/src/gtkpaludis/set_overview.hh
+++ b/src/clients/gtkpaludis/set_overview.hh
diff --git a/src/gtkpaludis/sets_list.cc b/src/clients/gtkpaludis/sets_list.cc
index 307117a..307117a 100644
--- a/src/gtkpaludis/sets_list.cc
+++ b/src/clients/gtkpaludis/sets_list.cc
diff --git a/src/gtkpaludis/sets_list.hh b/src/clients/gtkpaludis/sets_list.hh
index c2d9068..c2d9068 100644
--- a/src/gtkpaludis/sets_list.hh
+++ b/src/clients/gtkpaludis/sets_list.hh
diff --git a/src/gtkpaludis/sets_list_TEST.py b/src/clients/gtkpaludis/sets_list_TEST.py
index cdedb70..cdedb70 100755
--- a/src/gtkpaludis/sets_list_TEST.py
+++ b/src/clients/gtkpaludis/sets_list_TEST.py
diff --git a/src/gtkpaludis/sets_list_TEST_cleanup.sh b/src/clients/gtkpaludis/sets_list_TEST_cleanup.sh
index 9f5ebc3..9f5ebc3 100755
--- a/src/gtkpaludis/sets_list_TEST_cleanup.sh
+++ b/src/clients/gtkpaludis/sets_list_TEST_cleanup.sh
diff --git a/src/gtkpaludis/sets_list_TEST_setup.sh b/src/clients/gtkpaludis/sets_list_TEST_setup.sh
index 4d89e89..4d89e89 100755
--- a/src/gtkpaludis/sets_list_TEST_setup.sh
+++ b/src/clients/gtkpaludis/sets_list_TEST_setup.sh
diff --git a/src/gtkpaludis/sets_page.cc b/src/clients/gtkpaludis/sets_page.cc
index 499bb38..499bb38 100644
--- a/src/gtkpaludis/sets_page.cc
+++ b/src/clients/gtkpaludis/sets_page.cc
diff --git a/src/gtkpaludis/sets_page.hh b/src/clients/gtkpaludis/sets_page.hh
index deef856..deef856 100644
--- a/src/gtkpaludis/sets_page.hh
+++ b/src/clients/gtkpaludis/sets_page.hh
diff --git a/src/gtkpaludis/sync.cc b/src/clients/gtkpaludis/sync.cc
index 385b587..385b587 100644
--- a/src/gtkpaludis/sync.cc
+++ b/src/clients/gtkpaludis/sync.cc
diff --git a/src/gtkpaludis/sync.hh b/src/clients/gtkpaludis/sync.hh
index 5243b96..de98a3d 100644
--- a/src/gtkpaludis/sync.hh
+++ b/src/clients/gtkpaludis/sync.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_SRC_GTKPALUDIS_SYNC_HH 1
#include <paludis/tasks/sync_task.hh>
-#include <src/gtkpaludis/paludis_thread.hh>
+#include <src/clients/gtkpaludis/paludis_thread.hh>
namespace gtkpaludis
{
diff --git a/src/gtkpaludis/tasks_page.cc b/src/clients/gtkpaludis/tasks_page.cc
index fa6cf04..fa6cf04 100644
--- a/src/gtkpaludis/tasks_page.cc
+++ b/src/clients/gtkpaludis/tasks_page.cc
diff --git a/src/gtkpaludis/tasks_page.hh b/src/clients/gtkpaludis/tasks_page.hh
index 262b824..262b824 100644
--- a/src/gtkpaludis/tasks_page.hh
+++ b/src/clients/gtkpaludis/tasks_page.hh
diff --git a/src/gtkpaludis/test_helper.bash b/src/clients/gtkpaludis/test_helper.bash
index ed9e9a3..ed9e9a3 100755
--- a/src/gtkpaludis/test_helper.bash
+++ b/src/clients/gtkpaludis/test_helper.bash
diff --git a/src/gtkpaludis/version_TEST b/src/clients/gtkpaludis/version_TEST
index a27cd03..a27cd03 100755
--- a/src/gtkpaludis/version_TEST
+++ b/src/clients/gtkpaludis/version_TEST
diff --git a/src/gtkpaludis/vtemm/Makefile.am b/src/clients/gtkpaludis/vtemm/Makefile.am
index 2230723..2230723 100644
--- a/src/gtkpaludis/vtemm/Makefile.am
+++ b/src/clients/gtkpaludis/vtemm/Makefile.am
diff --git a/src/gtkpaludis/vtemm/converts/Makefile.am b/src/clients/gtkpaludis/vtemm/converts/Makefile.am
index ea65efb..ea65efb 100644
--- a/src/gtkpaludis/vtemm/converts/Makefile.am
+++ b/src/clients/gtkpaludis/vtemm/converts/Makefile.am
diff --git a/src/gtkpaludis/vtemm/converts/convert.m4 b/src/clients/gtkpaludis/vtemm/converts/convert.m4
index 319807e..319807e 100644
--- a/src/gtkpaludis/vtemm/converts/convert.m4
+++ b/src/clients/gtkpaludis/vtemm/converts/convert.m4
diff --git a/src/gtkpaludis/vtemm/converts/convert_base.m4 b/src/clients/gtkpaludis/vtemm/converts/convert_base.m4
index feaf583..feaf583 100644
--- a/src/gtkpaludis/vtemm/converts/convert_base.m4
+++ b/src/clients/gtkpaludis/vtemm/converts/convert_base.m4
diff --git a/src/gtkpaludis/vtemm/defs/Makefile.am b/src/clients/gtkpaludis/vtemm/defs/Makefile.am
index a741900..a741900 100644
--- a/src/gtkpaludis/vtemm/defs/Makefile.am
+++ b/src/clients/gtkpaludis/vtemm/defs/Makefile.am
diff --git a/src/gtkpaludis/vtemm/defs/enum.pl b/src/clients/gtkpaludis/vtemm/defs/enum.pl
index df41545..df41545 100644
--- a/src/gtkpaludis/vtemm/defs/enum.pl
+++ b/src/clients/gtkpaludis/vtemm/defs/enum.pl
diff --git a/src/gtkpaludis/vtemm/defs/generate_defs_vte.cc b/src/clients/gtkpaludis/vtemm/defs/generate_defs_vte.cc
index 20c9b5c..20c9b5c 100644
--- a/src/gtkpaludis/vtemm/defs/generate_defs_vte.cc
+++ b/src/clients/gtkpaludis/vtemm/defs/generate_defs_vte.cc
diff --git a/src/gtkpaludis/vtemm/reaper.ccg b/src/clients/gtkpaludis/vtemm/reaper.ccg
index e2f1164..e2f1164 100644
--- a/src/gtkpaludis/vtemm/reaper.ccg
+++ b/src/clients/gtkpaludis/vtemm/reaper.ccg
diff --git a/src/gtkpaludis/vtemm/reaper.hg b/src/clients/gtkpaludis/vtemm/reaper.hg
index 3447636..3447636 100644
--- a/src/gtkpaludis/vtemm/reaper.hg
+++ b/src/clients/gtkpaludis/vtemm/reaper.hg
diff --git a/src/gtkpaludis/vtemm/terminal_widget.ccg b/src/clients/gtkpaludis/vtemm/terminal_widget.ccg
index 74ff4a9..74ff4a9 100644
--- a/src/gtkpaludis/vtemm/terminal_widget.ccg
+++ b/src/clients/gtkpaludis/vtemm/terminal_widget.ccg
diff --git a/src/gtkpaludis/vtemm/terminal_widget.hg b/src/clients/gtkpaludis/vtemm/terminal_widget.hg
index 956a293..956a293 100644
--- a/src/gtkpaludis/vtemm/terminal_widget.hg
+++ b/src/clients/gtkpaludis/vtemm/terminal_widget.hg
diff --git a/src/gtkpaludis/yay_spi_TEST.py b/src/clients/gtkpaludis/yay_spi_TEST.py
index 84845e9..84845e9 100755
--- a/src/gtkpaludis/yay_spi_TEST.py
+++ b/src/clients/gtkpaludis/yay_spi_TEST.py
diff --git a/src/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index de28d3b..f4fb348 100644
--- a/src/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -23,7 +23,7 @@ man_paludis_SOURCES = \
man_paludis_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/src/liboutput.a \
+ $(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
paludis_SOURCES = \
@@ -50,7 +50,7 @@ paludis_LDADD = \
$(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
- $(top_builddir)/src/liboutput.a \
+ $(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
else
@@ -62,7 +62,7 @@ paludis_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
- $(top_builddir)/src/liboutput.a \
+ $(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
endif
diff --git a/src/paludis/applets.cc b/src/clients/paludis/applets.cc
index d51114c..e75ca9e 100644
--- a/src/paludis/applets.cc
+++ b/src/clients/paludis/applets.cc
@@ -18,7 +18,7 @@
*/
#include "applets.hh"
-#include "colour.hh"
+#include <src/output/colour.hh>
#include <functional>
#include <iomanip>
#include <iostream>
diff --git a/src/paludis/applets.hh b/src/clients/paludis/applets.hh
index 607b667..607b667 100644
--- a/src/paludis/applets.hh
+++ b/src/clients/paludis/applets.hh
diff --git a/src/paludis/args_from_environment_TEST b/src/clients/paludis/args_from_environment_TEST
index e700e88..e700e88 100755
--- a/src/paludis/args_from_environment_TEST
+++ b/src/clients/paludis/args_from_environment_TEST
diff --git a/src/paludis/command_line.cc b/src/clients/paludis/command_line.cc
index fb6f383..fb6f383 100644
--- a/src/paludis/command_line.cc
+++ b/src/clients/paludis/command_line.cc
diff --git a/src/paludis/command_line.hh b/src/clients/paludis/command_line.hh
index f2cddac..f2cddac 100644
--- a/src/paludis/command_line.hh
+++ b/src/clients/paludis/command_line.hh
diff --git a/src/paludis/do_contents.cc b/src/clients/paludis/do_contents.cc
index becb63a..4b88d1d 100644
--- a/src/paludis/do_contents.cc
+++ b/src/clients/paludis/do_contents.cc
@@ -18,7 +18,7 @@
*/
#include "do_contents.hh"
-#include "colour.hh"
+#include <src/output/colour.hh>
#include "command_line.hh"
#include <paludis/paludis.hh>
#include <paludis/environment/default/default_environment.hh>
diff --git a/src/paludis/do_contents.hh b/src/clients/paludis/do_contents.hh
index 5cf38e3..5cf38e3 100644
--- a/src/paludis/do_contents.hh
+++ b/src/clients/paludis/do_contents.hh
diff --git a/src/paludis/exception_TEST b/src/clients/paludis/exception_TEST
index a3daaaf..a3daaaf 100755
--- a/src/paludis/exception_TEST
+++ b/src/clients/paludis/exception_TEST
diff --git a/src/paludis/help_TEST b/src/clients/paludis/help_TEST
index 3a0f5fb..3a0f5fb 100755
--- a/src/paludis/help_TEST
+++ b/src/clients/paludis/help_TEST
diff --git a/src/paludis/install.cc b/src/clients/paludis/install.cc
index dce26ea..52dcb98 100644
--- a/src/paludis/install.cc
+++ b/src/clients/paludis/install.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "colour.hh"
+#include <src/output/colour.hh>
#include "install.hh"
-#include "licence.hh"
-#include "console_install_task.hh"
+#include <src/output/licence.hh>
+#include <src/output/console_install_task.hh>
#include <iostream>
#include <limits>
diff --git a/src/paludis/install.hh b/src/clients/paludis/install.hh
index 693931b..693931b 100644
--- a/src/paludis/install.hh
+++ b/src/clients/paludis/install.hh
diff --git a/src/paludis/install_TEST b/src/clients/paludis/install_TEST
index eab20a9..eab20a9 100755
--- a/src/paludis/install_TEST
+++ b/src/clients/paludis/install_TEST
diff --git a/src/paludis/install_TEST_cleanup.sh b/src/clients/paludis/install_TEST_cleanup.sh
index 92bb92a..92bb92a 100755
--- a/src/paludis/install_TEST_cleanup.sh
+++ b/src/clients/paludis/install_TEST_cleanup.sh
diff --git a/src/paludis/install_TEST_setup.sh b/src/clients/paludis/install_TEST_setup.sh
index f7c1592..f7c1592 100755
--- a/src/paludis/install_TEST_setup.sh
+++ b/src/clients/paludis/install_TEST_setup.sh
diff --git a/src/paludis/list.cc b/src/clients/paludis/list.cc
index e426c59..9e45561 100644
--- a/src/paludis/list.cc
+++ b/src/clients/paludis/list.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "colour.hh"
+#include <src/output/colour.hh>
#include "command_line.hh"
#include "list.hh"
#include <iomanip>
diff --git a/src/paludis/list.hh b/src/clients/paludis/list.hh
index 204af50..204af50 100644
--- a/src/paludis/list.hh
+++ b/src/clients/paludis/list.hh
diff --git a/src/paludis/list_dep_tag_categories_TEST b/src/clients/paludis/list_dep_tag_categories_TEST
index 40fa15c..40fa15c 100755
--- a/src/paludis/list_dep_tag_categories_TEST
+++ b/src/clients/paludis/list_dep_tag_categories_TEST
diff --git a/src/paludis/list_repository_formats_TEST b/src/clients/paludis/list_repository_formats_TEST
index 487513c..487513c 100755
--- a/src/paludis/list_repository_formats_TEST
+++ b/src/clients/paludis/list_repository_formats_TEST
diff --git a/src/paludis/list_sync_formats_TEST b/src/clients/paludis/list_sync_formats_TEST
index f638b22..f638b22 100755
--- a/src/paludis/list_sync_formats_TEST
+++ b/src/clients/paludis/list_sync_formats_TEST
diff --git a/src/paludis/man_paludis.cc b/src/clients/paludis/man_paludis.cc
index 9cab7e5..9cab7e5 100644
--- a/src/paludis/man_paludis.cc
+++ b/src/clients/paludis/man_paludis.cc
diff --git a/src/paludis/news.cc b/src/clients/paludis/news.cc
index 17df87a..654f0a7 100644
--- a/src/paludis/news.cc
+++ b/src/clients/paludis/news.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "colour.hh"
+#include <src/output/colour.hh>
#include "news.hh"
#include <functional>
#include <iomanip>
diff --git a/src/paludis/news.hh b/src/clients/paludis/news.hh
index 1e3e06d..1e3e06d 100644
--- a/src/paludis/news.hh
+++ b/src/clients/paludis/news.hh
diff --git a/src/paludis/owner.cc b/src/clients/paludis/owner.cc
index 52d8bf8..ce7fb08 100644
--- a/src/paludis/owner.cc
+++ b/src/clients/paludis/owner.cc
@@ -18,7 +18,7 @@
*/
#include "owner.hh"
-#include "colour.hh"
+#include <src/output/colour.hh>
#include "command_line.hh"
#include <paludis/paludis.hh>
#include <paludis/environment/default/default_environment.hh>
diff --git a/src/paludis/owner.hh b/src/clients/paludis/owner.hh
index ce9efba..ce9efba 100644
--- a/src/paludis/owner.hh
+++ b/src/clients/paludis/owner.hh
diff --git a/src/paludis/paludis.cc b/src/clients/paludis/paludis.cc
index ee2edb5..93da1e8 100644
--- a/src/paludis/paludis.cc
+++ b/src/clients/paludis/paludis.cc
@@ -18,7 +18,7 @@
*/
#include "applets.hh"
-#include "colour.hh"
+#include <src/output/colour.hh>
#include "command_line.hh"
#include "do_contents.hh"
#include "install.hh"
diff --git a/src/paludis/query.cc b/src/clients/paludis/query.cc
index 6041c5e..f60a884 100644
--- a/src/paludis/query.cc
+++ b/src/clients/paludis/query.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "colour.hh"
+#include <src/output/colour.hh>
#include "query.hh"
-#include "licence.hh"
-#include "use_flag_pretty_printer.hh"
+#include <src/output/licence.hh>
+#include <src/output/use_flag_pretty_printer.hh>
#include <functional>
#include <iomanip>
#include <iostream>
diff --git a/src/paludis/query.hh b/src/clients/paludis/query.hh
index 62e7e02..62e7e02 100644
--- a/src/paludis/query.hh
+++ b/src/clients/paludis/query.hh
diff --git a/src/paludis/report.cc b/src/clients/paludis/report.cc
index 6b1a272..b531ea2 100644
--- a/src/paludis/report.cc
+++ b/src/clients/paludis/report.cc
@@ -18,7 +18,7 @@
*/
#include "report.hh"
-#include "colour.hh"
+#include <src/output/colour.hh>
#include <paludis/tasks/report_task.hh>
#include <paludis/environment/default/default_environment.hh>
#include <iostream>
diff --git a/src/paludis/report.hh b/src/clients/paludis/report.hh
index 761a200..761a200 100644
--- a/src/paludis/report.hh
+++ b/src/clients/paludis/report.hh
diff --git a/src/paludis/sync.cc b/src/clients/paludis/sync.cc
index 89f08eb..2270b92 100644
--- a/src/paludis/sync.cc
+++ b/src/clients/paludis/sync.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "colour.hh"
+#include <src/output/colour.hh>
#include "sync.hh"
#include <paludis/tasks/sync_task.hh>
#include <paludis/environment/default/default_environment.hh>
diff --git a/src/paludis/sync.hh b/src/clients/paludis/sync.hh
index 92c518c..92c518c 100644
--- a/src/paludis/sync.hh
+++ b/src/clients/paludis/sync.hh
diff --git a/src/paludis/uninstall.cc b/src/clients/paludis/uninstall.cc
index 4c8223a..b1253e4 100644
--- a/src/paludis/uninstall.cc
+++ b/src/clients/paludis/uninstall.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "colour.hh"
+#include <src/output/colour.hh>
#include "uninstall.hh"
#include <paludis/environment/default/default_environment.hh>
diff --git a/src/paludis/uninstall.hh b/src/clients/paludis/uninstall.hh
index 55686db..55686db 100644
--- a/src/paludis/uninstall.hh
+++ b/src/clients/paludis/uninstall.hh
diff --git a/src/paludis/upgrade_TEST b/src/clients/paludis/upgrade_TEST
index 9bccff1..9bccff1 100755
--- a/src/paludis/upgrade_TEST
+++ b/src/clients/paludis/upgrade_TEST
diff --git a/src/paludis/upgrade_TEST_cleanup.sh b/src/clients/paludis/upgrade_TEST_cleanup.sh
index bc42e78..bc42e78 100755
--- a/src/paludis/upgrade_TEST_cleanup.sh
+++ b/src/clients/paludis/upgrade_TEST_cleanup.sh
diff --git a/src/paludis/upgrade_TEST_setup.sh b/src/clients/paludis/upgrade_TEST_setup.sh
index 8069947..8069947 100755
--- a/src/paludis/upgrade_TEST_setup.sh
+++ b/src/clients/paludis/upgrade_TEST_setup.sh
diff --git a/src/paludis/version_TEST b/src/clients/paludis/version_TEST
index 02513f0..02513f0 100755
--- a/src/paludis/version_TEST
+++ b/src/clients/paludis/version_TEST
diff --git a/src/qualudis/Makefile.am b/src/clients/qualudis/Makefile.am
index 8a4280c..8e9225b 100644
--- a/src/qualudis/Makefile.am
+++ b/src/clients/qualudis/Makefile.am
@@ -23,7 +23,7 @@ qualudis_LDADD = \
$(top_builddir)/paludis/qa/libpaludisqa.la \
$(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/src/liboutput.a \
+ $(top_builddir)/src/output/liboutput.a \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/libxml/libpaludislibxml.la \
@@ -39,7 +39,7 @@ qualudis_LDADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/src/liboutput.a \
+ $(top_builddir)/src/output/liboutput.a \
$(PCREPLUSPLUS_LIBS) \
$(LIBXML2DEPS_LIBS) \
$(DYNAMIC_LD_LIBS)
@@ -72,7 +72,7 @@ man_qualudis_SOURCES = \
man_qualudis_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/src/liboutput.a \
+ $(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
CLEANFILES = *~ version_TEST gmon.out *.gcov *.gcno *.gcda
diff --git a/src/qualudis/man_qualudis.cc b/src/clients/qualudis/man_qualudis.cc
index 4f0f1f8..4f0f1f8 100644
--- a/src/qualudis/man_qualudis.cc
+++ b/src/clients/qualudis/man_qualudis.cc
diff --git a/src/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index ea0867a..50963f2 100644
--- a/src/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -35,7 +35,7 @@
#include <libwrapiter/libwrapiter.hh>
#include "qualudis_command_line.hh"
-#include "colour.hh"
+#include <src/output/colour.hh>
#include "config.h"
using namespace paludis;
diff --git a/src/qualudis/qualudis_command_line.cc b/src/clients/qualudis/qualudis_command_line.cc
index 99f50e1..99f50e1 100644
--- a/src/qualudis/qualudis_command_line.cc
+++ b/src/clients/qualudis/qualudis_command_line.cc
diff --git a/src/qualudis/qualudis_command_line.hh b/src/clients/qualudis/qualudis_command_line.hh
index 630f8ca..630f8ca 100644
--- a/src/qualudis/qualudis_command_line.hh
+++ b/src/clients/qualudis/qualudis_command_line.hh
diff --git a/src/common_args/Makefile.am b/src/common_args/Makefile.am
new file mode 100644
index 0000000..03e2bc4
--- /dev/null
+++ b/src/common_args/Makefile.am
@@ -0,0 +1,8 @@
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@
+
+built-sources : $(BUILT_SOURCES)
+ for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
+
diff --git a/src/common_args/debug_build_arg.cc b/src/common_args/debug_build_arg.cc
new file mode 100644
index 0000000..621a71b
--- /dev/null
+++ b/src/common_args/debug_build_arg.cc
@@ -0,0 +1,46 @@
+/* vim: set sw=4 sts=4 et foldmethod=syntax : */
+
+/*
+ * Copyright (c) 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ *
+ * 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
+ */
+
+#include "debug_build_arg.hh"
+
+using namespace paludis;
+using namespace paludis::args;
+
+DebugBuildArg::DebugBuildArg() :
+ EnumArg()
+{
+}
+
+DebugBuildArg::~DebugBuildArg()
+{
+}
+
+InstallDebugOption
+DebugBuildArg::option() const
+{
+ if ("none" == argument())
+ return ido_none;
+ if ("split" == argument())
+ return ido_split;
+ if ("internal" == argument())
+ return ido_internal;
+
+ throw DoHelp("Bad value for --" + long_name());
+}
+
diff --git a/src/common_args/debug_build_arg.hh b/src/common_args/debug_build_arg.hh
new file mode 100644
index 0000000..1947bbf
--- /dev/null
+++ b/src/common_args/debug_build_arg.hh
@@ -0,0 +1,42 @@
+/* vim: set sw=4 sts=4 et foldmethod=syntax : */
+
+/*
+ * Copyright (c) 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ *
+ * 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_SRC_COMMON_ARGS_DEBUG_BUILD_ARG_HH
+#define PALUDIS_GUARD_SRC_COMMON_ARGS_DEBUG_BUILD_ARG_HH 1
+
+#include <paludis/args/args_option.hh>
+#include <paludis/repository.hh>
+
+namespace paludis
+{
+ namespace args
+ {
+ class DebugBuildArg :
+ public EnumArg
+ {
+ public:
+ DebugBuildArg();
+ ~DebugBuildArg();
+
+ InstallDebugOption option() const;
+ };
+ }
+}
+
+#endif
diff --git a/src/output/Makefile.am b/src/output/Makefile.am
new file mode 100644
index 0000000..53c2567
--- /dev/null
+++ b/src/output/Makefile.am
@@ -0,0 +1,25 @@
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+DISTCLEANFILES = console_install_task-sr.hh console_install_task-sr.cc
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = console_install_task.sr console_install_task-sr.hh console_install_task-sr.cc
+BUILT_SOURCES = console_install_task-sr.hh console_install_task-sr.cc
+
+noinst_LIBRARIES = liboutput.a
+liboutput_a_SOURCES = \
+ colour.cc colour.hh \
+ console_install_task.cc console_install_task.hh \
+ use_flag_pretty_printer.cc use_flag_pretty_printer.hh \
+ licence.cc licence.hh
+
+AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@
+
+built-sources : $(BUILT_SOURCES)
+ for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
+
+console_install_task-sr.hh : console_install_task.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/console_install_task.sr > $@
+
+console_install_task-sr.cc : console_install_task.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/console_install_task.sr > $@
+
+
diff --git a/src/colour.cc b/src/output/colour.cc
index d971d7e..d971d7e 100644
--- a/src/colour.cc
+++ b/src/output/colour.cc
diff --git a/src/colour.hh b/src/output/colour.hh
index b49b33f..b49b33f 100644
--- a/src/colour.hh
+++ b/src/output/colour.hh
diff --git a/src/console_install_task.cc b/src/output/console_install_task.cc
index 6355360..0262cc4 100644
--- a/src/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -35,7 +35,7 @@
using namespace paludis;
-#include <src/console_install_task-sr.cc>
+#include <src/output/console_install_task-sr.cc>
ConsoleInstallTask::ConsoleInstallTask(Environment * const env,
const DepListOptions & options) :
diff --git a/src/console_install_task.hh b/src/output/console_install_task.hh
index bc0d4c9..6392cdd 100644
--- a/src/console_install_task.hh
+++ b/src/output/console_install_task.hh
@@ -22,7 +22,7 @@
#include <paludis/tasks/install_task.hh>
#include <paludis/package_database_entry.hh>
-#include <src/use_flag_pretty_printer.hh>
+#include <src/output/use_flag_pretty_printer.hh>
#include <iosfwd>
namespace paludis
@@ -36,7 +36,7 @@ namespace paludis
uds_new
};
-#include <src/console_install_task-sr.hh>
+#include <src/output/console_install_task-sr.hh>
class PALUDIS_VISIBLE DepTagSummaryDisplayer :
public DepTagVisitorTypes::ConstVisitor,
diff --git a/src/console_install_task.sr b/src/output/console_install_task.sr
index 433aef2..433aef2 100644
--- a/src/console_install_task.sr
+++ b/src/output/console_install_task.sr
diff --git a/src/licence.cc b/src/output/licence.cc
index a460a97..a460a97 100644
--- a/src/licence.cc
+++ b/src/output/licence.cc
diff --git a/src/licence.hh b/src/output/licence.hh
index 38d902e..38d902e 100644
--- a/src/licence.hh
+++ b/src/output/licence.hh
diff --git a/src/use_flag_pretty_printer.cc b/src/output/use_flag_pretty_printer.cc
index eef2082..eef2082 100644
--- a/src/use_flag_pretty_printer.cc
+++ b/src/output/use_flag_pretty_printer.cc
diff --git a/src/use_flag_pretty_printer.hh b/src/output/use_flag_pretty_printer.hh
index 6fcfb18..6fcfb18 100644
--- a/src/use_flag_pretty_printer.hh
+++ b/src/output/use_flag_pretty_printer.hh