From f328f55ae62f0decb209a8a4d058255371fc56f2 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Fri, 19 Mar 2010 16:48:34 +0100
Subject: Move dbus code to libABRTUtils. It makes libABRTUtils depend on four
 more libs, but allows abrt-applet to not depend on libABRTdUtils, thus going
 down from 78 to 48 dep libs

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 lib/Utils/Makefile.am  | 11 +++++++----
 src/Applet/Makefile.am |  3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/Utils/Makefile.am b/lib/Utils/Makefile.am
index 675fb4eb..6847ab0a 100644
--- a/lib/Utils/Makefile.am
+++ b/lib/Utils/Makefile.am
@@ -20,6 +20,7 @@ libABRTUtils_la_SOURCES = \
     stringops.cpp \
     dirsize.cpp \
     DebugDump.h DebugDump.cpp \
+    abrt_dbus.h abrt_dbus.cpp \
     CrashTypes.cpp \
     ABRTException.cpp
 libABRTUtils_la_CPPFLAGS = \
@@ -30,16 +31,20 @@ libABRTUtils_la_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
+    $(GLIB_CFLAGS) \
+    $(DBUS_CFLAGS) \
     -D_GNU_SOURCE
 libABRTUtils_la_LDFLAGS = \
     -version-info 0:1:0
-libABRTUtils_la_LIBADD =
+libABRTUtils_la_LIBADD = \
+    $(GLIB_LIBS) \
+    $(DBUS_LIBS)
+
 
 libABRTdUtils_la_SOURCES = \
     parse_release.cpp \
     make_descr.cpp \
     CommLayerInner.h CommLayerInner.cpp \
-    abrt_dbus.h abrt_dbus.cpp \
     abrt_xmlrpc.h abrt_xmlrpc.cpp \
     Plugin.h Plugin.cpp \
     Polkit.h Polkit.cpp \
@@ -54,14 +59,12 @@ libABRTdUtils_la_CPPFLAGS = \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
-    $(DBUS_CFLAGS) \
     $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
     $(POLKIT_CFLAGS) \
     -D_GNU_SOURCE
 libABRTdUtils_la_LDFLAGS = \
     -version-info 0:1:0
 libABRTdUtils_la_LIBADD = \
-    $(DBUS_LIBS) \
     $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
     $(POLKIT_LIBS)
 
diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am
index 079e710d..5f0401ba 100644
--- a/src/Applet/Makefile.am
+++ b/src/Applet/Makefile.am
@@ -23,12 +23,11 @@ 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) \
     $(LIBNOTIFY_LIBS)
-#    ../../lib/Utils/libABRTUtils.la
+#    ../../lib/Utils/libABRTdUtils.la
 #    $(DL_LIBS)
 #    $(GTK_LIBS)
 
-- 
cgit