diff options
| -rw-r--r-- | lib/Utils/Makefile.am | 29 | ||||
| -rw-r--r-- | src/Applet/Makefile.am | 1 | ||||
| -rw-r--r-- | src/CLI/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Daemon/Makefile.am | 1 | ||||
| -rw-r--r-- | src/Hooks/Makefile.am | 4 |
5 files changed, 31 insertions, 7 deletions
diff --git a/lib/Utils/Makefile.am b/lib/Utils/Makefile.am index eae4148..f0b4481 100644 --- a/lib/Utils/Makefile.am +++ b/lib/Utils/Makefile.am @@ -1,4 +1,6 @@ -lib_LTLIBRARIES = libABRTUtils.la +# ABRTUtils has small set of deps. This reduces deps of smaller abrt binaries +# ABRTdUtils has more. It is used by daemon and plugins only +lib_LTLIBRARIES = libABRTUtils.la libABRTdUtils.la # Not used just yet: # time.cpp @@ -14,8 +16,25 @@ libABRTUtils_la_SOURCES = \ copyfd.cpp \ skip_whitespace.cpp \ popen_and_save_output.cpp \ + DebugDump.h DebugDump.cpp +libABRTUtils_la_CPPFLAGS = \ + -Wall -Werror \ + -I$(srcdir)/../../inc \ + -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ + -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ + -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ + -DCONF_DIR=\"$(CONF_DIR)\" \ + -DVAR_RUN=\"$(VAR_RUN)\" \ + $(GLIB_CFLAGS) \ + -D_GNU_SOURCE +libABRTUtils_la_LDFLAGS = \ + -version-info 0:1:0 \ + $(DL_LIBS) \ +libABRTUtils_la_LIBADD = + + +libABRTdUtils_la_SOURCES = \ parse_release.cpp \ - DebugDump.h DebugDump.cpp \ CommLayerInner.h CommLayerInner.cpp \ abrt_dbus.h abrt_dbus.cpp \ abrt_xmlrpc.h abrt_xmlrpc.cpp \ @@ -24,7 +43,7 @@ libABRTUtils_la_SOURCES = \ Action.h Database.h Reporter.h Analyzer.h \ Observer.h \ DBusCommon.h -libABRTUtils_la_CPPFLAGS = \ +libABRTdUtils_la_CPPFLAGS = \ -Wall -Werror \ -I$(srcdir)/../../inc \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ @@ -37,11 +56,11 @@ libABRTUtils_la_CPPFLAGS = \ $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \ $(POLKIT_CFLAGS) \ -D_GNU_SOURCE -libABRTUtils_la_LDFLAGS = \ +libABRTdUtils_la_LDFLAGS = \ -version-info 0:1:0 \ $(DL_LIBS) \ $(DBUS_LIBS) -libABRTUtils_la_LIBADD = \ +libABRTdUtils_la_LIBADD = \ $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \ $(POLKIT_LIBS) diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am index 6fca43a..900ec01 100644 --- a/src/Applet/Makefile.am +++ b/src/Applet/Makefile.am @@ -23,6 +23,7 @@ abrt_applet_CPPFLAGS = \ # $(DBUS_GLIB_CFLAGS) abrt_applet_LDADD = \ ../../lib/Utils/libABRTUtils.la \ + ../../lib/Utils/libABRTdUtils.la \ -lglib-2.0 \ -lgthread-2.0 \ $(DBUS_LIBS) \ diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am index e84d426..d12b69b 100644 --- a/src/CLI/Makefile.am +++ b/src/CLI/Makefile.am @@ -17,7 +17,8 @@ abrt_cli_CPPFLAGS = \ # $(GTK_CFLAGS) abrt_cli_LDADD = \ - ../../lib/Utils/libABRTUtils.la + ../../lib/Utils/libABRTUtils.la \ + ../../lib/Utils/libABRTdUtils.la man_MANS = abrt-cli.1 EXTRA_DIST = $(man_MANS) diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index a5bb64f..fc4f5e2 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -29,6 +29,7 @@ abrtd_CPPFLAGS = \ -D_GNU_SOURCE abrtd_LDADD = \ ../../lib/Utils/libABRTUtils.la \ + ../../lib/Utils/libABRTdUtils.la \ $(DL_LIBS) \ $(DBUS_LIBS) \ $(RPM_LIBS) \ diff --git a/src/Hooks/Makefile.am b/src/Hooks/Makefile.am index e581c25..026d4cf 100644 --- a/src/Hooks/Makefile.am +++ b/src/Hooks/Makefile.am @@ -26,8 +26,10 @@ dumpoops_CPPFLAGS = \ -DCONF_DIR=\"$(CONF_DIR)\" \ -DVAR_RUN=\"$(VAR_RUN)\" \ -D_GNU_SOURCE +# build will succeed, but at runtime plugins do need ABRT*d*Utils dumpoops_LDADD = \ - ../../lib/Utils/libABRTUtils.la + ../../lib/Utils/libABRTUtils.la \ + ../../lib/Utils/libABRTdUtils.la # abrt-pyhook-helper abrt_pyhook_helper_SOURCES = \ |