aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-22 15:59:14 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-22 15:59:14 +0000
commit3798f313cfe67ed0047c59d485760e965e1e247c (patch)
treefad2ef0a0dc64975978c68eb472d6984c269e99e
parent60e64edbf8b40c6157666c372e54ba719f868839 (diff)
downloadpaludis-3798f313cfe67ed0047c59d485760e965e1e247c.tar.gz
paludis-3798f313cfe67ed0047c59d485760e965e1e247c.tar.xz
Add --enable-monolithic, for developer use only
-rw-r--r--configure.ac18
-rw-r--r--paludis/Makefile.am.m410
-rw-r--r--paludis/args/Makefile.am9
-rw-r--r--paludis/dep_list/Makefile.am9
-rw-r--r--paludis/digests/Makefile.am8
-rw-r--r--paludis/environment/default/Makefile.am9
-rw-r--r--paludis/environment/no_config/Makefile.am9
-rw-r--r--paludis/environment/test/Makefile.am9
-rw-r--r--paludis/libxml/Makefile.am9
-rw-r--r--paludis/qa/Makefile.am.m410
-rw-r--r--paludis/repositories/cran/Makefile.am10
-rw-r--r--paludis/repositories/fake/Makefile.am9
-rw-r--r--paludis/repositories/gems/Makefile.am10
-rw-r--r--paludis/repositories/nothing/Makefile.am10
-rw-r--r--paludis/repositories/portage/Makefile.am10
-rw-r--r--paludis/repositories/vdb/Makefile.am10
-rw-r--r--paludis/repositories/virtuals/Makefile.am10
-rw-r--r--paludis/selinux/Makefile.am8
-rw-r--r--paludis/tasks/Makefile.am2
-rw-r--r--paludis/util/Makefile.am.m410
-rw-r--r--src/paludis/Makefile.am19
-rw-r--r--src/qualudis/Makefile.am19
22 files changed, 225 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index efec8ae..8603925 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,9 +23,25 @@ AC_SUBST([VERSION_LIB_REVISION])
AM_INIT_AUTOMAKE(paludis, [$VERSION_FULL])
dnl }}}
+dnl {{{ monolithic build
+AC_MSG_CHECKING([whether to do a monolithic build])
+AC_ARG_ENABLE([monolithic],
+ AS_HELP_STRING([--enable-monolithic], [Make a monolithic build (developer use only)]),
+ [MONOLITHIC=$enableval
+ AC_MSG_RESULT([$enableval])],
+ [MONOLITHIC=no
+ AC_MSG_RESULT([no])])
+AC_SUBST([MONOLITHIC])
+AM_CONDITIONAL([MONOLITHIC], test "x$MONOLITHIC" = "xyes")
+dnl }}}
+
dnl {{{ basic toolchain checks
AC_LANG([C++])
-AC_DISABLE_STATIC
+if test "x$MONOLITHIC" = "xyes" ; then
+ AC_DISABLE_SHARED
+else
+ AC_DISABLE_STATIC
+fi
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LN_S
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index a0ef39d..e832197 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -82,7 +82,17 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
+
+if MONOLITHIC
+
lib_LTLIBRARIES = libpaludis.la
+
+else
+
+noinst_LTLIBRARIES = libpaludis.la
+
+endif
+
paludis_includedir = $(includedir)/paludis/
paludis_include_HEADERS = headerlist srheaderlist
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index f2e748f..dc5b4f6 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -38,7 +38,16 @@ TESTS_ENVIRONMENT = env -u PALUDIS_OPTIONS \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
bash $(top_srcdir)/test/run_test.sh
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisargs.la
+
+else
+
lib_LTLIBRARIES = libpaludisargs.la
+
+endif
+
check_PROGRAMS = $(TESTS)
test_ldadd = \
diff --git a/paludis/dep_list/Makefile.am b/paludis/dep_list/Makefile.am
index af7ccc9..46e28de 100644
--- a/paludis/dep_list/Makefile.am
+++ b/paludis/dep_list/Makefile.am
@@ -19,7 +19,16 @@ libpaludisdeplist_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisdeplist.la
+
+else
+
lib_LTLIBRARIES = libpaludisdeplist.la
+
+endif
+
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
diff --git a/paludis/digests/Makefile.am b/paludis/digests/Makefile.am
index 7ba4cda..65c5ae4 100644
--- a/paludis/digests/Makefile.am
+++ b/paludis/digests/Makefile.am
@@ -19,8 +19,16 @@ libpaludisdigests_la_SOURCES = \
libpaludisdigests_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisdigests.la
+
+else
+
lib_LTLIBRARIES = libpaludisdigests.la
+endif
+
TESTS = sha256_TEST rmd160_TEST md5_TEST
EXTRA_DIST = sha256_TEST.cc rmd160_TEST.cc md5_TEST.cc
diff --git a/paludis/environment/default/Makefile.am b/paludis/environment/default/Makefile.am
index c599e48..4111821 100644
--- a/paludis/environment/default/Makefile.am
+++ b/paludis/environment/default/Makefile.am
@@ -20,7 +20,16 @@ libpaludisdefaultenvironment_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisdefaultenvironment.la
+
+else
+
lib_LTLIBRARIES = libpaludisdefaultenvironment.la
+
+endif
+
paludis_environment_default_includedir = $(includedir)/paludis/environment/default
paludis_environment_default_include_HEADERS = \
default_config.hh \
diff --git a/paludis/environment/no_config/Makefile.am b/paludis/environment/no_config/Makefile.am
index 0c88f5f..6b2f6d3 100644
--- a/paludis/environment/no_config/Makefile.am
+++ b/paludis/environment/no_config/Makefile.am
@@ -18,7 +18,16 @@ libpaludisnoconfigenvironment_la_LIBADD = \
$(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
$(top_builddir)/paludis/repositories/vdb/libpaludisvdbrepository.la
+if MONOLITHIC
+
lib_LTLIBRARIES = libpaludisnoconfigenvironment.la
+
+else
+
+noinst_LTLIBRARIES = libpaludisnoconfigenvironment.la
+
+endif
+
paludis_environment_no_config_includedir = $(includedir)/paludis/environment/no_config
paludis_environment_no_config_include_HEADERS = \
no_config_environment.hh \
diff --git a/paludis/environment/test/Makefile.am b/paludis/environment/test/Makefile.am
index 75277e3..9a29cca 100644
--- a/paludis/environment/test/Makefile.am
+++ b/paludis/environment/test/Makefile.am
@@ -15,7 +15,16 @@ libpaludistestenvironment_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludistestenvironment.la
+
+else
+
lib_LTLIBRARIES = libpaludistestenvironment.la
+
+endif
+
paludis_environment_test_includedir = $(includedir)/paludis/environment/test
paludis_environment_test_include_HEADERS = test_environment.hh
diff --git a/paludis/libxml/Makefile.am b/paludis/libxml/Makefile.am
index 6b708b8..504572f 100644
--- a/paludis/libxml/Makefile.am
+++ b/paludis/libxml/Makefile.am
@@ -20,7 +20,16 @@ check_SCRIPTS =
if NEED_XML
+if MONOLITHIC
+
lib_LTLIBRARIES = libpaludislibxml.la
+
+else
+
+noinst_LTLIBRARIES = libpaludislibxml.la
+
+endif
+
paludis_libxml_includedir = $(includedir)/paludis/libxml
paludis_libxml_include_HEADERS = \
libxml.hh
diff --git a/paludis/qa/Makefile.am.m4 b/paludis/qa/Makefile.am.m4
index bbe9c35..72d4ea8 100644
--- a/paludis/qa/Makefile.am.m4
+++ b/paludis/qa/Makefile.am.m4
@@ -79,7 +79,17 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
+
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisqa.la
+
+else
+
lib_LTLIBRARIES = libpaludisqa.la
+
+endif
+
paludis_qaincludedir = $(includedir)/paludis/qa/
paludis_qainclude_HEADERS = headerlist srheaderlist
diff --git a/paludis/repositories/cran/Makefile.am b/paludis/repositories/cran/Makefile.am
index 30beb44..d8e51c6 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -10,7 +10,17 @@ DEFS= \
-DLIBDIR=\"$(libdir)\"
paludis_repositories_libdir = $(libdir)/paludis/repositories
+
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludiscranrepository.la
+
+else
+
paludis_repositories_lib_LTLIBRARIES = libpaludiscranrepository.la
+
+endif
+
paludis_repositories_cran_includedir = $(includedir)/paludis/repositories/cran/
libpaludiscranrepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index 688ff44..7cdcb34 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -8,8 +8,17 @@ DEFS= \
-DDATADIR=\"$(datadir)\"
paludis_repositories_libdir = $(libdir)/paludis/repositories
+
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisfakerepository.la
+
+else
+
paludis_repositories_lib_LTLIBRARIES = libpaludisfakerepository.la
+endif
+
libpaludisfakerepository_la_SOURCES = \
fake_repository_base.cc fake_repository_base.hh \
fake_repository.cc fake_repository.hh \
diff --git a/paludis/repositories/gems/Makefile.am b/paludis/repositories/gems/Makefile.am
index f00b31f..4355a00 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -14,7 +14,17 @@ DEFS= \
-DLIBDIR=\"$(libdir)\"
paludis_repositories_libdir = $(libdir)/paludis/repositories
+
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisgemsrepository.la
+
+else
+
paludis_repositories_lib_LTLIBRARIES = libpaludisgemsrepository.la
+
+endif
+
paludis_repositories_gems_includedir = $(includedir)/paludis/repositories/gems/
libpaludisgemsrepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
diff --git a/paludis/repositories/nothing/Makefile.am b/paludis/repositories/nothing/Makefile.am
index 9715307..b191155 100644
--- a/paludis/repositories/nothing/Makefile.am
+++ b/paludis/repositories/nothing/Makefile.am
@@ -9,7 +9,17 @@ DEFS= \
-DDATADIR=\"$(datadir)\"
paludis_repositories_libdir = $(libdir)/paludis/repositories
+
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisnothingrepository.la
+
+else
+
paludis_repositories_lib_LTLIBRARIES = libpaludisnothingrepository.la
+
+endif
+
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/
diff --git a/paludis/repositories/portage/Makefile.am b/paludis/repositories/portage/Makefile.am
index 07c5c67..2b062e2 100644
--- a/paludis/repositories/portage/Makefile.am
+++ b/paludis/repositories/portage/Makefile.am
@@ -122,7 +122,17 @@ glsa-sr.cc : glsa.sr $(top_srcdir)/misc/make_sr.bash
$(top_srcdir)/misc/make_sr.bash --source $(srcdir)/glsa.sr > $@
if ENABLE_GLSA
+
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisportagerepositoryxmlthings.la
+
+else
+
lib_LTLIBRARIES = libpaludisportagerepositoryxmlthings.la
+
+endif
+
libpaludisportagerepositoryxmlthings_la_SOURCES = xml_things.cc
libpaludisportagerepositoryxmlthings_la_CXXFLAGS = @LIBXML2DEPS_CFLAGS@
libpaludisportagerepositoryxmlthings_la_LIBADD = @LIBXML2DEPS_LIBS@ \
diff --git a/paludis/repositories/vdb/Makefile.am b/paludis/repositories/vdb/Makefile.am
index 6b1b87b..8f12945 100644
--- a/paludis/repositories/vdb/Makefile.am
+++ b/paludis/repositories/vdb/Makefile.am
@@ -9,7 +9,17 @@ DEFS= \
-DDATADIR=\"$(datadir)\"
paludis_repositories_libdir = $(libdir)/paludis/repositories
+
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisvdbrepository.la
+
+else
+
paludis_repositories_lib_LTLIBRARIES = libpaludisvdbrepository.la
+
+endif
+
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/
diff --git a/paludis/repositories/virtuals/Makefile.am b/paludis/repositories/virtuals/Makefile.am
index 1a13786..ce21ecf 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -10,7 +10,17 @@ DEFS= \
-DLIBDIR=\"$(libdir)\"
paludis_repositories_libdir = $(libdir)/paludis/repositories
+
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisvirtualsrepository.la
+
+else
+
paludis_repositories_lib_LTLIBRARIES = libpaludisvirtualsrepository.la
+
+endif
+
paludis_repositories_virtuals_includedir = $(includedir)/paludis/repositories/virtuals/
libpaludisvirtualsrepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
diff --git a/paludis/selinux/Makefile.am b/paludis/selinux/Makefile.am
index 1c7c1ed..11a2c74 100644
--- a/paludis/selinux/Makefile.am
+++ b/paludis/selinux/Makefile.am
@@ -13,8 +13,16 @@ libpaludisselinux_la_SOURCES = \
libpaludisselinux_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisselinux.la
+
+else
+
lib_LTLIBRARIES = libpaludisselinux.la
+endif
+
TESTS =
EXTRA_DIST =
diff --git a/paludis/tasks/Makefile.am b/paludis/tasks/Makefile.am
index 5069227..5803430 100644
--- a/paludis/tasks/Makefile.am
+++ b/paludis/tasks/Makefile.am
@@ -19,7 +19,7 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS =
-lib_LIBRARIES = libpaludistasks.a
+noinst_LIBRARIES = libpaludistasks.a
paludis_tasks_includedir = $(includedir)/paludis/tasks
paludis_tasks_include_HEADERS = \
install_task.hh \
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index 696fbbb..90f8c47 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -52,7 +52,17 @@ TESTS_ENVIRONMENT = env \
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
+
+if MONOLITHIC
+
+noinst_LTLIBRARIES = libpaludisutil.la
+
+else
+
lib_LTLIBRARIES = libpaludisutil.la
+
+endif
+
paludis_util_includedir = $(includedir)/paludis/util/
paludis_util_include_HEADERS = headerlist
diff --git a/src/paludis/Makefile.am b/src/paludis/Makefile.am
index bd30c44..e451510 100644
--- a/src/paludis/Makefile.am
+++ b/src/paludis/Makefile.am
@@ -40,16 +40,35 @@ paludis_SOURCES = \
report.hh report.cc \
paludis.cc
+if MONOLITHIC
+
paludis_LDADD = \
$(top_builddir)/paludis/tasks/libpaludistasks.a \
$(top_builddir)/paludis/libpaludis.la \
$(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)/src/liboutput.a \
$(DYNAMIC_LD_LIBS)
+else
+
+paludis_LDADD = \
+ $(top_builddir)/paludis/tasks/libpaludistasks.a \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(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/liboutput.a \
+ $(DYNAMIC_LD_LIBS)
+
+endif
+
TESTS_ENVIRONMENT = env \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_NO_GLOBAL_HOOKS="yes" \
diff --git a/src/qualudis/Makefile.am b/src/qualudis/Makefile.am
index 68f238e..71dd6db 100644
--- a/src/qualudis/Makefile.am
+++ b/src/qualudis/Makefile.am
@@ -17,6 +17,23 @@ qualudis_SOURCES = \
qualudis_command_line.hh qualudis_command_line.cc \
qualudis.cc
+if MONOLITHIC
+
+qualudis_LDADD = \
+ $(top_builddir)/paludis/qa/libpaludisqa.la \
+ $(top_builddir)/paludis/libpaludis.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 \
+ $(PCREPLUSPLUS_LIBS) \
+ $(LIBXML2DEPS_LIBS) \
+ $(DYNAMIC_LD_LIBS)
+
+else
+
qualudis_LDADD = \
$(top_builddir)/paludis/qa/libpaludisqa.la \
$(top_builddir)/paludis/libpaludis.la \
@@ -27,6 +44,8 @@ qualudis_LDADD = \
$(LIBXML2DEPS_LIBS) \
$(DYNAMIC_LD_LIBS)
+endif
+
INCLUDES = $(PCREPLUSPLUS_CFLAGS) $(LIBXML2DEPS_CFLAGS)
TESTS_ENVIRONMENT = env \