aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-11-28 12:34:17 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-11-28 12:34:17 +0000
commit2b6422996fdd734aae66924c98bf2cb882f966bc (patch)
treebcd000b883d0efd269436c0c9ff30672963fefa0
parent011825376d0a98394e2510a0907172400af0d673 (diff)
downloadpaludis-2b6422996fdd734aae66924c98bf2cb882f966bc.tar.gz
paludis-2b6422996fdd734aae66924c98bf2cb882f966bc.tar.xz
Move DepList, UninstallList into a new libpaludisdeplist
-rw-r--r--Makefile.am19
-rw-r--r--configure.ac1
-rw-r--r--paludis/Makefile.am.m42
-rw-r--r--paludis/dep_list/Makefile.am81
-rw-r--r--paludis/dep_list/dep_list.cc (renamed from paludis/dep_list.cc)4
-rw-r--r--paludis/dep_list/dep_list.hh (renamed from paludis/dep_list.hh)2
-rw-r--r--paludis/dep_list/dep_list.sr (renamed from paludis/dep_list.sr)0
-rw-r--r--paludis/dep_list/dep_list_TEST.cc (renamed from paludis/dep_list_TEST.cc)2
-rw-r--r--paludis/dep_list/uninstall_list.cc (renamed from paludis/uninstall_list.cc)2
-rw-r--r--paludis/dep_list/uninstall_list.hh (renamed from paludis/uninstall_list.hh)2
-rw-r--r--paludis/dep_list/uninstall_list.sr (renamed from paludis/uninstall_list.sr)0
-rw-r--r--paludis/dep_list/uninstall_list_TEST.cc (renamed from paludis/uninstall_list_TEST.cc)2
-rw-r--r--paludis/files.m42
-rw-r--r--paludis/repositories/portage/portage_repository_sets.cc2
-rw-r--r--paludis/tasks/install_task.hh2
-rw-r--r--paludis/tasks/sync_task.hh2
-rw-r--r--paludis/tasks/uninstall_task.cc2
-rw-r--r--src/adjutrix/Makefile.am1
-rw-r--r--src/adjutrix/display_default_system_resolution.cc2
-rw-r--r--src/gtkpaludis/Makefile.am1
-rw-r--r--src/paludis/Makefile.am1
-rw-r--r--src/paludis/uninstall.cc2
22 files changed, 113 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am
index 0ed8d14..4c72673 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,20 @@
-CLEANFILES = *~ done-check gmon.out *.gcov *.gcno *.gcda automake-deps-hack.tmp
+CLEANFILES = *~ done-check gmon.out *.gcov *.gcno *.gcda \
+ automake-deps-dist-hack.tmp automake-deps-built-hack.tmp
MAINTAINERCLEANFILES = Makefile.in configure config/* aclocal.m4 \
config.h config.h.in INSTALL COPYING
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip std-options
-EXTRA_DIST = autogen.bash automake-deps-hack.tmp
+EXTRA_DIST = autogen.bash automake-deps-dist-hack.tmp
SUBDIRS = misc test paludis cran ebuild ruby src doc hooks eselect bash-completion
-DISTCHECK_CONFIGURE_FLAGS = --enable-qa --enable-ruby --enable-glsa --with-ruby-install-dir='$${DESTDIR}$${prefix}/ruby_dir'
+DISTCHECK_CONFIGURE_FLAGS = --enable-qa --enable-ruby --enable-glsa \
+ --with-ruby-install-dir='$${DESTDIR}$${prefix}/ruby_dir'
-automake-deps-hack.tmp :
+automake-deps-built-hack.tmp : built-sources-subdirs
+ touch $@
+
+BUILT_SOURCES = automake-deps-built-hack.tmp
+
+automake-deps-dist-hack.tmp :
$(MAKE) -C paludis/util
$(MAKE) -C paludis/args
$(MAKE) -C paludis/qa message-sr.hh
@@ -36,6 +43,8 @@ install-data-local :
@[ -f $(top_builddir)/done-check ] || echo "**************************************" || true
@[ -f $(top_builddir)/done-check ] || echo || true
-built-sources : $(BUILT_SOURCES)
+built-sources : $(BUILT_SOURCES) built-sources-subdirs
+
+built-sources-subdirs :
for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/configure.ac b/configure.ac
index 5002a5e..2cdbd71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -706,6 +706,7 @@ AC_OUTPUT(
paludis/Makefile
paludis/about.hh
paludis/args/Makefile
+ paludis/dep_list/Makefile
paludis/digests/Makefile
paludis/environment/Makefile
paludis/environment/default/Makefile
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index c94f7e5..a0ef39d 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -64,7 +64,7 @@ DEFS= \
-DLIBDIR=\"$(libdir)\"
EXTRA_DIST = about.hh.in Makefile.am.m4 paludis.hh.m4 files.m4 \
hashed_containers.hh.in testscriptlist srlist srcleanlist
-SUBDIRS = digests util libxml . repositories environment args qa selinux tasks
+SUBDIRS = digests util libxml . dep_list repositories environment args qa selinux tasks
BUILT_SOURCES = srcleanlist
libpaludis_la_SOURCES = filelist
diff --git a/paludis/dep_list/Makefile.am b/paludis/dep_list/Makefile.am
new file mode 100644
index 0000000..af7ccc9
--- /dev/null
+++ b/paludis/dep_list/Makefile.am
@@ -0,0 +1,81 @@
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+DISTCLEANFILES = dep_list-sr.hh dep_list-sr.cc uninstall_list-sr.hh uninstall_list-sr.cc
+BUILT_SOURCES = $(DISTCLEANFILES)
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
+DEFS= \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DDATADIR=\"$(datadir)\" \
+ -DLIBDIR=\"$(libdir)\"
+
+libpaludisdeplist_la_SOURCES = \
+ dep_list.cc dep_list.hh \
+ uninstall_list.cc uninstall_list.hh
+
+libpaludisdeplist_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisdeplist_la_LIBADD = \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis.la
+
+lib_LTLIBRARIES = libpaludisdeplist.la
+paludis_dep_list_includedir = $(includedir)/paludis/dep_list
+paludis_dep_list_include_HEADERS = dep_list.hh uninstall_list.hh dep_list-sr.hh uninstall_list-sr.hh
+
+EXTRA_DIST = \
+ dep_list_TEST.cc \
+ uninstall_list_TEST.cc \
+ dep_list.sr dep_list-sr.hh dep_list-sr.cc \
+ uninstall_list.sr uninstall_list-sr.hh uninstall_list-sr.cc
+
+TESTS = \
+ dep_list_TEST \
+ uninstall_list_TEST
+
+TESTS_ENVIRONMENT = env \
+ PALUDIS_EBUILD_DIR="$(top_srcdir)/ebuild/" \
+ PALUDIS_SKIP_CONFIG="yes" \
+ PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
+ TEST_SCRIPT_DIR="$(srcdir)/" \
+ bash $(top_srcdir)/test/run_test.sh
+
+check_PROGRAMS = $(TESTS)
+
+dep_list_TEST_SOURCES = dep_list_TEST.cc
+dep_list_TEST_LDADD = \
+ $(top_builddir)/paludis/util/test_extras.o \
+ $(top_builddir)/test/libtest.a \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
+ $(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
+ libpaludisdeplist.la
+
+uninstall_list_TEST_SOURCES = uninstall_list_TEST.cc
+uninstall_list_TEST_LDADD = \
+ $(top_builddir)/paludis/util/test_extras.o \
+ $(top_builddir)/test/libtest.a \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
+ $(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
+ libpaludisdeplist.la
+
+built-sources : $(BUILT_SOURCES)
+ for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
+
+dep_list-sr.hh : dep_list.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/dep_list.sr > $@
+
+dep_list-sr.cc : dep_list.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/dep_list.sr > $@
+
+uninstall_list-sr.hh : uninstall_list.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/uninstall_list.sr > $@
+
+uninstall_list-sr.cc : uninstall_list.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/uninstall_list.sr > $@
+
diff --git a/paludis/dep_list.cc b/paludis/dep_list/dep_list.cc
index 0978d60..e4c30d1 100644
--- a/paludis/dep_list.cc
+++ b/paludis/dep_list/dep_list.cc
@@ -19,7 +19,7 @@
#include <paludis/dep_atom.hh>
#include <paludis/dep_atom_flattener.hh>
-#include <paludis/dep_list.hh>
+#include <paludis/dep_list/dep_list.hh>
#include <paludis/match_package.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/iterator.hh>
@@ -36,7 +36,7 @@
using namespace paludis;
-#include <paludis/dep_list-sr.cc>
+#include <paludis/dep_list/dep_list-sr.cc>
DepListError::DepListError(const std::string & m) throw () :
Exception(m)
diff --git a/paludis/dep_list.hh b/paludis/dep_list/dep_list.hh
index 0071977..f1d9f54 100644
--- a/paludis/dep_list.hh
+++ b/paludis/dep_list/dep_list.hh
@@ -131,7 +131,7 @@ namespace paludis
dle_has_all_deps ///\< All dependencies have been added
};
-#include <paludis/dep_list-sr.hh>
+#include <paludis/dep_list/dep_list-sr.hh>
/**
* Thrown if an error occurs whilst building a DepList.
diff --git a/paludis/dep_list.sr b/paludis/dep_list/dep_list.sr
index 691ea4e..691ea4e 100644
--- a/paludis/dep_list.sr
+++ b/paludis/dep_list/dep_list.sr
diff --git a/paludis/dep_list_TEST.cc b/paludis/dep_list/dep_list_TEST.cc
index bb539f6..506fe8c 100644
--- a/paludis/dep_list_TEST.cc
+++ b/paludis/dep_list/dep_list_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/dep_list.hh>
+#include <paludis/dep_list/dep_list.hh>
#include <paludis/portage_dep_parser.hh>
#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/repositories/fake/fake_installed_repository.hh>
diff --git a/paludis/uninstall_list.cc b/paludis/dep_list/uninstall_list.cc
index 2acd13c..c7cf0a6 100644
--- a/paludis/uninstall_list.cc
+++ b/paludis/dep_list/uninstall_list.cc
@@ -21,7 +21,7 @@
using namespace paludis;
-#include <paludis/uninstall_list-sr.cc>
+#include <paludis/dep_list/uninstall_list-sr.cc>
#include <paludis/environment.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/join.hh>
diff --git a/paludis/uninstall_list.hh b/paludis/dep_list/uninstall_list.hh
index b99649e..ebe7cc2 100644
--- a/paludis/uninstall_list.hh
+++ b/paludis/dep_list/uninstall_list.hh
@@ -29,7 +29,7 @@
namespace paludis
{
-#include <paludis/uninstall_list-sr.hh>
+#include <paludis/dep_list/uninstall_list-sr.hh>
class Environment;
diff --git a/paludis/uninstall_list.sr b/paludis/dep_list/uninstall_list.sr
index 940bdf6..940bdf6 100644
--- a/paludis/uninstall_list.sr
+++ b/paludis/dep_list/uninstall_list.sr
diff --git a/paludis/uninstall_list_TEST.cc b/paludis/dep_list/uninstall_list_TEST.cc
index 8a56c56..6fcd0d2 100644
--- a/paludis/uninstall_list_TEST.cc
+++ b/paludis/dep_list/uninstall_list_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/uninstall_list.hh>
+#include <paludis/dep_list/uninstall_list.hh>
#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/repositories/fake/fake_installed_repository.hh>
#include <paludis/repositories/virtuals/virtuals_repository.hh>
diff --git a/paludis/files.m4 b/paludis/files.m4
index 91adfbe..f912449 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -14,7 +14,6 @@ add(`contents', `hh', `cc')
add(`dep_atom', `hh', `cc', `test')
add(`dep_atom_flattener', `hh', `cc')
add(`dep_atom_pretty_printer', `hh', `cc')
-add(`dep_list', `hh', `cc', `test', `sr')
add(`dep_tag', `hh', `cc', `sr')
add(`ebin', `hh', `cc', `sr')
add(`ebuild', `hh', `cc', `sr')
@@ -33,7 +32,6 @@ add(`repository', `hh', `cc', `sr')
add(`repository_config_entry', `sr')
add(`repository_so_loader', `cc')
add(`syncer', `hh', `cc', `sr')
-add(`uninstall_list', `hh', `cc', `sr', `test')
add(`use_config_entry', `sr')
add(`version_metadata', `hh', `cc', `sr')
add(`version_operator', `hh', `cc', `test')
diff --git a/paludis/repositories/portage/portage_repository_sets.cc b/paludis/repositories/portage/portage_repository_sets.cc
index f312a5e..fd673e9 100644
--- a/paludis/repositories/portage/portage_repository_sets.cc
+++ b/paludis/repositories/portage/portage_repository_sets.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/portage/portage_repository_sets.hh>
#include <paludis/repositories/portage/glsa.hh>
-#include <paludis/dep_list.hh>
+#include <paludis/dep_list/dep_list.hh>
#include <paludis/environment.hh>
#include <paludis/config_file.hh>
#include <paludis/portage_dep_parser.hh>
diff --git a/paludis/tasks/install_task.hh b/paludis/tasks/install_task.hh
index 2ad34e3..fdb253d 100644
--- a/paludis/tasks/install_task.hh
+++ b/paludis/tasks/install_task.hh
@@ -22,7 +22,7 @@
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/dep_list.hh>
+#include <paludis/dep_list/dep_list.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
namespace paludis
diff --git a/paludis/tasks/sync_task.hh b/paludis/tasks/sync_task.hh
index 0c8904f..e2856b2 100644
--- a/paludis/tasks/sync_task.hh
+++ b/paludis/tasks/sync_task.hh
@@ -22,7 +22,7 @@
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/dep_list.hh>
+#include <paludis/dep_list/dep_list.hh>
namespace paludis
{
diff --git a/paludis/tasks/uninstall_task.cc b/paludis/tasks/uninstall_task.cc
index 607bbe5..6d717bb 100644
--- a/paludis/tasks/uninstall_task.cc
+++ b/paludis/tasks/uninstall_task.cc
@@ -19,7 +19,7 @@
#include "uninstall_task.hh"
#include <paludis/environment.hh>
-#include <paludis/uninstall_list.hh>
+#include <paludis/dep_list/uninstall_list.hh>
#include <paludis/util/collection_concrete.hh>
#include <list>
diff --git a/src/adjutrix/Makefile.am b/src/adjutrix/Makefile.am
index ce21e42..db96a3b 100644
--- a/src/adjutrix/Makefile.am
+++ b/src/adjutrix/Makefile.am
@@ -44,6 +44,7 @@ adjutrix_LDADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/src/libcolour.a \
$(DYNAMIC_LD_LIBS)
diff --git a/src/adjutrix/display_default_system_resolution.cc b/src/adjutrix/display_default_system_resolution.cc
index 4ebfb5c..bea3720 100644
--- a/src/adjutrix/display_default_system_resolution.cc
+++ b/src/adjutrix/display_default_system_resolution.cc
@@ -26,7 +26,7 @@
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/strip.hh>
-#include <paludis/dep_list.hh>
+#include <paludis/dep_list/dep_list.hh>
#include <iostream>
#include <iomanip>
diff --git a/src/gtkpaludis/Makefile.am b/src/gtkpaludis/Makefile.am
index 25485d3..68bfd30 100644
--- a/src/gtkpaludis/Makefile.am
+++ b/src/gtkpaludis/Makefile.am
@@ -65,6 +65,7 @@ gtkpaludis_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
+ $(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(GTKDEPS_LIBS) \
$(GTKTESTDEPS_LIBS) \
$(DYNAMIC_LD_LIBS)
diff --git a/src/paludis/Makefile.am b/src/paludis/Makefile.am
index 7f28e17..bee0464 100644
--- a/src/paludis/Makefile.am
+++ b/src/paludis/Makefile.am
@@ -47,6 +47,7 @@ paludis_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
+ $(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/src/libcolour.a \
$(DYNAMIC_LD_LIBS)
diff --git a/src/paludis/uninstall.cc b/src/paludis/uninstall.cc
index 2f7986f..ec25fbc 100644
--- a/src/paludis/uninstall.cc
+++ b/src/paludis/uninstall.cc
@@ -22,7 +22,7 @@
#include <paludis/environment/default/default_environment.hh>
#include <paludis/tasks/uninstall_task.hh>
-#include <paludis/uninstall_list.hh>
+#include <paludis/dep_list/uninstall_list.hh>
#include <iostream>