aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-28 01:02:57 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-28 01:02:57 +0000
commita07e7738c23e1942b31eeccd77cdf6054654770e (patch)
tree9c9fa0e30f8337ee5407fb296f3ea03aea38dc99
parentb75ca26b7bf668cd5d1794696f64464c087df171 (diff)
downloadpaludis-a07e7738c23e1942b31eeccd77cdf6054654770e.tar.gz
paludis-a07e7738c23e1942b31eeccd77cdf6054654770e.tar.xz
Make monolithic work
-rw-r--r--doc/examples/Makefile.am5
-rw-r--r--paludis/Makefile.am.m47
-rw-r--r--paludis/args/Makefile.am8
-rw-r--r--paludis/dep_list/Makefile.am25
-rw-r--r--paludis/environment/default/Makefile.am25
-rw-r--r--paludis/environment/no_config/Makefile.am5
-rw-r--r--paludis/environment/test/Makefile.am5
-rw-r--r--paludis/libxml/Makefile.am6
-rw-r--r--paludis/qa/Makefile.am.m49
-rw-r--r--paludis/repositories/Makefile.am26
-rw-r--r--paludis/repositories/cran/Makefile.am4
-rw-r--r--paludis/repositories/fake/Makefile.am4
-rw-r--r--paludis/repositories/gems/Makefile.am4
-rw-r--r--paludis/repositories/nothing/Makefile.am4
-rw-r--r--paludis/repositories/portage/Makefile.am64
-rw-r--r--paludis/repositories/portage/make_ebuild_repository.cc9
-rw-r--r--paludis/repositories/portage/make_ebuild_repository.hh6
-rw-r--r--paludis/repositories/portage/registration.cc13
-rw-r--r--paludis/repositories/repository_maker.cc13
-rw-r--r--paludis/repositories/vdb/Makefile.am8
-rw-r--r--paludis/repositories/virtuals/Makefile.am4
-rw-r--r--paludis/selinux/Makefile.am4
-rw-r--r--paludis/tasks/Makefile.am4
-rw-r--r--src/adjutrix/Makefile.am1
-rw-r--r--src/paludis/Makefile.am4
-rw-r--r--src/qualudis/Makefile.am10
26 files changed, 229 insertions, 48 deletions
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 616fab1..df48183 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -8,12 +8,17 @@ DEFS= \
-DLIBDIR=\"$(libdir)\"
SUBDIRS = .
+
+if ! MONOLITHIC
+
noinst_PROGRAMS = \
pwp_basic_cplusplus_app
noinst_SCRIPTS = \
pwp_basic_ruby_app.rb
+endif
+
EXTRA_DIST = $(noinst_SCRIPTS)
pwp_basic_cplusplus_app_SOURCES = pwp_basic_cplusplus_app.cc
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index e9c1979..1c57b7a 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -19,8 +19,8 @@ $1_TEST_LDADD = \
$(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
$(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
$(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
$(DYNAMIC_LD_LIBS)
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
@@ -69,9 +69,14 @@ BUILT_SOURCES = srcleanlist
libpaludis_la_SOURCES = filelist
libpaludis_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+
+if ! MONOLITHIC
+
libpaludis_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la
+endif
+
TESTS = testlist
TESTS_ENVIRONMENT = env \
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index 54f2b62..6e80c15 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -30,9 +30,14 @@ libpaludisargs_la_SOURCES = $(paludis_args_include_HEADERS) \
man.cc
libpaludisargs_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+
+if ! MONOLITHIC
+
libpaludisargs_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la
+endif
+
TESTS_ENVIRONMENT = env PALUDIS_OPTIONS="" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
@@ -51,8 +56,9 @@ endif
check_PROGRAMS = $(TESTS)
test_ldadd = \
+ libpaludisargs.la \
$(top_builddir)/test/libtest.a \
- libpaludisargs.la
+ $(top_builddir)/paludis/util/libpaludisutil.la
args_TEST_SOURCES = args_TEST.cc
args_TEST_LDADD = $(test_ldadd)
diff --git a/paludis/dep_list/Makefile.am b/paludis/dep_list/Makefile.am
index 46e28de..bc7da3b 100644
--- a/paludis/dep_list/Makefile.am
+++ b/paludis/dep_list/Makefile.am
@@ -15,10 +15,15 @@ libpaludisdeplist_la_SOURCES = \
uninstall_list.cc uninstall_list.hh
libpaludisdeplist_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+
+if ! MONOLITHIC
+
libpaludisdeplist_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la
+endif
+
if MONOLITHIC
noinst_LTLIBRARIES = libpaludisdeplist.la
@@ -53,25 +58,25 @@ 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 \
+ libpaludisdeplist.la \
$(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la
+
+uninstall_list_TEST_SOURCES = uninstall_list_TEST.cc
+uninstall_list_TEST_LDADD = \
$(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
$(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
$(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
- libpaludisdeplist.la
+ $(top_builddir)/paludis/util/test_extras.o \
+ $(top_builddir)/test/libtest.a \
+ libpaludisdeplist.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/paludis/environment/default/Makefile.am b/paludis/environment/default/Makefile.am
index ce351a1..4638808 100644
--- a/paludis/environment/default/Makefile.am
+++ b/paludis/environment/default/Makefile.am
@@ -16,11 +16,16 @@ libpaludisdefaultenvironment_la_SOURCES = \
default_environment.cc default_environment.hh
libpaludisdefaultenvironment_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+
+if ! MONOLITHIC
+
libpaludisdefaultenvironment_la_LIBADD = \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la
+endif
+
if MONOLITHIC
noinst_LTLIBRARIES = libpaludisdefaultenvironment.la
@@ -59,12 +64,30 @@ check_PROGRAMS = $(TESTS)
check_SCRIPTS = default_environment_TEST_setup.sh default_environment_TEST_cleanup.sh
default_environment_TEST_SOURCES = default_environment_TEST.cc
+
+if MONOLITHIC
+
default_environment_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
+ libpaludisdefaultenvironment.la \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- libpaludisdefaultenvironment.la
+ $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
+ $(DYNAMIC_LD_LIBS)
+
+else
+
+default_environment_TEST_LDADD = \
+ libpaludisdefaultenvironment.la \
+ $(top_builddir)/paludis/util/test_extras.o \
+ $(top_builddir)/test/libtest.a \
+ $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(DYNAMIC_LD_LIBS)
+
+endif
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/paludis/environment/no_config/Makefile.am b/paludis/environment/no_config/Makefile.am
index 1b8c2bd..48aed38 100644
--- a/paludis/environment/no_config/Makefile.am
+++ b/paludis/environment/no_config/Makefile.am
@@ -12,6 +12,9 @@ libpaludisnoconfigenvironment_la_SOURCES = \
no_config_environment.cc no_config_environment.hh
libpaludisnoconfigenvironment_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+
+if ! MONOLITHIC
+
libpaludisnoconfigenvironment_la_LIBADD = \
$(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
$(top_builddir)/paludis/repositories/vdb/libpaludisvdbrepository.la \
@@ -19,6 +22,8 @@ libpaludisnoconfigenvironment_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la
+endif
+
if MONOLITHIC
noinst_LTLIBRARIES = libpaludisnoconfigenvironment.la
diff --git a/paludis/environment/test/Makefile.am b/paludis/environment/test/Makefile.am
index 9a29cca..3979637 100644
--- a/paludis/environment/test/Makefile.am
+++ b/paludis/environment/test/Makefile.am
@@ -11,10 +11,15 @@ libpaludistestenvironment_la_SOURCES = \
test_environment.cc test_environment.hh
libpaludistestenvironment_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+
+if ! MONOLITHIC
+
libpaludistestenvironment_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la
+endif
+
if MONOLITHIC
noinst_LTLIBRARIES = libpaludistestenvironment.la
diff --git a/paludis/libxml/Makefile.am b/paludis/libxml/Makefile.am
index 296f40e..22cf85a 100644
--- a/paludis/libxml/Makefile.am
+++ b/paludis/libxml/Makefile.am
@@ -36,9 +36,15 @@ paludis_libxml_include_HEADERS = \
libpaludislibxml_la_SOURCES = $(paludis_libxml_include_HEADERS) \
libxml.cc
libpaludislibxml_la_CXXFLAGS = @LIBXML2DEPS_CFLAGS@
+
+if ! MONOLITHIC
+
libpaludislibxml_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
@LIBXML2DEPS_LIBS@
+
+endif
+
libpaludislibxml_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
endif
diff --git a/paludis/qa/Makefile.am.m4 b/paludis/qa/Makefile.am.m4
index 86b3012..4e08cc2 100644
--- a/paludis/qa/Makefile.am.m4
+++ b/paludis/qa/Makefile.am.m4
@@ -17,11 +17,11 @@ $1_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
libpaludisqa.la \
+ $(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libxml/libpaludislibxml.la \
- $(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
- $(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
+ $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(DYNAMIC_LD_LIBS) \
$(PCREPLUSPLUS_LIBS) \
$(LIBXML2DEPS_LIBS)
@@ -61,6 +61,9 @@ INCLUDES = $(PCREPLUSPLUS_CFLAGS) $(LIBXML2DEPS_CFLAGS)
libpaludisqa_la_SOURCES = filelist
libpaludisqa_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+
+if ! MONOLITHIC
+
libpaludisqa_la_LIBADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
@@ -71,6 +74,8 @@ libpaludisqa_la_LIBADD = \
@LIBXML2DEPS_LIBS@ \
@PCREPLUSPLUS_LIBS@
+endif
+
TESTS = testlist
TESTS_ENVIRONMENT = env \
diff --git a/paludis/repositories/Makefile.am b/paludis/repositories/Makefile.am
index c16d856..d4cf1f6 100644
--- a/paludis/repositories/Makefile.am
+++ b/paludis/repositories/Makefile.am
@@ -1,4 +1,13 @@
-SUBDIRS = $(BUILD_REPOSITORIES)
+if MONOLITHIC
+
+SUBDIRS = $(BUILD_REPOSITORIES) .
+
+else
+
+SUBDIRS = . $(BUILD_REPOSITORIES)
+
+endif
+
DIST_SUBDIRS = $(ALL_REPOSITORIES)
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
@@ -19,11 +28,26 @@ libpaludisrepositories_la_SOURCES = \
$(paludis_repositories_include_HEADERS)
libpaludisrepositories_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+
+if MONOLITHIC
+
libpaludisrepositories_la_LIBADD = \
+ $(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
+ $(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
+ $(top_builddir)/paludis/repositories/vdb/libpaludisvdbrepository.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la \
@DYNAMIC_LD_LIBS@
+else
+
+libpaludisrepositories_la_LIBADD = \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ @DYNAMIC_LD_LIBS@
+
+endif
+
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/paludis/repositories/cran/Makefile.am b/paludis/repositories/cran/Makefile.am
index 5aab858..11dc81c 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -40,11 +40,15 @@ libpaludiscranrepository_la_SOURCES = \
registration.cc \
$(paludis_repositories_cran_include_HEADERS)
+if ! MONOLITHIC
+
libpaludiscranrepository_la_LIBADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(DYNAMIC_LD_LIBS)
+endif
+
TESTS = cran_dep_parser_TEST cran_repository_TEST
cran_dep_parser_TEST_SOURCES = cran_dep_parser_TEST.cc
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index d5265d9..dcc3eeb 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -24,10 +24,14 @@ libpaludisfakerepository_la_SOURCES = \
fake_repository.cc fake_repository.hh \
fake_installed_repository.cc fake_installed_repository.hh
+if ! MONOLITHIC
+
libpaludisfakerepository_la_LIBADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la
+endif
+
libpaludisfakerepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_repositories_fake_includedir = $(includedir)/paludis/repositories/fake/
diff --git a/paludis/repositories/gems/Makefile.am b/paludis/repositories/gems/Makefile.am
index 9cb5ae4..625cbc6 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -46,12 +46,16 @@ libpaludisgemsrepository_la_SOURCES = \
registration.cc \
$(paludis_repositories_gems_include_HEADERS)
+if ! MONOLITHIC
+
libpaludisgemsrepository_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la \
-lyaml \
$(DYNAMIC_LD_LIBS)
+endif
+
gems_repository_TEST_SOURCES = gems_repository_TEST.cc
gems_repository_TEST_LDADD = \
diff --git a/paludis/repositories/nothing/Makefile.am b/paludis/repositories/nothing/Makefile.am
index c12e690..6dd9b24 100644
--- a/paludis/repositories/nothing/Makefile.am
+++ b/paludis/repositories/nothing/Makefile.am
@@ -28,11 +28,15 @@ libpaludisnothingrepository_la_SOURCES = \
libpaludisnothingrepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_repositories_nothing_includedir = $(includedir)/paludis/repositories/nothing/
+if ! MONOLITHIC
+
libpaludisnothingrepository_la_LIBADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(DYNAMIC_LD_LIBS)
+endif
+
paludis_repositories_nothing_include_HEADERS = \
nothing_repository.hh \
nothing_repository-sr.hh
diff --git a/paludis/repositories/portage/Makefile.am b/paludis/repositories/portage/Makefile.am
index 7b528ba..776e732 100644
--- a/paludis/repositories/portage/Makefile.am
+++ b/paludis/repositories/portage/Makefile.am
@@ -13,7 +13,34 @@ DEFS= \
-DLIBDIR=\"$(libdir)\"
paludis_repositories_libdir = $(libdir)/paludis/repositories
+
+if MONOLITHIC
+
+if ENABLE_GLSA
+
+noinst_LTLIBRARIES = \
+ libpaludisportagerepository.la
+
+else
+
+noinst_LTLIBRARIES = \
+ libpaludisportagerepository.la \
+ libpaludisportagerepositoryxmlthings.la
+
+endif
+
+else
+
paludis_repositories_lib_LTLIBRARIES = libpaludisportagerepository.la
+
+if ENABLE_GLSA
+
+lib_LTLIBRARIES = libpaludisportagerepositoryxmlthings.la
+
+endif
+
+endif
+
paludis_repositories_portage_includedir = $(includedir)/paludis/repositories/portage/
libpaludisportagerepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
@@ -54,11 +81,20 @@ libpaludisportagerepository_la_SOURCES = \
registration.cc \
$(paludis_repositories_portage_include_HEADERS)
+if MONOLITHIC
+
+libpaludisportagerepository_la_LIBADD = \
+ $(DYNAMIC_LD_LIBS)
+
+else
+
libpaludisportagerepository_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la \
$(DYNAMIC_LD_LIBS)
+endif
+
portage_repository_TEST_SOURCES = portage_repository_TEST.cc
portage_repository_TEST_LDADD = \
@@ -67,7 +103,8 @@ portage_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
- $(top_builddir)/test/libtest.a
+ $(top_builddir)/test/libtest.a \
+ $(DYNAMIC_LD_LIBS)
portage_repository_TEST_CXXFLAGS = -I$(top_srcdir)
@@ -124,31 +161,38 @@ glsa-sr.hh : glsa.sr $(top_srcdir)/misc/make_sr.bash
glsa-sr.cc : glsa.sr $(top_srcdir)/misc/make_sr.bash
$(top_srcdir)/misc/make_sr.bash --source $(srcdir)/glsa.sr > $@
-if ENABLE_GLSA
+libpaludisportagerepositoryxmlthings_la_SOURCES = xml_things.cc
+libpaludisportagerepositoryxmlthings_la_CXXFLAGS = @LIBXML2DEPS_CFLAGS@
if MONOLITHIC
-noinst_LTLIBRARIES = libpaludisportagerepositoryxmlthings.la
+libpaludisportagerepositoryxmlthings_la_LIBADD = @LIBXML2DEPS_LIBS@ \
+ $(DYNAMIC_LD_LIBS)
else
-lib_LTLIBRARIES = libpaludisportagerepositoryxmlthings.la
-
-endif
-
-libpaludisportagerepositoryxmlthings_la_SOURCES = xml_things.cc
-libpaludisportagerepositoryxmlthings_la_CXXFLAGS = @LIBXML2DEPS_CFLAGS@
libpaludisportagerepositoryxmlthings_la_LIBADD = @LIBXML2DEPS_LIBS@ \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libxml/libpaludislibxml.la
+
+endif
+
libpaludisportagerepositoryxmlthings_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+if ENABLE_GLSA
+
GLSA_TESTS = xml_things_TEST
xml_things_TEST_SOURCES = xml_things_TEST.cc
xml_things_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludisportagerepository.la
+ libpaludisportagerepository.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/test/libtest.a \
+ $(DYNAMIC_LD_LIBS)
+
endif
TESTS = portage_repository_TEST $(GLSA_TESTS)
diff --git a/paludis/repositories/portage/make_ebuild_repository.cc b/paludis/repositories/portage/make_ebuild_repository.cc
index 4ed483f..c9d8718 100644
--- a/paludis/repositories/portage/make_ebuild_repository.cc
+++ b/paludis/repositories/portage/make_ebuild_repository.cc
@@ -148,3 +148,12 @@ paludis::make_ebuild_repository(
.buildroot(buildroot)));
}
+CountedPtr<Repository>
+paludis::make_ebuild_repository_wrapped(
+ const Environment * const env,
+ const PackageDatabase * const db,
+ AssociativeCollection<std::string, std::string>::ConstPointer m)
+{
+ return make_ebuild_repository(env, db, m);
+}
+
diff --git a/paludis/repositories/portage/make_ebuild_repository.hh b/paludis/repositories/portage/make_ebuild_repository.hh
index 2b58f0f..ca7cb52 100644
--- a/paludis/repositories/portage/make_ebuild_repository.hh
+++ b/paludis/repositories/portage/make_ebuild_repository.hh
@@ -34,6 +34,12 @@ namespace paludis
make_ebuild_repository(const Environment * const,
const PackageDatabase * const,
AssociativeCollection<std::string, std::string>::ConstPointer) PALUDIS_VISIBLE;
+
+ CountedPtr<Repository>
+ make_ebuild_repository_wrapped(
+ const Environment * const env,
+ const PackageDatabase * const db,
+ AssociativeCollection<std::string, std::string>::ConstPointer m);
}
#endif
diff --git a/paludis/repositories/portage/registration.cc b/paludis/repositories/portage/registration.cc
index 7c00dc5..90e494b 100644
--- a/paludis/repositories/portage/registration.cc
+++ b/paludis/repositories/portage/registration.cc
@@ -30,19 +30,6 @@ extern "C"
void register_repositories(RepositoryMaker * maker);
}
-
-namespace
-{
- CountedPtr<Repository>
- make_ebuild_repository_wrapped(
- const Environment * const env,
- const PackageDatabase * const db,
- AssociativeCollection<std::string, std::string>::ConstPointer m)
- {
- return make_ebuild_repository(env, db, m);
- }
-}
-
void register_repositories(RepositoryMaker * maker)
{
maker->register_maker("ebuild", &make_ebuild_repository_wrapped);
diff --git a/paludis/repositories/repository_maker.cc b/paludis/repositories/repository_maker.cc
index a07c99d..b6e2c8d 100644
--- a/paludis/repositories/repository_maker.cc
+++ b/paludis/repositories/repository_maker.cc
@@ -29,6 +29,13 @@
#include "config.h"
+#ifdef MONOLITHIC
+# include <paludis/repositories/portage/make_ebuild_repository.hh>
+# include <paludis/repositories/vdb/vdb_repository.hh>
+# include <paludis/repositories/virtuals/installed_virtuals_repository.hh>
+# include <paludis/repositories/virtuals/virtuals_repository.hh>
+#endif
+
using namespace paludis;
PaludisRepositorySoDirNotADirectoryError::PaludisRepositorySoDirNotADirectoryError() throw () :
@@ -110,6 +117,12 @@ RepositoryMaker::RepositoryMaker() :
{
#ifdef MONOLITHIC
+ register_maker("ebuild", &make_ebuild_repository_wrapped);
+ register_maker("portage", &make_ebuild_repository_wrapped);
+ register_maker("vdb", &VDBRepository::make_vdb_repository);
+ register_maker("virtuals", &VirtualsRepository::make_virtuals_repository);
+ register_maker("installed_virtuals", &InstalledVirtualsRepository::make_installed_virtuals_repository);
+
#else
FSEntry so_dir(getenv_with_default("PALUDIS_REPOSITORY_SO_DIR", LIBDIR "/paludis/repositories"));
diff --git a/paludis/repositories/vdb/Makefile.am b/paludis/repositories/vdb/Makefile.am
index 14d9272..c04556a 100644
--- a/paludis/repositories/vdb/Makefile.am
+++ b/paludis/repositories/vdb/Makefile.am
@@ -32,11 +32,15 @@ paludis_repositories_vdb_include_HEADERS = \
vdb_repository-sr.hh \
vdb_repository-sr.cc
+if ! MONOLITHIC
+
libpaludisvdbrepository_la_LIBADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(DYNAMIC_LD_LIBS)
+endif
+
TESTS = vdb_repository_TEST
vdb_repository_TEST_SOURCES = vdb_repository_TEST.cc
@@ -45,7 +49,9 @@ vdb_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
$(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
- libpaludisvdbrepository.la
+ libpaludisvdbrepository.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la
vdb_repository_TEST_CXXFLAGS = -I$(top_srcdir)
diff --git a/paludis/repositories/virtuals/Makefile.am b/paludis/repositories/virtuals/Makefile.am
index 70ec690..afee265 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -36,11 +36,15 @@ libpaludisvirtualsrepository_la_SOURCES = \
registration.cc \
$(paludis_repositories_portage_include_HEADERS)
+if ! MONOLITHIC
+
libpaludisvirtualsrepository_la_LIBADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(DYNAMIC_LD_LIBS)
+endif
+
EXTRA_DIST = \
vr_entry-sr.hh \
vr_entry-sr.cc \
diff --git a/paludis/selinux/Makefile.am b/paludis/selinux/Makefile.am
index cf1b18a..3067616 100644
--- a/paludis/selinux/Makefile.am
+++ b/paludis/selinux/Makefile.am
@@ -11,10 +11,14 @@ libpaludisselinux_la_SOURCES = \
$(paludis_selinux_include_HEADERS) \
security_context.cc
+if ! MONOLITHIC
+
libpaludisselinux_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
@DYNAMIC_LD_LIBS@
+endif
+
libpaludisselinux_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
if MONOLITHIC
diff --git a/paludis/tasks/Makefile.am b/paludis/tasks/Makefile.am
index 89e4575..6932997 100644
--- a/paludis/tasks/Makefile.am
+++ b/paludis/tasks/Makefile.am
@@ -36,11 +36,15 @@ libpaludistasks_a_SOURCES = $(paludis_tasks_include_HEADERS) \
stage_builder_task.cc \
report_task.cc
+if ! MONOLITHIC
+
libpaludistasks_a_LIBADD = \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la
+endif
+
BUILT_SOURCES = \
stage_options-sr.hh \
stage_options-sr.cc
diff --git a/src/adjutrix/Makefile.am b/src/adjutrix/Makefile.am
index 73a9037..36e3cee 100644
--- a/src/adjutrix/Makefile.am
+++ b/src/adjutrix/Makefile.am
@@ -45,6 +45,7 @@ adjutrix_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
+ $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(top_builddir)/src/liboutput.a \
$(DYNAMIC_LD_LIBS)
diff --git a/src/paludis/Makefile.am b/src/paludis/Makefile.am
index e451510..de28d3b 100644
--- a/src/paludis/Makefile.am
+++ b/src/paludis/Makefile.am
@@ -48,10 +48,8 @@ paludis_LDADD = \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
- $(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
- $(top_builddir)/paludis/repositories/vdb/libpaludisvdbrepository.la \
- $(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
+ $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(top_builddir)/src/liboutput.a \
$(DYNAMIC_LD_LIBS)
diff --git a/src/qualudis/Makefile.am b/src/qualudis/Makefile.am
index 71dd6db..8a4280c 100644
--- a/src/qualudis/Makefile.am
+++ b/src/qualudis/Makefile.am
@@ -21,13 +21,13 @@ if MONOLITHIC
qualudis_LDADD = \
$(top_builddir)/paludis/qa/libpaludisqa.la \
- $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/src/liboutput.a \
- $(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
- $(top_builddir)/paludis/repositories/vdb/libpaludisvdbrepository.la \
- $(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
+ $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/libxml/libpaludislibxml.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
$(PCREPLUSPLUS_LIBS) \
$(LIBXML2DEPS_LIBS) \
$(DYNAMIC_LD_LIBS)