aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-11 22:55:08 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-11 22:55:08 +0000
commitdd6c6601f7dbbec7f9d31c3e8843fd9017f93183 (patch)
treed05109e75af40e426a48fce124868f791f9b828f
parent3e3dc357d49f097d24eaa3f0d7ece06848c873a5 (diff)
downloadpaludis-dd6c6601f7dbbec7f9d31c3e8843fd9017f93183.tar.gz
paludis-dd6c6601f7dbbec7f9d31c3e8843fd9017f93183.tar.xz
Move src/ to src/paludis/ . In future we'll have a src/ subdirectory for each client.
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am45
-rw-r--r--src/paludis/Makefile.am47
-rw-r--r--src/paludis/applets.cc (renamed from src/applets.cc)4
-rw-r--r--src/paludis/applets.hh (renamed from src/applets.hh)2
-rw-r--r--src/paludis/colour.cc (renamed from src/colour.cc)0
-rw-r--r--src/paludis/colour.hh (renamed from src/colour.hh)2
-rw-r--r--src/paludis/command_line.cc (renamed from src/command_line.cc)2
-rw-r--r--src/paludis/command_line.hh (renamed from src/command_line.hh)0
-rw-r--r--src/paludis/contents.cc (renamed from src/contents.cc)0
-rw-r--r--src/paludis/contents.hh (renamed from src/contents.hh)0
-rwxr-xr-xsrc/paludis/exception_TEST (renamed from src/exception_TEST)0
-rwxr-xr-xsrc/paludis/help_TEST (renamed from src/help_TEST)0
-rw-r--r--src/paludis/install.cc (renamed from src/install.cc)6
-rw-r--r--src/paludis/install.hh (renamed from src/install.hh)2
-rwxr-xr-xsrc/paludis/install_TEST (renamed from src/install_TEST)0
-rwxr-xr-xsrc/paludis/install_TEST_cleanup.sh (renamed from src/install_TEST_cleanup.sh)0
-rwxr-xr-xsrc/paludis/install_TEST_setup.sh (renamed from src/install_TEST_setup.sh)0
-rw-r--r--src/paludis/licence.cc (renamed from src/licence.cc)0
-rw-r--r--src/paludis/licence.hh (renamed from src/licence.hh)0
-rw-r--r--src/paludis/list.cc (renamed from src/list.cc)0
-rw-r--r--src/paludis/list.hh (renamed from src/list.hh)0
-rwxr-xr-xsrc/paludis/list_dep_tag_categories_TEST (renamed from src/list_dep_tag_categories_TEST)0
-rwxr-xr-xsrc/paludis/list_repository_formats_TEST (renamed from src/list_repository_formats_TEST)0
-rwxr-xr-xsrc/paludis/list_sync_formats_TEST (renamed from src/list_sync_formats_TEST)0
-rw-r--r--src/paludis/news.cc (renamed from src/news.cc)4
-rw-r--r--src/paludis/news.hh (renamed from src/news.hh)2
-rw-r--r--src/paludis/owner.cc (renamed from src/owner.cc)0
-rw-r--r--src/paludis/owner.hh (renamed from src/owner.hh)0
-rw-r--r--src/paludis/paludis.cc (renamed from src/paludis.cc)22
-rw-r--r--src/paludis/query.cc (renamed from src/query.cc)6
-rw-r--r--src/paludis/query.hh (renamed from src/query.hh)2
-rw-r--r--src/paludis/sync.cc (renamed from src/sync.cc)4
-rw-r--r--src/paludis/sync.hh (renamed from src/sync.hh)2
-rw-r--r--src/paludis/uninstall.cc (renamed from src/uninstall.cc)4
-rw-r--r--src/paludis/uninstall.hh (renamed from src/uninstall.hh)2
-rwxr-xr-xsrc/paludis/upgrade_TEST (renamed from src/upgrade_TEST)0
-rwxr-xr-xsrc/paludis/upgrade_TEST_cleanup.sh (renamed from src/upgrade_TEST_cleanup.sh)0
-rwxr-xr-xsrc/paludis/upgrade_TEST_setup.sh (renamed from src/upgrade_TEST_setup.sh)0
-rwxr-xr-xsrc/paludis/version_TEST (renamed from src/version_TEST)0
40 files changed, 83 insertions, 76 deletions
diff --git a/configure.ac b/configure.ac
index 48ef8b2..c9231d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -456,6 +456,7 @@ AC_OUTPUT(
paludis/util/Makefile
paludis/selinux/Makefile
src/Makefile
+ src/paludis/Makefile
src/qualudis/Makefile
test/Makefile
)
diff --git a/src/Makefile.am b/src/Makefile.am
index 2c9e466..3077737 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,47 +1,6 @@
-AM_CXXFLAGS = -I$(top_srcdir)
-DEFS= \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
- -DLIBEXECDIR=\"$(libexecdir)\"
-SUBDIRS = . qualudis
-
-bin_PROGRAMS = paludis
-
-paludis_SOURCES = \
- applets.hh applets.cc \
- command_line.hh command_line.cc \
- colour.hh colour.cc \
- install.hh install.cc \
- uninstall.hh uninstall.cc \
- list.hh list.cc \
- query.hh query.cc \
- sync.hh sync.cc \
- licence.hh licence.cc \
- contents.hh contents.cc \
- owner.hh owner.cc \
- news.hh news.cc \
- paludis.cc
-
-paludis_LDADD = \
- $(top_builddir)/paludis/libpaludis.a \
- $(top_builddir)/paludis/args/libpaludisargs.a \
- $(top_builddir)/paludis/util/libpaludisutil.a
-
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_srcdir)/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/ebuild/`" \
- SYSCONFDIR="$(sysconfdir)" \
- bash $(top_srcdir)/test/run_test.sh bash
-
-TESTS = version_TEST help_TEST list_sync_formats_TEST \
- list_repository_formats_TEST list_dep_tag_categories_TEST \
- exception_TEST install_TEST upgrade_TEST
-
-EXTRA_DIST = $(TESTS) \
- install_TEST_setup.sh install_TEST_cleanup.sh \
- upgrade_TEST_setup.sh upgrade_TEST_cleanup.sh
+SUBDIRS = paludis qualudis
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
MAINTAINERCLEANFILES = Makefile.in
+
diff --git a/src/paludis/Makefile.am b/src/paludis/Makefile.am
new file mode 100644
index 0000000..3a11061
--- /dev/null
+++ b/src/paludis/Makefile.am
@@ -0,0 +1,47 @@
+AM_CXXFLAGS = -I$(top_srcdir)
+DEFS= \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DLIBEXECDIR=\"$(libexecdir)\"
+SUBDIRS = .
+
+bin_PROGRAMS = paludis
+
+paludis_SOURCES = \
+ applets.hh applets.cc \
+ command_line.hh command_line.cc \
+ colour.hh colour.cc \
+ install.hh install.cc \
+ uninstall.hh uninstall.cc \
+ list.hh list.cc \
+ query.hh query.cc \
+ sync.hh sync.cc \
+ licence.hh licence.cc \
+ contents.hh contents.cc \
+ owner.hh owner.cc \
+ news.hh news.cc \
+ paludis.cc
+
+paludis_LDADD = \
+ $(top_builddir)/paludis/libpaludis.a \
+ $(top_builddir)/paludis/args/libpaludisargs.a \
+ $(top_builddir)/paludis/util/libpaludisutil.a
+
+TESTS_ENVIRONMENT = env \
+ TEST_SCRIPT_DIR="$(srcdir)/" \
+ PALUDIS_NO_GLOBAL_HOOKS="yes" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_srcdir)/ebuild/`" \
+ PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/ebuild/`" \
+ SYSCONFDIR="$(sysconfdir)" \
+ bash $(top_srcdir)/test/run_test.sh bash
+
+TESTS = version_TEST help_TEST list_sync_formats_TEST \
+ list_repository_formats_TEST list_dep_tag_categories_TEST \
+ exception_TEST install_TEST upgrade_TEST
+
+EXTRA_DIST = $(TESTS) \
+ install_TEST_setup.sh install_TEST_cleanup.sh \
+ upgrade_TEST_setup.sh upgrade_TEST_cleanup.sh
+
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+MAINTAINERCLEANFILES = Makefile.in
+
diff --git a/src/applets.cc b/src/paludis/applets.cc
index b9ddc07..e9a8369 100644
--- a/src/applets.cc
+++ b/src/paludis/applets.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "src/applets.hh"
-#include "src/colour.hh"
+#include "applets.hh"
+#include "colour.hh"
#include <functional>
#include <iomanip>
#include <iostream>
diff --git a/src/applets.hh b/src/paludis/applets.hh
index 33602ce..d502ad5 100644
--- a/src/applets.hh
+++ b/src/paludis/applets.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_APPLETS_HH
#define PALUDIS_GUARD_SRC_APPLETS_HH 1
-#include "src/command_line.hh"
+#include "command_line.hh"
/** \file
* Declaration for small do_* functions.
diff --git a/src/colour.cc b/src/paludis/colour.cc
index 9e63e58..9e63e58 100644
--- a/src/colour.cc
+++ b/src/paludis/colour.cc
diff --git a/src/colour.hh b/src/paludis/colour.hh
index da835ab..953f703 100644
--- a/src/colour.hh
+++ b/src/paludis/colour.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_COLOUR_HH
#define PALUDIS_GUARD_SRC_COLOUR_HH 1
-#include "src/command_line.hh"
+#include "command_line.hh"
#include <paludis/util/stringify.hh>
#include <config.h>
#include <string>
diff --git a/src/command_line.cc b/src/paludis/command_line.cc
index a8daaf7..8f1b82b 100644
--- a/src/command_line.cc
+++ b/src/paludis/command_line.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "src/command_line.hh"
+#include "command_line.hh"
CommandLine::CommandLine() :
ArgsHandler(),
diff --git a/src/command_line.hh b/src/paludis/command_line.hh
index 61f88e7..61f88e7 100644
--- a/src/command_line.hh
+++ b/src/paludis/command_line.hh
diff --git a/src/contents.cc b/src/paludis/contents.cc
index 4138ece..4138ece 100644
--- a/src/contents.cc
+++ b/src/paludis/contents.cc
diff --git a/src/contents.hh b/src/paludis/contents.hh
index 4cf3b61..4cf3b61 100644
--- a/src/contents.hh
+++ b/src/paludis/contents.hh
diff --git a/src/exception_TEST b/src/paludis/exception_TEST
index a3daaaf..a3daaaf 100755
--- a/src/exception_TEST
+++ b/src/paludis/exception_TEST
diff --git a/src/help_TEST b/src/paludis/help_TEST
index 3a0f5fb..3a0f5fb 100755
--- a/src/help_TEST
+++ b/src/paludis/help_TEST
diff --git a/src/install.cc b/src/paludis/install.cc
index 08eb6c4..03a08ab 100644
--- a/src/install.cc
+++ b/src/paludis/install.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "src/colour.hh"
-#include "src/install.hh"
-#include "src/licence.hh"
+#include "colour.hh"
+#include "install.hh"
+#include "licence.hh"
#include <iostream>
#include <paludis/paludis.hh>
#include <paludis/util/iterator.hh>
diff --git a/src/install.hh b/src/paludis/install.hh
index ba3623d..f2fa6fa 100644
--- a/src/install.hh
+++ b/src/paludis/install.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_DEPGRAPH_HH
#define PALUDIS_GUARD_SRC_DEPGRAPH_HH 1
-#include "src/command_line.hh"
+#include "command_line.hh"
/** \file
* Declaration for the do_install function.
diff --git a/src/install_TEST b/src/paludis/install_TEST
index eab20a9..eab20a9 100755
--- a/src/install_TEST
+++ b/src/paludis/install_TEST
diff --git a/src/install_TEST_cleanup.sh b/src/paludis/install_TEST_cleanup.sh
index 92bb92a..92bb92a 100755
--- a/src/install_TEST_cleanup.sh
+++ b/src/paludis/install_TEST_cleanup.sh
diff --git a/src/install_TEST_setup.sh b/src/paludis/install_TEST_setup.sh
index b511e8e..b511e8e 100755
--- a/src/install_TEST_setup.sh
+++ b/src/paludis/install_TEST_setup.sh
diff --git a/src/licence.cc b/src/paludis/licence.cc
index bb1ebfd..bb1ebfd 100644
--- a/src/licence.cc
+++ b/src/paludis/licence.cc
diff --git a/src/licence.hh b/src/paludis/licence.hh
index df3cae7..df3cae7 100644
--- a/src/licence.hh
+++ b/src/paludis/licence.hh
diff --git a/src/list.cc b/src/paludis/list.cc
index 40c1efa..40c1efa 100644
--- a/src/list.cc
+++ b/src/paludis/list.cc
diff --git a/src/list.hh b/src/paludis/list.hh
index 5cae90f..5cae90f 100644
--- a/src/list.hh
+++ b/src/paludis/list.hh
diff --git a/src/list_dep_tag_categories_TEST b/src/paludis/list_dep_tag_categories_TEST
index 40fa15c..40fa15c 100755
--- a/src/list_dep_tag_categories_TEST
+++ b/src/paludis/list_dep_tag_categories_TEST
diff --git a/src/list_repository_formats_TEST b/src/paludis/list_repository_formats_TEST
index 487513c..487513c 100755
--- a/src/list_repository_formats_TEST
+++ b/src/paludis/list_repository_formats_TEST
diff --git a/src/list_sync_formats_TEST b/src/paludis/list_sync_formats_TEST
index f638b22..f638b22 100755
--- a/src/list_sync_formats_TEST
+++ b/src/paludis/list_sync_formats_TEST
diff --git a/src/news.cc b/src/paludis/news.cc
index 68ce070..c377803 100644
--- a/src/news.cc
+++ b/src/paludis/news.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "src/colour.hh"
-#include "src/news.hh"
+#include "colour.hh"
+#include "news.hh"
#include <functional>
#include <iomanip>
#include <iostream>
diff --git a/src/news.hh b/src/paludis/news.hh
index 8d8b54b..e4c4c7c 100644
--- a/src/news.hh
+++ b/src/paludis/news.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_NEWS_HH
#define PALUDIS_GUARD_SRC_NEWS_HH 1
-#include "src/command_line.hh"
+#include "command_line.hh"
/** \file
* Declaration for the do_update_news function.
diff --git a/src/owner.cc b/src/paludis/owner.cc
index b83393b..b83393b 100644
--- a/src/owner.cc
+++ b/src/paludis/owner.cc
diff --git a/src/owner.hh b/src/paludis/owner.hh
index 672b652..672b652 100644
--- a/src/owner.hh
+++ b/src/paludis/owner.hh
diff --git a/src/paludis.cc b/src/paludis/paludis.cc
index 0bdc823..d447c6d 100644
--- a/src/paludis.cc
+++ b/src/paludis/paludis.cc
@@ -17,17 +17,17 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "src/applets.hh"
-#include "src/colour.hh"
-#include "src/command_line.hh"
-#include "src/contents.hh"
-#include "src/install.hh"
-#include "src/list.hh"
-#include "src/news.hh"
-#include "src/owner.hh"
-#include "src/query.hh"
-#include "src/sync.hh"
-#include "src/uninstall.hh"
+#include "applets.hh"
+#include "colour.hh"
+#include "command_line.hh"
+#include "contents.hh"
+#include "install.hh"
+#include "list.hh"
+#include "news.hh"
+#include "owner.hh"
+#include "query.hh"
+#include "sync.hh"
+#include "uninstall.hh"
#include "config.h"
#include <paludis/paludis.hh>
diff --git a/src/query.cc b/src/paludis/query.cc
index 2123d8b..e0b9830 100644
--- a/src/query.cc
+++ b/src/paludis/query.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "src/colour.hh"
-#include "src/query.hh"
-#include "src/licence.hh"
+#include "colour.hh"
+#include "query.hh"
+#include "licence.hh"
#include <functional>
#include <iomanip>
#include <iostream>
diff --git a/src/query.hh b/src/paludis/query.hh
index ce26c27..b47fbc0 100644
--- a/src/query.hh
+++ b/src/paludis/query.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_QUERY_HH
#define PALUDIS_GUARD_SRC_QUERY_HH 1
-#include "src/command_line.hh"
+#include "command_line.hh"
/** \file
* Declaration for the do_query function.
diff --git a/src/sync.cc b/src/paludis/sync.cc
index 2645d88..6fd7fd1 100644
--- a/src/sync.cc
+++ b/src/paludis/sync.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "src/colour.hh"
-#include "src/sync.hh"
+#include "colour.hh"
+#include "sync.hh"
#include <functional>
#include <iomanip>
#include <iostream>
diff --git a/src/sync.hh b/src/paludis/sync.hh
index d4f565f..bd3a274 100644
--- a/src/sync.hh
+++ b/src/paludis/sync.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_SYNC_HH
#define PALUDIS_GUARD_SRC_SYNC_HH 1
-#include "src/command_line.hh"
+#include "command_line.hh"
/** \file
* Declaration for the do_sync function.
diff --git a/src/uninstall.cc b/src/paludis/uninstall.cc
index 2acec9b..6e64df9 100644
--- a/src/uninstall.cc
+++ b/src/paludis/uninstall.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "src/colour.hh"
-#include "src/uninstall.hh"
+#include "colour.hh"
+#include "uninstall.hh"
#include <iostream>
#include <paludis/paludis.hh>
diff --git a/src/uninstall.hh b/src/paludis/uninstall.hh
index 06485d6..b21d3e0 100644
--- a/src/uninstall.hh
+++ b/src/paludis/uninstall.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_UNINSTALL_HH
#define PALUDIS_GUARD_SRC_UNINSTALL_HH 1
-#include "src/command_line.hh"
+#include "command_line.hh"
/** \file
* Declaration for the do_uninstall function.
diff --git a/src/upgrade_TEST b/src/paludis/upgrade_TEST
index 48b315f..48b315f 100755
--- a/src/upgrade_TEST
+++ b/src/paludis/upgrade_TEST
diff --git a/src/upgrade_TEST_cleanup.sh b/src/paludis/upgrade_TEST_cleanup.sh
index bc42e78..bc42e78 100755
--- a/src/upgrade_TEST_cleanup.sh
+++ b/src/paludis/upgrade_TEST_cleanup.sh
diff --git a/src/upgrade_TEST_setup.sh b/src/paludis/upgrade_TEST_setup.sh
index eb69c95..eb69c95 100755
--- a/src/upgrade_TEST_setup.sh
+++ b/src/paludis/upgrade_TEST_setup.sh
diff --git a/src/version_TEST b/src/paludis/version_TEST
index 02513f0..02513f0 100755
--- a/src/version_TEST
+++ b/src/paludis/version_TEST