From 7ca9930ec1fc0aef059a2d8e81f7db6b3c1085ce Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 26 Nov 2010 13:21:07 +0100 Subject: reorganize libraries This patch does not change any code per se, it renames libABRTfoo -> libabrt_bar and moves a few functions around. After the patch, we are left with the following libs: libabrt - the stuff shared among most of abrt (like xmalloc, logging) libabrt_daemon - only daemon-related things are here (should probably be just moved into daemon - later) libabrt_dbus - daemon, cli and applet use this libabrt_web - abrt-action-foo where foo deals with network/web/ftp/... As a result, we have following reductions in dependent libs: /usr/libexec/abrt-hook-ccpp: linux-vdso.so.1 => () - libABRTUtils.so.0 => /usr/lib64/libABRTUtils.so.0 () + libabrt.so.0 => /usr/lib64/libabrt.so.0 () libglib-2.0.so.0 => /lib64/libglib-2.0.so.0 () - libdbus-1.so.3 => /lib64/libdbus-1.so.3 () - libpthread.so.0 => /lib64/libpthread.so.0 () - librt.so.1 => /lib64/librt.so.1 () - libdl.so.2 => /lib64/libdl.so.2 () /usr/libexec/abrt-action-upload: linux-vdso.so.1 => () libtar.so.1 => /usr/lib64/libtar.so.1 () libcurl.so.4 => /usr/lib64/libcurl.so.4 () - libABRTdUtils.so.0 => /usr/lib64/libABRTdUtils.so.0 () - libABRTUtils.so.0 => /usr/lib64/libABRTUtils.so.0 () + libabrt.so.0 => /usr/lib64/libabrt.so.0 () libglib-2.0.so.0 => /lib64/libglib-2.0.so.0 () - libdbus-1.so.3 => /lib64/libdbus-1.so.3 () Similar savings are in almost every abrt-action-foo. Signed-off-by: Denys Vlasenko --- src/plugins/Makefile.am | 32 +++++++++++++------------------- src/plugins/abrt-action-bugzilla.cpp | 2 -- src/plugins/abrt-action-kerneloops.cpp | 2 -- src/plugins/abrt-action-mailx.cpp | 5 +---- src/plugins/abrt-action-print.cpp | 1 - src/plugins/abrt-action-rhtsupport.cpp | 3 --- src/plugins/abrt-action-upload.cpp | 3 --- 7 files changed, 14 insertions(+), 34 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index c60c06fe..57b99e85 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -90,7 +90,7 @@ abrt_action_analyze_c_CPPFLAGS = \ -D_GNU_SOURCE \ -Wall -Werror abrt_action_analyze_c_LDADD = \ - ../lib/libABRTUtils.la + ../lib/libabrt.la abrt_action_analyze_python_SOURCES = \ abrt-action-analyze-python.c @@ -108,7 +108,7 @@ abrt_action_analyze_python_CPPFLAGS = \ -D_GNU_SOURCE \ -Wall -Werror abrt_action_analyze_python_LDADD = \ - ../lib/libABRTUtils.la + ../lib/libabrt.la abrt_action_analyze_oops_SOURCES = \ abrt-action-analyze-oops.c @@ -126,7 +126,7 @@ abrt_action_analyze_oops_CPPFLAGS = \ -D_GNU_SOURCE \ -Wall -Werror abrt_action_analyze_oops_LDADD = \ - ../lib/libABRTUtils.la + ../lib/libabrt.la abrt_action_generate_backtrace_SOURCES = \ abrt-action-generate-backtrace.c @@ -144,7 +144,7 @@ abrt_action_generate_backtrace_CPPFLAGS = \ -D_GNU_SOURCE \ -Wall -Werror abrt_action_generate_backtrace_LDADD = \ - ../lib/libABRTUtils.la \ + ../lib/libabrt.la \ ../btparser/libbtparser.la abrt_action_bugzilla_SOURCES = \ @@ -165,9 +165,8 @@ abrt_action_bugzilla_CPPFLAGS = \ -Wall -Werror abrt_action_bugzilla_LDADD = \ $(GLIB_LIBS) \ - ../lib/libABRT_web_utils.la \ - ../lib/libABRTdUtils.la \ - ../lib/libABRTUtils.la + ../lib/libabrt_web.la \ + ../lib/libabrt.la abrt_action_rhtsupport_SOURCES = \ abrt_rh_support.h abrt_rh_support.c \ @@ -191,9 +190,8 @@ abrt_action_rhtsupport_LDFLAGS = -ltar abrt_action_rhtsupport_LDADD = \ $(GLIB_LIBS) \ $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \ - ../lib/libABRT_web_utils.la \ - ../lib/libABRTdUtils.la \ - ../lib/libABRTUtils.la + ../lib/libabrt_web.la \ + ../lib/libabrt.la abrt_action_upload_SOURCES = \ abrt-action-upload.cpp @@ -217,8 +215,7 @@ abrt_action_upload_LDFLAGS = -ltar abrt_action_upload_LDADD = \ $(GLIB_LIBS) \ $(CURL_LIBS) \ - ../lib/libABRTdUtils.la \ - ../lib/libABRTUtils.la + ../lib/libabrt.la abrt_action_kerneloops_SOURCES = \ abrt-action-kerneloops.cpp @@ -238,9 +235,8 @@ abrt_action_kerneloops_CPPFLAGS = \ -Wall -Werror # libABRTdUtils is used only because of LoadPluginSettings: abrt_action_kerneloops_LDADD = \ - ../lib/libABRT_web_utils.la \ - ../lib/libABRTdUtils.la \ - ../lib/libABRTUtils.la + ../lib/libabrt_web.la \ + ../lib/libabrt.la abrt_action_mailx_SOURCES = \ abrt-action-mailx.cpp @@ -259,8 +255,7 @@ abrt_action_mailx_CPPFLAGS = \ -D_GNU_SOURCE \ -Wall -Werror abrt_action_mailx_LDADD = \ - ../lib/libABRTdUtils.la \ - ../lib/libABRTUtils.la + ../lib/libabrt.la abrt_action_print_SOURCES = \ abrt-action-print.cpp @@ -280,7 +275,6 @@ abrt_action_print_CPPFLAGS = \ -Wall -Werror # libABRTdUtils is used only because of make_description_logger: abrt_action_print_LDADD = \ - ../lib/libABRTdUtils.la \ - ../lib/libABRTUtils.la + ../lib/libabrt.la DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ diff --git a/src/plugins/abrt-action-bugzilla.cpp b/src/plugins/abrt-action-bugzilla.cpp index 62d3bd63..7b51e9aa 100644 --- a/src/plugins/abrt-action-bugzilla.cpp +++ b/src/plugins/abrt-action-bugzilla.cpp @@ -21,8 +21,6 @@ #include "crash_types.h" #include "abrt_exception.h" -#include "plugin.h" /* make_description_bz */ - #define XML_RPC_SUFFIX "/xmlrpc.cgi" #define MAX_HOPS 5 diff --git a/src/plugins/abrt-action-kerneloops.cpp b/src/plugins/abrt-action-kerneloops.cpp index 4c820081..4ca375d1 100644 --- a/src/plugins/abrt-action-kerneloops.cpp +++ b/src/plugins/abrt-action-kerneloops.cpp @@ -22,8 +22,6 @@ #include "crash_types.h" #include "abrt_exception.h" -#include "plugin.h" /* LoadPluginSettings */ - #define PROGNAME "abrt-action-kerneloops" /* helpers */ diff --git a/src/plugins/abrt-action-mailx.cpp b/src/plugins/abrt-action-mailx.cpp index d11a0d5f..a7f9a488 100644 --- a/src/plugins/abrt-action-mailx.cpp +++ b/src/plugins/abrt-action-mailx.cpp @@ -24,9 +24,6 @@ #include "crash_types.h" #include "abrt_exception.h" -#include "plugin.h" /* LoadPluginSettings */ - - #define PROGNAME "abrt-action-mailx" static void exec_and_feed_input(uid_t uid, const char* text, char **args) @@ -93,7 +90,7 @@ static void create_and_send_email( unsigned arg_size = 0; args = append_str_to_vector(args, arg_size, "/bin/mailx"); - char *dsc = make_dsc_mailx(pCrashData); + char *dsc = make_description_mailx(pCrashData); if (send_binary_data) { diff --git a/src/plugins/abrt-action-print.cpp b/src/plugins/abrt-action-print.cpp index a4db373a..26bea102 100644 --- a/src/plugins/abrt-action-print.cpp +++ b/src/plugins/abrt-action-print.cpp @@ -22,7 +22,6 @@ #include "parse_options.h" #include "crash_types.h" #include "abrt_exception.h" -#include "plugin.h" /* make_description_logger */ #define PROGNAME "abrt-action-print" diff --git a/src/plugins/abrt-action-rhtsupport.cpp b/src/plugins/abrt-action-rhtsupport.cpp index aecd30c8..a88291d0 100644 --- a/src/plugins/abrt-action-rhtsupport.cpp +++ b/src/plugins/abrt-action-rhtsupport.cpp @@ -25,9 +25,6 @@ #include "crash_types.h" #include "abrt_exception.h" -#include "plugin.h" /* make_description_bz */ - - #define PROGNAME "abrt-action-rhtsupport" static void report_to_rhtsupport( diff --git a/src/plugins/abrt-action-upload.cpp b/src/plugins/abrt-action-upload.cpp index 0bf54bea..726b9183 100644 --- a/src/plugins/abrt-action-upload.cpp +++ b/src/plugins/abrt-action-upload.cpp @@ -24,9 +24,6 @@ #include "crash_types.h" #include "abrt_exception.h" -#include "plugin.h" /* LoadPluginSettings */ - - #define PROGNAME "abrt-action-upload" //TODO: use this for better logging -- cgit