aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-12 10:24:34 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-12 18:26:26 +0100
commita9d0bdd2ddedf24c4e200aaecf9ba01ede313f13 (patch)
tree503f15c44dc63b79ddf0842d6601ad4b364f2460
parent9ecffc196c7226d72b3c3ecf9171f7cde35e64bf (diff)
downloadpaludis-a9d0bdd2ddedf24c4e200aaecf9ba01ede313f13.tar.gz
paludis-a9d0bdd2ddedf24c4e200aaecf9ba01ede313f13.tar.xz
Reduce some autohackery
-rw-r--r--paludis/Makefile.am.m46
-rw-r--r--paludis/args/Makefile.am5
-rw-r--r--src/clients/accerso/Makefile.am3
-rw-r--r--src/clients/adjutrix/Makefile.am3
-rw-r--r--src/clients/appareo/Makefile.am3
-rw-r--r--src/clients/cave/Makefile.am3
-rw-r--r--src/clients/importare/Makefile.am3
-rw-r--r--src/clients/inquisitio/Makefile.am3
-rw-r--r--src/clients/instruo/Makefile.am3
-rw-r--r--src/clients/paludis/Makefile.am3
-rw-r--r--src/clients/reconcilio/Makefile.am3
11 files changed, 10 insertions, 28 deletions
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index a126012..1aed2a0 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -80,8 +80,6 @@ libpaludispythonhooks_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) \
libpaludispythonhooks_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 @BOOST_PYTHON_LIB@ -lpython@PYTHON_VERSION@
libpaludispythonhooks_@PALUDIS_PC_SLOT@_la_LIBADD = libpaludis_@PALUDIS_PC_SLOT@.la
-libpaludismanpagethings_@PALUDIS_PC_SLOT@_la_SOURCES = name.cc
-
libpaludissohooks_TEST_@PALUDIS_PC_SLOT@_la_SOURCES = sohooks_TEST.cc
# -rpath to force shared library
@@ -131,9 +129,6 @@ libpaludis_@PALUDIS_PC_SLOT@_la_LIBADD = \
@DYNAMIC_LD_LIBS@ \
$(PTHREAD_LIBS)
-libpaludismanpagethings_@PALUDIS_PC_SLOT@_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
-
TESTS = testlist
check_PROGRAMS = $(TESTS) stripper_TEST_binary
@@ -146,7 +141,6 @@ paludis_libexecdir = $(libexecdir)/paludis
paludis_libexec_SCRIPTS = hooker.bash
lib_LTLIBRARIES = libpaludis_@PALUDIS_PC_SLOT@.la
-noinst_LTLIBRARIES = libpaludismanpagethings_@PALUDIS_PC_SLOT@.la
if ENABLE_PYTHON_HOOKS
lib_LTLIBRARIES += libpaludispythonhooks_@PALUDIS_PC_SLOT@.la
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index b6c2cff..f90aae5 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -39,9 +39,7 @@ libpaludisargs_@PALUDIS_PC_SLOT@_la_SOURCES = \
args_visitor.cc \
args_dumper.cc \
escape.cc \
- log_level_arg.cc
-
-libpaludisman_@PALUDIS_PC_SLOT@_a_SOURCES = \
+ log_level_arg.cc \
man.cc
libpaludisargs_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
@@ -51,7 +49,6 @@ libpaludisargs_@PALUDIS_PC_SLOT@_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
lib_LTLIBRARIES = libpaludisargs_@PALUDIS_PC_SLOT@.la
-noinst_LIBRARIES = libpaludisman_@PALUDIS_PC_SLOT@.a
check_PROGRAMS = $(TESTS)
diff --git a/src/clients/accerso/Makefile.am b/src/clients/accerso/Makefile.am
index 7da67a0..5d8a939 100644
--- a/src/clients/accerso/Makefile.am
+++ b/src/clients/accerso/Makefile.am
@@ -23,10 +23,9 @@ man_accerso_SOURCES = \
command_line.cc
man_accerso_LDADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
diff --git a/src/clients/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am
index fcd1238..18abc73 100644
--- a/src/clients/adjutrix/Makefile.am
+++ b/src/clients/adjutrix/Makefile.am
@@ -23,10 +23,9 @@ man_adjutrix_SOURCES = \
command_line.cc
man_adjutrix_LDADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
diff --git a/src/clients/appareo/Makefile.am b/src/clients/appareo/Makefile.am
index e8e9bfe..5a668c1 100644
--- a/src/clients/appareo/Makefile.am
+++ b/src/clients/appareo/Makefile.am
@@ -23,10 +23,9 @@ man_appareo_SOURCES = \
command_line.cc
man_appareo_LDADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
diff --git a/src/clients/cave/Makefile.am b/src/clients/cave/Makefile.am
index ed28ce1..b52d9c9 100644
--- a/src/clients/cave/Makefile.am
+++ b/src/clients/cave/Makefile.am
@@ -87,10 +87,9 @@ man_cave_SOURCES = \
man_cave_LDADD = \
libcave.a \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/resolver/libpaludisresolver.a
noinst_LIBRARIES = libcave.a
diff --git a/src/clients/importare/Makefile.am b/src/clients/importare/Makefile.am
index 6f2fbaa..96e3735 100644
--- a/src/clients/importare/Makefile.am
+++ b/src/clients/importare/Makefile.am
@@ -19,10 +19,9 @@ man_importare_SOURCES = \
man_importare_LDADD = \
$(top_builddir)/paludis/args/legacy/libpaludisargslegacy_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
diff --git a/src/clients/inquisitio/Makefile.am b/src/clients/inquisitio/Makefile.am
index a2eab4d..db96dd3 100644
--- a/src/clients/inquisitio/Makefile.am
+++ b/src/clients/inquisitio/Makefile.am
@@ -21,10 +21,9 @@ man_inquisitio_SOURCES = \
command_line.hh command_line.cc
man_inquisitio_LDADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS) \
$(PCRECPPDEPS_LIBS)
diff --git a/src/clients/instruo/Makefile.am b/src/clients/instruo/Makefile.am
index 5d80154..c4a7d6a 100644
--- a/src/clients/instruo/Makefile.am
+++ b/src/clients/instruo/Makefile.am
@@ -23,10 +23,9 @@ man_instruo_SOURCES = \
command_line.cc
man_instruo_LDADD = \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
diff --git a/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index d7390b0..c0246da 100644
--- a/src/clients/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -26,10 +26,9 @@ man_paludis_SOURCES = \
man_paludis_LDADD = \
$(top_builddir)/paludis/args/legacy/libpaludisargslegacy_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
diff --git a/src/clients/reconcilio/Makefile.am b/src/clients/reconcilio/Makefile.am
index 387a5ba..aa673a2 100644
--- a/src/clients/reconcilio/Makefile.am
+++ b/src/clients/reconcilio/Makefile.am
@@ -19,10 +19,9 @@ man_reconcilio_SOURCES = \
man_reconcilio_LDADD = \
$(top_builddir)/paludis/args/legacy/libpaludisargslegacy_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/args/libpaludisman_@PALUDIS_PC_SLOT@.a \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/libpaludismanpagethings_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)