aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-27 21:37:35 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-27 21:37:35 +0000
commitb75ca26b7bf668cd5d1794696f64464c087df171 (patch)
treeedaa5875ec5aac84eda58f76ba960797e0affbe6
parent8f76cdd478a3b06c2c87ea9fdd147ef75969c019 (diff)
downloadpaludis-b75ca26b7bf668cd5d1794696f64464c087df171.tar.gz
paludis-b75ca26b7bf668cd5d1794696f64464c087df171.tar.xz
Tweak module deps
-rw-r--r--paludis/Makefile.am.m47
-rw-r--r--paludis/args/Makefile.am5
-rw-r--r--paludis/environment/no_config/Makefile.am6
-rw-r--r--paludis/repositories/fake/Makefile.am3
-rw-r--r--paludis/selinux/Makefile.am4
-rw-r--r--paludis/tasks/Makefile.am5
-rw-r--r--paludis/util/Makefile.am.m48
7 files changed, 23 insertions, 15 deletions
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 9840573..e9c1979 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -16,11 +16,11 @@ $1_TEST_LDADD = \
ihateautomake.o \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- 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 \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ libpaludis.la \
$(DYNAMIC_LD_LIBS)
$1_TEST_CXXFLAGS = -I$(top_srcdir)
')dnl
@@ -70,8 +70,7 @@ BUILT_SOURCES = srcleanlist
libpaludis_la_SOURCES = filelist
libpaludis_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
libpaludis_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- @DYNAMIC_LD_LIBS@
+ $(top_builddir)/paludis/util/libpaludisutil.la
TESTS = testlist
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index 6860361..54f2b62 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -52,10 +52,7 @@ check_PROGRAMS = $(TESTS)
test_ldadd = \
$(top_builddir)/test/libtest.a \
- libpaludisargs.la \
- $(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(DYNAMIC_LD_LIBS)
+ libpaludisargs.la
args_TEST_SOURCES = args_TEST.cc
args_TEST_LDADD = $(test_ldadd)
diff --git a/paludis/environment/no_config/Makefile.am b/paludis/environment/no_config/Makefile.am
index 8f3e527..1b8c2bd 100644
--- a/paludis/environment/no_config/Makefile.am
+++ b/paludis/environment/no_config/Makefile.am
@@ -13,11 +13,11 @@ libpaludisnoconfigenvironment_la_SOURCES = \
libpaludisnoconfigenvironment_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
libpaludisnoconfigenvironment_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
$(top_builddir)/paludis/repositories/vdb/libpaludisvdbrepository.la \
- $(top_builddir)/paludis/repositories/libpaludisrepositories.la
+ $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ $(top_builddir)/paludis/libpaludis.la
if MONOLITHIC
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index 7cdcb34..d5265d9 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -26,8 +26,7 @@ libpaludisfakerepository_la_SOURCES = \
libpaludisfakerepository_la_LIBADD = \
$(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(DYNAMIC_LD_LIBS)
+ $(top_builddir)/paludis/util/libpaludisutil.la
libpaludisfakerepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
diff --git a/paludis/selinux/Makefile.am b/paludis/selinux/Makefile.am
index 11a2c74..cf1b18a 100644
--- a/paludis/selinux/Makefile.am
+++ b/paludis/selinux/Makefile.am
@@ -11,6 +11,10 @@ libpaludisselinux_la_SOURCES = \
$(paludis_selinux_include_HEADERS) \
security_context.cc
+libpaludisselinux_la_LIBADD = \
+ $(top_builddir)/paludis/util/libpaludisutil.la \
+ @DYNAMIC_LD_LIBS@
+
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 5803430..89e4575 100644
--- a/paludis/tasks/Makefile.am
+++ b/paludis/tasks/Makefile.am
@@ -36,6 +36,11 @@ libpaludistasks_a_SOURCES = $(paludis_tasks_include_HEADERS) \
stage_builder_task.cc \
report_task.cc
+libpaludistasks_a_LIBADD = \
+ $(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
+ $(top_builddir)/paludis/libpaludis.la \
+ $(top_builddir)/paludis/util/libpaludisutil.la
+
BUILT_SOURCES = \
stage_options-sr.hh \
stage_options-sr.cc
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index 90f8c47..6793aca 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -9,7 +9,10 @@ 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.la
+$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
@@ -37,7 +40,8 @@ DEFS=\
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\"
EXTRA_DIST = util.hh.m4 Makefile.am.m4 files.m4 \
- testscriptlist test_extras.cc attributes.hh.in
+ testscriptlist \
+ test_extras.cc attributes.hh.in
SUBDIRS = .
libpaludisutil_la_SOURCES = filelist