aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-10 13:54:07 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-10 14:10:56 +0100
commitbdfc1539b10089dcbfaa23c519f088b6c2a912ce (patch)
treed11754bf57f9686b8abe40a25b3c17322394004e
parentdcbed0e4eb93854837cc52473275f383535e4e12 (diff)
downloadpaludis-bdfc1539b10089dcbfaa23c519f088b6c2a912ce.tar.gz
paludis-bdfc1539b10089dcbfaa23c519f088b6c2a912ce.tar.xz
Move some args headers to legacy
-rw-r--r--paludis/args/Makefile.am8
-rw-r--r--paludis/args/legacy/Makefile.am11
-rw-r--r--paludis/args/legacy/dep_list_args_group.cc (renamed from paludis/args/dep_list_args_group.cc)0
-rw-r--r--paludis/args/legacy/dep_list_args_group.hh (renamed from paludis/args/dep_list_args_group.hh)4
-rw-r--r--paludis/args/legacy/deps_option_arg.cc (renamed from paludis/args/deps_option_arg.cc)4
-rw-r--r--paludis/args/legacy/deps_option_arg.hh (renamed from paludis/args/deps_option_arg.hh)0
-rw-r--r--paludis/args/legacy/install_args_group.cc (renamed from paludis/args/install_args_group.cc)0
-rw-r--r--paludis/args/legacy/install_args_group.hh (renamed from paludis/args/install_args_group.hh)0
-rw-r--r--src/clients/accerso/command_line.hh1
-rw-r--r--src/clients/appareo/command_line.hh1
-rw-r--r--src/clients/importare/Makefile.am2
-rw-r--r--src/clients/importare/command_line.hh4
-rw-r--r--src/clients/instruo/command_line.hh1
-rw-r--r--src/clients/paludis/Makefile.am2
-rw-r--r--src/clients/paludis/command_line.hh4
-rw-r--r--src/clients/reconcilio/Makefile.am2
-rw-r--r--src/clients/reconcilio/command_line.hh4
17 files changed, 26 insertions, 22 deletions
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index d67c3ba..b6c2cff 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -25,10 +25,7 @@ paludis_args_include_HEADERS = \
args_dumper.hh \
escape.hh \
man.hh \
- deps_option_arg.hh \
log_level_arg.hh \
- dep_list_args_group.hh \
- install_args_group.hh \
do_help.hh
libpaludisargs_@PALUDIS_PC_SLOT@_la_SOURCES = \
@@ -41,11 +38,8 @@ libpaludisargs_@PALUDIS_PC_SLOT@_la_SOURCES = \
bad_argument.cc \
args_visitor.cc \
args_dumper.cc \
- deps_option_arg.cc \
escape.cc \
- log_level_arg.cc \
- dep_list_args_group.cc \
- install_args_group.cc
+ log_level_arg.cc
libpaludisman_@PALUDIS_PC_SLOT@_a_SOURCES = \
man.cc
diff --git a/paludis/args/legacy/Makefile.am b/paludis/args/legacy/Makefile.am
index 67658e6..a62d701 100644
--- a/paludis/args/legacy/Makefile.am
+++ b/paludis/args/legacy/Makefile.am
@@ -9,9 +9,16 @@ TESTS =
paludis_args_legacy_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/args/legacy
-paludis_args_legacy_include_HEADERS =
+paludis_args_legacy_include_HEADERS = \
+ deps_option_arg.hh \
+ dep_list_args_group.hh \
+ install_args_group.hh
+
+libpaludisargslegacy_@PALUDIS_PC_SLOT@_la_SOURCES = \
+ deps_option_arg.cc \
+ dep_list_args_group.cc \
+ install_args_group.cc
-libpaludisargslegacy_@PALUDIS_PC_SLOT@_la_SOURCES =
libpaludisargslegacy_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
libpaludisargslegacy_@PALUDIS_PC_SLOT@_la_LIBADD = \
diff --git a/paludis/args/dep_list_args_group.cc b/paludis/args/legacy/dep_list_args_group.cc
index 1bc0a2a..1bc0a2a 100644
--- a/paludis/args/dep_list_args_group.cc
+++ b/paludis/args/legacy/dep_list_args_group.cc
diff --git a/paludis/args/dep_list_args_group.hh b/paludis/args/legacy/dep_list_args_group.hh
index b1644e2..0cfd133 100644
--- a/paludis/args/dep_list_args_group.hh
+++ b/paludis/args/legacy/dep_list_args_group.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2009 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2009, 2010 Ciaran McCreesh
* Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -22,7 +22,7 @@
#define PALUDIS_GUARD_SRC_COMMON_ARGS_DEP_LIST_ARGS_HH 1
#include <paludis/args/args_option.hh>
-#include <paludis/args/deps_option_arg.hh>
+#include <paludis/args/legacy/deps_option_arg.hh>
#include <paludis/args/args_group.hh>
#include <paludis/dep_list.hh>
#include <paludis/install_task.hh>
diff --git a/paludis/args/deps_option_arg.cc b/paludis/args/legacy/deps_option_arg.cc
index b5e84a1..3df4d04 100644
--- a/paludis/args/deps_option_arg.cc
+++ b/paludis/args/legacy/deps_option_arg.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -18,7 +18,7 @@
*/
#include "deps_option_arg.hh"
-#include "do_help.hh"
+#include <paludis/args/do_help.hh>
#include <paludis/util/stringify.hh>
using namespace paludis;
diff --git a/paludis/args/deps_option_arg.hh b/paludis/args/legacy/deps_option_arg.hh
index f138f52..f138f52 100644
--- a/paludis/args/deps_option_arg.hh
+++ b/paludis/args/legacy/deps_option_arg.hh
diff --git a/paludis/args/install_args_group.cc b/paludis/args/legacy/install_args_group.cc
index efbb948..efbb948 100644
--- a/paludis/args/install_args_group.cc
+++ b/paludis/args/legacy/install_args_group.cc
diff --git a/paludis/args/install_args_group.hh b/paludis/args/legacy/install_args_group.hh
index 2220467..2220467 100644
--- a/paludis/args/install_args_group.hh
+++ b/paludis/args/legacy/install_args_group.hh
diff --git a/src/clients/accerso/command_line.hh b/src/clients/accerso/command_line.hh
index cd5c572..f2bf89f 100644
--- a/src/clients/accerso/command_line.hh
+++ b/src/clients/accerso/command_line.hh
@@ -23,7 +23,6 @@
#include <paludis/args/args.hh>
#include <paludis/util/singleton.hh>
#include <paludis/args/log_level_arg.hh>
-#include <paludis/args/deps_option_arg.hh>
class CommandLine :
public paludis::args::ArgsHandler,
diff --git a/src/clients/appareo/command_line.hh b/src/clients/appareo/command_line.hh
index 7a57db2..c37b47e 100644
--- a/src/clients/appareo/command_line.hh
+++ b/src/clients/appareo/command_line.hh
@@ -24,7 +24,6 @@
#include <paludis/args/args.hh>
#include <paludis/util/singleton.hh>
#include <paludis/args/log_level_arg.hh>
-#include <paludis/args/deps_option_arg.hh>
class CommandLine :
public paludis::args::ArgsHandler,
diff --git a/src/clients/importare/Makefile.am b/src/clients/importare/Makefile.am
index f55c224..eaad882 100644
--- a/src/clients/importare/Makefile.am
+++ b/src/clients/importare/Makefile.am
@@ -18,6 +18,7 @@ man_importare_SOURCES = \
command_line.cc
man_importare_LDADD = \
+ $(top_builddir)/paludis/args/legacy/libpaludisargslegacy_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
@@ -32,6 +33,7 @@ importare_SOURCES = \
importare_LDADD = \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/legacy/libpaludisargslegacy_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
diff --git a/src/clients/importare/command_line.hh b/src/clients/importare/command_line.hh
index 52ad25e..9303265 100644
--- a/src/clients/importare/command_line.hh
+++ b/src/clients/importare/command_line.hh
@@ -22,8 +22,8 @@
#include <paludis/args/args.hh>
#include <paludis/util/singleton.hh>
-#include <paludis/args/dep_list_args_group.hh>
-#include <paludis/args/install_args_group.hh>
+#include <paludis/args/legacy/dep_list_args_group.hh>
+#include <paludis/args/legacy/install_args_group.hh>
#include <paludis/args/log_level_arg.hh>
class CommandLine :
diff --git a/src/clients/instruo/command_line.hh b/src/clients/instruo/command_line.hh
index 3a1a427..dfe51de 100644
--- a/src/clients/instruo/command_line.hh
+++ b/src/clients/instruo/command_line.hh
@@ -23,7 +23,6 @@
#include <paludis/args/args.hh>
#include <paludis/util/singleton.hh>
#include <paludis/args/log_level_arg.hh>
-#include <paludis/args/deps_option_arg.hh>
class CommandLine :
public paludis::args::ArgsHandler,
diff --git a/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index f0d7364..bc5a2aa 100644
--- a/src/clients/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -25,6 +25,7 @@ man_paludis_SOURCES = \
command_line.cc
man_paludis_LDADD = \
+ $(top_builddir)/paludis/args/legacy/libpaludisargslegacy_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
@@ -50,6 +51,7 @@ paludis_SOURCES = \
paludis_LDADD = \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/legacy/libpaludisargslegacy_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
diff --git a/src/clients/paludis/command_line.hh b/src/clients/paludis/command_line.hh
index b7514d4..76f4393 100644
--- a/src/clients/paludis/command_line.hh
+++ b/src/clients/paludis/command_line.hh
@@ -22,8 +22,8 @@
#include <paludis/args/args.hh>
#include <paludis/util/singleton.hh>
-#include <paludis/args/dep_list_args_group.hh>
-#include <paludis/args/install_args_group.hh>
+#include <paludis/args/legacy/dep_list_args_group.hh>
+#include <paludis/args/legacy/install_args_group.hh>
#include <paludis/args/log_level_arg.hh>
/** \file
diff --git a/src/clients/reconcilio/Makefile.am b/src/clients/reconcilio/Makefile.am
index 9a5d4a4..387a5ba 100644
--- a/src/clients/reconcilio/Makefile.am
+++ b/src/clients/reconcilio/Makefile.am
@@ -18,6 +18,7 @@ man_reconcilio_SOURCES = \
command_line.cc
man_reconcilio_LDADD = \
+ $(top_builddir)/paludis/args/legacy/libpaludisargslegacy_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
@@ -33,6 +34,7 @@ reconcilio_SOURCES = \
reconcilio_LDADD = \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/args/legacy/libpaludisargslegacy_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
diff --git a/src/clients/reconcilio/command_line.hh b/src/clients/reconcilio/command_line.hh
index 9642bc0..fcd09ae 100644
--- a/src/clients/reconcilio/command_line.hh
+++ b/src/clients/reconcilio/command_line.hh
@@ -23,8 +23,8 @@
#include <paludis/util/singleton.hh>
#include <paludis/args/args.hh>
-#include <paludis/args/dep_list_args_group.hh>
-#include <paludis/args/install_args_group.hh>
+#include <paludis/args/legacy/dep_list_args_group.hh>
+#include <paludis/args/legacy/install_args_group.hh>
#include <paludis/args/log_level_arg.hh>
class CommandLine :