aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-16 20:45:42 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-16 20:45:42 +0000
commit8cf428ddb83b4ccc3b33dd003ae4942573dfdc1f (patch)
treecfb6db370b227a08e71cf94ac1cfded0737d7aed
parent340e19e50c86be025c8ea3754ea3b9e708beed3c (diff)
downloadpaludis-8cf428ddb83b4ccc3b33dd003ae4942573dfdc1f.tar.gz
paludis-8cf428ddb83b4ccc3b33dd003ae4942573dfdc1f.tar.xz
Switch from .a to .so files. Move each repository format into its own subdirectory in paludis/repositories/. Move to 0.5 branch.
-rw-r--r--configure.ac17
-rw-r--r--ebuild/digests/Makefile.am6
-rw-r--r--ebuild/utils/Makefile.am10
-rw-r--r--paludis/Makefile.am.m421
-rw-r--r--paludis/args/Makefile.am12
-rw-r--r--paludis/dep_list_TEST.cc1
-rw-r--r--paludis/digests/Makefile.am12
-rw-r--r--paludis/files.m44
-rw-r--r--paludis/package_database_TEST.cc1
-rw-r--r--paludis/qa/Makefile.am.m411
-rw-r--r--paludis/repositories/Makefile.am5
-rw-r--r--paludis/repositories/fake/Makefile.am16
-rw-r--r--paludis/repositories/fake/fake_repository.cc (renamed from paludis/fake_repository.cc)2
-rw-r--r--paludis/repositories/fake/fake_repository.hh (renamed from paludis/fake_repository.hh)0
-rw-r--r--paludis/repositories/nothing/Makefile.am16
-rw-r--r--paludis/repositories/nothing/nothing_repository.cc (renamed from paludis/nothing_repository.cc)2
-rw-r--r--paludis/repositories/nothing/nothing_repository.hh (renamed from paludis/nothing_repository.hh)0
-rw-r--r--paludis/repositories/portage/Makefile.am44
-rw-r--r--paludis/repositories/portage/portage_repository.cc (renamed from paludis/portage_repository.cc)2
-rw-r--r--paludis/repositories/portage/portage_repository.hh (renamed from paludis/portage_repository.hh)0
-rw-r--r--paludis/repositories/portage/portage_repository_TEST.cc (renamed from paludis/portage_repository_TEST.cc)2
-rwxr-xr-xpaludis/repositories/portage/portage_repository_TEST_cleanup.sh (renamed from paludis/portage_repository_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/repositories/portage/portage_repository_TEST_setup.sh (renamed from paludis/portage_repository_TEST_setup.sh)0
-rw-r--r--paludis/repositories/vdb/Makefile.am43
-rw-r--r--paludis/repositories/vdb/vdb_repository.cc (renamed from paludis/vdb_repository.cc)3
-rw-r--r--paludis/repositories/vdb/vdb_repository.hh (renamed from paludis/vdb_repository.hh)0
-rw-r--r--paludis/repositories/vdb/vdb_repository_TEST.cc (renamed from paludis/vdb_repository_TEST.cc)2
-rwxr-xr-xpaludis/repositories/vdb/vdb_repository_TEST_cleanup.sh (renamed from paludis/vdb_repository_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/repositories/vdb/vdb_repository_TEST_setup.sh (renamed from paludis/vdb_repository_TEST_setup.sh)0
-rw-r--r--paludis/selinux/Makefile.am6
-rw-r--r--paludis/util/Makefile.am.m47
-rw-r--r--src/paludis/Makefile.am9
-rw-r--r--src/qualudis/Makefile.am11
33 files changed, 209 insertions, 56 deletions
diff --git a/configure.ac b/configure.ac
index 614f4a5..59c8fa0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,15 +6,19 @@ AC_INIT([paludis/paludis.hh])
AC_CONFIG_AUX_DIR(config)
VERSION_MAJOR=0
-VERSION_MINOR=4
-VERSION_MICRO=2
+VERSION_MINOR=5
+VERSION_MICRO=0
VERSION_FULL="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_MICRO"
VERSION="$VERSION_FULL"
+VERSION_LIB_CURRENT=`expr 100 '*' $VERSION_MAJOR + $VERSION_MINOR`
+VERSION_LIB_REVISION="$VERSION_MICRO"
AC_SUBST([VERSION_MAJOR])
AC_SUBST([VERSION_MINOR])
AC_SUBST([VERSION_MICRO])
AC_SUBST([VERSION_FULL])
+AC_SUBST([VERSION_LIB_CURRENT])
+AC_SUBST([VERSION_LIB_REVISION])
AM_INIT_AUTOMAKE(paludis, [$VERSION_FULL])
dnl }}}
@@ -24,7 +28,7 @@ AC_LANG([C++])
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
dnl }}}
@@ -453,8 +457,13 @@ AC_OUTPUT(
paludis/digests/Makefile
paludis/hashed_containers.hh
paludis/qa/Makefile
- paludis/util/Makefile
+ paludis/repositories/Makefile
+ paludis/repositories/fake/Makefile
+ paludis/repositories/nothing/Makefile
+ paludis/repositories/portage/Makefile
+ paludis/repositories/vdb/Makefile
paludis/selinux/Makefile
+ paludis/util/Makefile
src/Makefile
src/paludis/Makefile
src/qualudis/Makefile
diff --git a/ebuild/digests/Makefile.am b/ebuild/digests/Makefile.am
index 9a2161f..fbe7e9d 100644
--- a/ebuild/digests/Makefile.am
+++ b/ebuild/digests/Makefile.am
@@ -10,13 +10,13 @@ libexecprog_PROGRAMS = \
domd5
dosha256_SOURCES = dosha256.cc
-dosha256_LDADD = $(top_builddir)/paludis/digests/libpaludisdigests.a
+dosha256_LDADD = $(top_builddir)/paludis/digests/libpaludisdigests.la
dormd160_SOURCES = dormd160.cc
-dormd160_LDADD = $(top_builddir)/paludis/digests/libpaludisdigests.a
+dormd160_LDADD = $(top_builddir)/paludis/digests/libpaludisdigests.la
domd5_SOURCES = domd5.cc
-domd5_LDADD = $(top_builddir)/paludis/digests/libpaludisdigests.a
+domd5_LDADD = $(top_builddir)/paludis/digests/libpaludisdigests.la
TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="$(srcdir)/ebuild/" \
diff --git a/ebuild/utils/Makefile.am b/ebuild/utils/Makefile.am
index 5a59ea8..7a8cd3c 100644
--- a/ebuild/utils/Makefile.am
+++ b/ebuild/utils/Makefile.am
@@ -58,15 +58,15 @@ AM_CXXFLAGS = -I$(top_srcdir)
merge_SOURCES = merge.cc merge_common.cc merge_common.hh
merge_LDADD = \
- $(top_builddir)/paludis/util/libpaludisutil.a \
- $(top_builddir)/paludis/digests/libpaludisdigests.a \
- $(top_builddir)/paludis/selinux/libpaludisselinux.a \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/digests/libpaludisdigests.la \
+ $(top_builddir)/paludis/selinux/libpaludisselinux.la \
$(DYNAMIC_LD_LIBS)
unmerge_SOURCES = unmerge.cc merge_common.cc merge_common.hh
unmerge_LDADD = \
- $(top_builddir)/paludis/util/libpaludisutil.a \
- $(top_builddir)/paludis/digests/libpaludisdigests.a
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/digests/libpaludisdigests.la
TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_srcdir)/ebuild/`" \
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 7117e16..42fedb3 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -9,10 +9,13 @@ define(`headerlist', `')dnl
define(`testscriptlist', `')dnl
define(`addtest', `define(`testlist', testlist `$1_TEST')dnl
$1_TEST_SOURCES = $1_TEST.cc
-$1_TEST_LDADD = $(top_builddir)/paludis/util/test_extras.o \
+$1_TEST_LDADD = \
+ ihateautomake.o \
+ $(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludis.a \
- $(top_builddir)/paludis/util/libpaludisutil.a
+ libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
@@ -30,7 +33,7 @@ addthis(`$1',`$5')addthis(`$1',`$6')')dnl
include(`paludis/files.m4')
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda ihateautomake.cc ihateautomake.o
MAINTAINERCLEANFILES = Makefile.in Makefile.am about.hh paludis.hh \
hashed_containers.hh
AM_CXXFLAGS = -I$(top_srcdir)
@@ -40,9 +43,10 @@ DEFS= \
-DDATADIR=\"$(datadir)\"
EXTRA_DIST = about.hh.in Makefile.am.m4 paludis.hh.m4 files.m4 \
hashed_containers.hh.in testscriptlist
-SUBDIRS = digests util . args qa selinux
+SUBDIRS = digests util . repositories args qa selinux
-libpaludis_a_SOURCES = filelist
+libpaludis_la_SOURCES = filelist
+libpaludis_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
TESTS = testlist
@@ -54,7 +58,7 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
-lib_LIBRARIES = libpaludis.a
+lib_LTLIBRARIES = libpaludis.la
paludis_includedir = $(includedir)/paludis/
paludis_include_HEADERS = headerlist
@@ -67,3 +71,6 @@ paludis.hh : paludis.hh.m4 files.m4
comparison_policy.hh : comparison_policy.hh.m4
$(top_srcdir)/misc/do_m4.bash comparison_policy.hh.m4
+ihateautomake.cc : all
+ touch $@
+
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index ddfdac1..a112ff4 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -19,7 +19,7 @@ paludis_args_include_HEADERS = \
missing_value.hh \
args_dumper.hh
-libpaludisargs_a_SOURCES = $(paludis_args_include_HEADERS) \
+libpaludisargs_la_SOURCES = $(paludis_args_include_HEADERS) \
args.cc \
args_error.cc \
args_group.cc \
@@ -31,15 +31,17 @@ libpaludisargs_a_SOURCES = $(paludis_args_include_HEADERS) \
missing_value.cc \
args_dumper.cc
+libpaludisargs_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+
TESTS_ENVIRONMENT = env -u PALUDIS_OPTIONS TEST_SCRIPT_DIR="$(srcdir)/" bash $(top_srcdir)/test/run_test.sh
-lib_LIBRARIES = libpaludisargs.a
+lib_LTLIBRARIES = libpaludisargs.la
check_PROGRAMS = $(TESTS)
test_ldadd = \
$(top_builddir)/test/libtest.a \
- libpaludisargs.a \
- $(top_builddir)/paludis/libpaludis.a \
- $(top_builddir)/paludis/util/libpaludisutil.a
+ libpaludisargs.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la
args_TEST_SOURCES = args_TEST.cc
args_TEST_LDADD = $(test_ldadd)
diff --git a/paludis/dep_list_TEST.cc b/paludis/dep_list_TEST.cc
index 3869739..b471b2e 100644
--- a/paludis/dep_list_TEST.cc
+++ b/paludis/dep_list_TEST.cc
@@ -19,6 +19,7 @@
#include <deque>
#include <paludis/paludis.hh>
+#include <paludis/repositories/fake/fake_repository.hh>
#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/digests/Makefile.am b/paludis/digests/Makefile.am
index 7d82bf4..195988b 100644
--- a/paludis/digests/Makefile.am
+++ b/paludis/digests/Makefile.am
@@ -11,13 +11,15 @@ paludis_digests_include_HEADERS = \
rmd160.hh \
md5.hh
-libpaludisdigests_a_SOURCES = \
+libpaludisdigests_la_SOURCES = \
$(paludis_digests_include_HEADERS) \
sha256.cc \
rmd160.cc \
md5.cc
-lib_LIBRARIES = libpaludisdigests.a
+libpaludisdigests_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+
+lib_LTLIBRARIES = libpaludisdigests.la
TESTS = sha256_TEST rmd160_TEST md5_TEST
EXTRA_DIST = sha256_TEST.cc rmd160_TEST.cc md5_TEST.cc
@@ -28,14 +30,14 @@ AM_CXXFLAGS = -I$(top_srcdir)
sha256_TEST_SOURCES = sha256_TEST.cc
sha256_TEST_CXXFLAGS = -I$(top_srcdir)
-sha256_TEST_LDADD = $(top_builddir)/test/libtest.a libpaludisdigests.a
+sha256_TEST_LDADD = $(top_builddir)/test/libtest.a libpaludisdigests.la
rmd160_TEST_SOURCES = rmd160_TEST.cc
rmd160_TEST_CXXFLAGS = -I$(top_srcdir)
-rmd160_TEST_LDADD = $(top_builddir)/test/libtest.a libpaludisdigests.a
+rmd160_TEST_LDADD = $(top_builddir)/test/libtest.a libpaludisdigests.la
md5_TEST_SOURCES = md5_TEST.cc
md5_TEST_CXXFLAGS = -I$(top_srcdir)
-md5_TEST_LDADD = $(top_builddir)/test/libtest.a libpaludisdigests.a
+md5_TEST_LDADD = $(top_builddir)/test/libtest.a libpaludisdigests.la
diff --git a/paludis/files.m4 b/paludis/files.m4
index a048e81..b8159e3 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -20,22 +20,18 @@ add(`dep_list', `hh', `cc', `test')
add(`dep_tag', `hh', `cc')
add(`ebuild', `hh', `cc')
add(`environment', `hh', `cc')
-add(`fake_repository', `hh', `cc')
add(`hashed_containers', `hh', `cc', `test')
add(`mask_reasons', `hh', `cc')
add(`match_package', `hh', `cc')
add(`name', `hh', `cc', `test')
-add(`nothing_repository', `hh', `cc')
add(`package_database', `hh', `cc', `test')
add(`package_database_entry', `hh')
add(`paludis', `hh')
-add(`portage_repository', `hh', `cc', `test', `testscript')
add(`portage_dep_lexer', `hh', `cc', `test')
add(`portage_dep_parser', `hh', `cc', `test')
add(`repository', `hh', `cc')
add(`syncer', `hh', `cc')
add(`test_environment', `hh', `cc')
-add(`vdb_repository', `hh', `cc', `test', `testscript')
add(`version_metadata', `hh', `cc')
add(`version_operator', `hh', `cc', `test')
add(`version_spec', `hh', `cc', `test')
diff --git a/paludis/package_database_TEST.cc b/paludis/package_database_TEST.cc
index b8fd410..c899028 100644
--- a/paludis/package_database_TEST.cc
+++ b/paludis/package_database_TEST.cc
@@ -18,6 +18,7 @@
*/
#include <paludis/paludis.hh>
+#include <paludis/repositories/fake/fake_repository.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/qa/Makefile.am.m4 b/paludis/qa/Makefile.am.m4
index 734b7b5..22e12a2 100644
--- a/paludis/qa/Makefile.am.m4
+++ b/paludis/qa/Makefile.am.m4
@@ -13,9 +13,9 @@ $1_TEST_SOURCES = $1_TEST.cc
$1_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludisqa.a \
- $(top_builddir)/paludis/libpaludis.a \
- $(top_builddir)/paludis/util/libpaludisutil.a
+ libpaludisqa.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
@@ -33,7 +33,8 @@ addthis(`$1',`$5')addthis(`$1',`$6')')dnl
include(`paludis/qa/files.m4')
-libpaludisqa_a_SOURCES = filelist
+libpaludisqa_la_SOURCES = filelist
+libpaludisqa_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
TESTS = testlist
@@ -44,7 +45,7 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
-noinst_LIBRARIES = libpaludisqa.a
+noinst_LTLIBRARIES = libpaludisqa.la
endif
diff --git a/paludis/repositories/Makefile.am b/paludis/repositories/Makefile.am
new file mode 100644
index 0000000..b2dc1e3
--- /dev/null
+++ b/paludis/repositories/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS = fake nothing portage vdb
+
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+MAINTAINERCLEANFILES = Makefile.in
+
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
new file mode 100644
index 0000000..adefe8d
--- /dev/null
+++ b/paludis/repositories/fake/Makefile.am
@@ -0,0 +1,16 @@
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CXXFLAGS = -I$(top_srcdir)
+DEFS= \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DDATADIR=\"$(datadir)\"
+
+paludis_repositories_libdir = $(libdir)
+paludis_repositories_lib_LTLIBRARIES = libpaludisfakerepository.la
+libpaludisfakerepository_la_SOURCES = fake_repository.cc fake_repository.hh
+libpaludisfakerepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+paludis_repositories_fake_includedir = $(includedir)/paludis/repositories/fake/
+paludis_repositories_fake_include_HEADERS = fake_repository.hh
+
diff --git a/paludis/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index 468fbe5..b3040f4 100644
--- a/paludis/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -18,7 +18,7 @@
*/
#include <map>
-#include <paludis/fake_repository.hh>
+#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/util/stringify.hh>
#include <paludis/version_metadata.hh>
#include <paludis/portage_dep_parser.hh>
diff --git a/paludis/fake_repository.hh b/paludis/repositories/fake/fake_repository.hh
index ce94dfa..ce94dfa 100644
--- a/paludis/fake_repository.hh
+++ b/paludis/repositories/fake/fake_repository.hh
diff --git a/paludis/repositories/nothing/Makefile.am b/paludis/repositories/nothing/Makefile.am
new file mode 100644
index 0000000..10a26ca
--- /dev/null
+++ b/paludis/repositories/nothing/Makefile.am
@@ -0,0 +1,16 @@
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CXXFLAGS = -I$(top_srcdir)
+DEFS= \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DDATADIR=\"$(datadir)\"
+
+paludis_repositories_libdir = $(libdir)
+paludis_repositories_lib_LTLIBRARIES = libpaludisnothingrepository.la
+libpaludisnothingrepository_la_SOURCES = nothing_repository.cc nothing_repository.hh
+libpaludisnothingrepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+paludis_repositories_nothing_includedir = $(includedir)/paludis/repositories/nothing/
+paludis_repositories_nothing_include_HEADERS = nothing_repository.hh
+
diff --git a/paludis/nothing_repository.cc b/paludis/repositories/nothing/nothing_repository.cc
index 996c7f4..080988c 100644
--- a/paludis/nothing_repository.cc
+++ b/paludis/repositories/nothing/nothing_repository.cc
@@ -19,7 +19,7 @@
#include "config.h"
-#include <paludis/nothing_repository.hh>
+#include <paludis/repositories/nothing/nothing_repository.hh>
#include <paludis/portage_dep_parser.hh>
#include <paludis/syncer.hh>
#include <paludis/util/dir_iterator.hh>
diff --git a/paludis/nothing_repository.hh b/paludis/repositories/nothing/nothing_repository.hh
index f862250..f862250 100644
--- a/paludis/nothing_repository.hh
+++ b/paludis/repositories/nothing/nothing_repository.hh
diff --git a/paludis/repositories/portage/Makefile.am b/paludis/repositories/portage/Makefile.am
new file mode 100644
index 0000000..8453ac6
--- /dev/null
+++ b/paludis/repositories/portage/Makefile.am
@@ -0,0 +1,44 @@
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CXXFLAGS = -I$(top_srcdir)
+DEFS= \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DDATADIR=\"$(datadir)\"
+
+
+paludis_repositories_libdir = $(libdir)
+paludis_repositories_lib_LTLIBRARIES = libpaludisportagerepository.la
+libpaludisportagerepository_la_SOURCES = portage_repository.cc portage_repository.hh
+libpaludisportagerepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+paludis_repositories_portage_includedir = $(includedir)/paludis/repositories/portage/
+paludis_repositories_portage_include_HEADERS = portage_repository.hh
+
+TESTS = portage_repository_TEST
+
+portage_repository_TEST_SOURCES = portage_repository_TEST.cc
+
+portage_repository_TEST_LDADD = \
+ $(top_builddir)/paludis/util/test_extras.o \
+ $(top_builddir)/test/libtest.a \
+ libpaludisportagerepository.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la
+
+portage_repository_TEST_CXXFLAGS = -I$(top_srcdir)
+
+EXTRA_DIST = \
+ portage_repository_TEST.cc \
+ portage_repository_TEST_setup.sh \
+ portage_repository_TEST_cleanup.sh
+
+check_PROGRAMS = $(TESTS)
+check_SCRIPTS = portage_repository_TEST_setup.sh portage_repository_TEST_cleanup.sh
+
+TESTS_ENVIRONMENT = env \
+ PALUDIS_EBUILD_DIR="$(top_srcdir)/ebuild/" \
+ PALUDIS_SKIP_CONFIG="yes" \
+ TEST_SCRIPT_DIR="$(srcdir)/" \
+ bash $(top_srcdir)/test/run_test.sh
+
diff --git a/paludis/portage_repository.cc b/paludis/repositories/portage/portage_repository.cc
index 4108a72..a235b35 100644
--- a/paludis/portage_repository.cc
+++ b/paludis/repositories/portage/portage_repository.cc
@@ -30,7 +30,7 @@
#include <paludis/package_database.hh>
#include <paludis/package_database_entry.hh>
#include <paludis/portage_dep_parser.hh>
-#include <paludis/portage_repository.hh>
+#include <paludis/repositories/portage/portage_repository.hh>
#include <paludis/syncer.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/fs_entry.hh>
diff --git a/paludis/portage_repository.hh b/paludis/repositories/portage/portage_repository.hh
index 85d0190..85d0190 100644
--- a/paludis/portage_repository.hh
+++ b/paludis/repositories/portage/portage_repository.hh
diff --git a/paludis/portage_repository_TEST.cc b/paludis/repositories/portage/portage_repository_TEST.cc
index 66e7bed..f0b42f5 100644
--- a/paludis/portage_repository_TEST.cc
+++ b/paludis/repositories/portage/portage_repository_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/portage_repository.hh>
+#include <paludis/repositories/portage/portage_repository.hh>
#include <paludis/test_environment.hh>
#include <paludis/util/system.hh>
#include <test/test_framework.hh>
diff --git a/paludis/portage_repository_TEST_cleanup.sh b/paludis/repositories/portage/portage_repository_TEST_cleanup.sh
index 8c0b290..8c0b290 100755
--- a/paludis/portage_repository_TEST_cleanup.sh
+++ b/paludis/repositories/portage/portage_repository_TEST_cleanup.sh
diff --git a/paludis/portage_repository_TEST_setup.sh b/paludis/repositories/portage/portage_repository_TEST_setup.sh
index b0f4306..b0f4306 100755
--- a/paludis/portage_repository_TEST_setup.sh
+++ b/paludis/repositories/portage/portage_repository_TEST_setup.sh
diff --git a/paludis/repositories/vdb/Makefile.am b/paludis/repositories/vdb/Makefile.am
new file mode 100644
index 0000000..8a566cf
--- /dev/null
+++ b/paludis/repositories/vdb/Makefile.am
@@ -0,0 +1,43 @@
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CXXFLAGS = -I$(top_srcdir)
+DEFS= \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DDATADIR=\"$(datadir)\"
+
+paludis_repositories_libdir = $(libdir)
+paludis_repositories_lib_LTLIBRARIES = libpaludisvdbrepository.la
+libpaludisvdbrepository_la_SOURCES = vdb_repository.cc vdb_repository.hh
+libpaludisvdbrepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+paludis_repositories_vdb_includedir = $(includedir)/paludis/repositories/vdb/
+paludis_repositories_vdb_include_HEADERS = vdb_repository.hh
+
+TESTS = vdb_repository_TEST
+
+vdb_repository_TEST_SOURCES = vdb_repository_TEST.cc
+
+vdb_repository_TEST_LDADD = \
+ $(top_builddir)/paludis/util/test_extras.o \
+ $(top_builddir)/test/libtest.a \
+ libpaludisvdbrepository.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la
+
+vdb_repository_TEST_CXXFLAGS = -I$(top_srcdir)
+
+EXTRA_DIST = \
+ vdb_repository_TEST.cc \
+ vdb_repository_TEST_setup.sh \
+ vdb_repository_TEST_cleanup.sh
+
+check_PROGRAMS = $(TESTS)
+check_SCRIPTS = vdb_repository_TEST_setup.sh vdb_repository_TEST_cleanup.sh
+
+TESTS_ENVIRONMENT = env \
+ PALUDIS_EBUILD_DIR="$(top_srcdir)/ebuild/" \
+ PALUDIS_SKIP_CONFIG="yes" \
+ TEST_SCRIPT_DIR="$(srcdir)/" \
+ bash $(top_srcdir)/test/run_test.sh
+
diff --git a/paludis/vdb_repository.cc b/paludis/repositories/vdb/vdb_repository.cc
index 0c153b3..2e4a383 100644
--- a/paludis/vdb_repository.cc
+++ b/paludis/repositories/vdb/vdb_repository.cc
@@ -17,6 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <paludis/repositories/vdb/vdb_repository.hh>
+
#include <paludis/dep_atom.hh>
#include <paludis/dep_atom_flattener.hh>
#include <paludis/portage_dep_parser.hh>
@@ -25,7 +27,6 @@
#include <paludis/config_file.hh>
#include <paludis/match_package.hh>
#include <paludis/package_database.hh>
-#include <paludis/vdb_repository.hh>
#include <paludis/util/iterator.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/fs_entry.hh>
diff --git a/paludis/vdb_repository.hh b/paludis/repositories/vdb/vdb_repository.hh
index 4c0b407..4c0b407 100644
--- a/paludis/vdb_repository.hh
+++ b/paludis/repositories/vdb/vdb_repository.hh
diff --git a/paludis/vdb_repository_TEST.cc b/paludis/repositories/vdb/vdb_repository_TEST.cc
index ca5f5f9..5ec49ce 100644
--- a/paludis/vdb_repository_TEST.cc
+++ b/paludis/repositories/vdb/vdb_repository_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/vdb_repository.hh>
+#include <paludis/repositories/vdb/vdb_repository.hh>
#include <paludis/test_environment.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/vdb_repository_TEST_cleanup.sh b/paludis/repositories/vdb/vdb_repository_TEST_cleanup.sh
index e9f03a6..e9f03a6 100755
--- a/paludis/vdb_repository_TEST_cleanup.sh
+++ b/paludis/repositories/vdb/vdb_repository_TEST_cleanup.sh
diff --git a/paludis/vdb_repository_TEST_setup.sh b/paludis/repositories/vdb/vdb_repository_TEST_setup.sh
index e816209..e816209 100755
--- a/paludis/vdb_repository_TEST_setup.sh
+++ b/paludis/repositories/vdb/vdb_repository_TEST_setup.sh
diff --git a/paludis/selinux/Makefile.am b/paludis/selinux/Makefile.am
index fdcf568..d455143 100644
--- a/paludis/selinux/Makefile.am
+++ b/paludis/selinux/Makefile.am
@@ -7,11 +7,13 @@ paludis_selinux_includedir = $(includedir)/paludis/selinux/
paludis_selinux_include_HEADERS = \
security_context.hh
-libpaludisselinux_a_SOURCES = \
+libpaludisselinux_la_SOURCES = \
$(paludis_selinux_include_HEADERS) \
security_context.cc
-lib_LIBRARIES = libpaludisselinux.a
+libpaludisselinux_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+
+lib_LTLIBRARIES = libpaludisselinux.la
TESTS =
EXTRA_DIST =
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index 7b5363f..f548c87 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -9,7 +9,7 @@ define(`testlist', `')dnl
define(`testscriptlist', `')dnl
define(`addtest', `define(`testlist', testlist `$1_TEST')dnl
$1_TEST_SOURCES = $1_TEST.cc
-$1_TEST_LDADD = test_extras.o $(top_builddir)/test/libtest.a libpaludisutil.a
+$1_TEST_LDADD = test_extras.o $(top_builddir)/test/libtest.a libpaludisutil.la
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
@@ -38,7 +38,8 @@ EXTRA_DIST = util.hh.m4 Makefile.am.m4 files.m4 smart_record.hh.m4 \
testscriptlist test_extras.cc
SUBDIRS = .
-libpaludisutil_a_SOURCES = filelist
+libpaludisutil_la_SOURCES = filelist
+libpaludisutil_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
TESTS = testlist
@@ -49,7 +50,7 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
-lib_LIBRARIES = libpaludisutil.a
+lib_LTLIBRARIES = libpaludisutil.la
paludis_util_includedir = $(includedir)/paludis/util/
paludis_util_include_HEADERS = headerlist
diff --git a/src/paludis/Makefile.am b/src/paludis/Makefile.am
index 3a11061..af1e3eb 100644
--- a/src/paludis/Makefile.am
+++ b/src/paludis/Makefile.am
@@ -22,9 +22,12 @@ paludis_SOURCES = \
paludis.cc
paludis_LDADD = \
- $(top_builddir)/paludis/libpaludis.a \
- $(top_builddir)/paludis/args/libpaludisargs.a \
- $(top_builddir)/paludis/util/libpaludisutil.a
+ $(top_builddir)/paludis/repositories/nothing/libpaludisnothingrepository.la \
+ $(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
+ $(top_builddir)/paludis/repositories/vdb/libpaludisvdbrepository.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/args/libpaludisargs.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la
TESTS_ENVIRONMENT = env \
TEST_SCRIPT_DIR="$(srcdir)/" \
diff --git a/src/qualudis/Makefile.am b/src/qualudis/Makefile.am
index 1fd9695..1e0ded7 100644
--- a/src/qualudis/Makefile.am
+++ b/src/qualudis/Makefile.am
@@ -16,10 +16,13 @@ qualudis_SOURCES = \
qualudis.cc
qualudis_LDADD = \
- $(top_builddir)/paludis/args/libpaludisargs.a \
- $(top_builddir)/paludis/qa/libpaludisqa.a \
- $(top_builddir)/paludis/libpaludis.a \
- $(top_builddir)/paludis/util/libpaludisutil.a
+ $(top_builddir)/paludis/repositories/nothing/libpaludisnothingrepository.la \
+ $(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
+ $(top_builddir)/paludis/repositories/vdb/libpaludisvdbrepository.la \
+ $(top_builddir)/paludis/qa/libpaludisqa.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/args/libpaludisargs.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la
TESTS_ENVIRONMENT = env TEST_SCRIPT_DIR="$(srcdir)/" bash $(top_srcdir)/test/run_test.sh bash
TESTS = version_TEST