4 files changed, 34 insertions, 31 deletions
diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am
index 5190649..1c81035 100644
--- a/src/Applet/Makefile.am
+++ b/src/Applet/Makefile.am
@@ -7,17 +7,19 @@ abrt_applet_CPPFLAGS = \
     -Wall -Werror \
     -I../Daemon/ \
     -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/CommLayer \
-    -I$(srcdir)/../../lib/MiddleWare \
+    -I$(srcdir)/../../lib/Utils \
+    -I/usr/include/glib-2.0 \
+    -I/usr/lib/glib-2.0/include \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
     -DBIN_DIR=\"$(bindir)\" \
-    $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS) \
-    -I/usr/include/glib-2.0 \
-    -I/usr/lib/glib-2.0/include
+    $(DBUS_GLIB_CFLAGS) \
+    $(GTK_CFLAGS) \
+    $(DBUSCPP_CFLAGS) \
+    $(LIBNOTIFY_CFLAGS)
 abrt_applet_LDADD = \
-    ../../lib/CommLayer/libABRTCommLayer.la \
-    $(DL_LIBS) $(GTK_LIBS) \
+    ../../lib/Utils/libABRTUtils.la \
     -lglib-2.0 -lgthread-2.0 \
+    $(DL_LIBS) $(GTK_LIBS) \
     $(DBUSCPP_LIBS) $(LIBNOTIFY_LIBS)
 
 EXTRA_DIST = abrt-applet.desktop popup.GtkBuilder
diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am
index be89602..9823965 100644
--- a/src/CLI/Makefile.am
+++ b/src/CLI/Makefile.am
@@ -3,15 +3,19 @@
 #abrt_cli_CPPFLAGS = -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\"
 
 bin_PROGRAMS = abrt-cli
+
 abrt_cli_SOURCES = \
     CLI.cpp \
     ABRTSocket.h ABRTSocket.cpp \
     CommLayerClientDBus.h CommLayerClientDBus.cpp
 abrt_cli_CPPFLAGS = \
-    $(DBUS_GLIB_CFLAGS) $(GTK_CFLAGS) $(DBUSCPP_CFLAGS) $(LIBNOTIFY_CFLAGS) \
-    -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\" \
-    -I$(srcdir)/../../lib/CommLayer \
+    -I$(srcdir)/../../inc \
+    -I$(srcdir)/../../lib/Utils \
+    -DVAR_RUN=\"$(VAR_RUN)\" \
     $(ENABLE_SOCKET_OR_DBUS) \
-    -I../../lib/MiddleWare
-
-abrt_cli_LDADD = ../../lib/CommLayer/libABRTCommLayer.la
+    $(DBUS_GLIB_CFLAGS) \
+    $(GTK_CFLAGS) \
+    $(DBUSCPP_CFLAGS) \
+    $(LIBNOTIFY_CFLAGS)
+abrt_cli_LDADD = \
+    ../../lib/Utils/libABRTUtils.la
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index f6bb9c1..a4698af 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -1,7 +1,7 @@
 sbin_PROGRAMS = abrtd
 
 # FIXME: we still link against dbus-c++ (not just dbus)
-# because lib/CommLayer links it in
+# because lib/Utils links it in
 
 abrtd_SOURCES = \
     ABRTPlugin.cpp ABRTPlugin.h \
@@ -16,8 +16,6 @@ abrtd_SOURCES = \
     Settings.h Settings.cpp
 abrtd_CPPFLAGS = \
     -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/MiddleWare \
-    -I$(srcdir)/../../lib/CommLayer \
     -I$(srcdir)/../../lib/Utils \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
@@ -27,8 +25,7 @@ abrtd_CPPFLAGS = \
     $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
     $(ENABLE_SOCKET_OR_DBUS)
 abrtd_LDADD = \
-    ../../lib/MiddleWare/libABRTMiddleWare.la \
-    ../../lib/CommLayer/libABRTCommLayer.la \
+    ../../lib/Utils/libABRTUtils.la \
     $(DL_LIBS) $(DBUS_LIBS) $(RPM_LIBS)
 
 dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/
diff --git a/src/Hooks/Makefile.am b/src/Hooks/Makefile.am
index b2e90eb..2831cf9 100644
--- a/src/Hooks/Makefile.am
+++ b/src/Hooks/Makefile.am
@@ -10,19 +10,19 @@ hookCCpp_CPPFLAGS = -I$(srcdir)/../../inc \
                     -DVAR_RUN=\"$(VAR_RUN)\"
 
 # dumpoops
-dumpoops_SOURCES = dumpoops.cpp
-dumpoops_LDADD = ../../lib/Utils/libABRTUtils.la \
-                ../../lib/MiddleWare/libABRTMiddleWare.la \
-                ../../lib/CommLayer/libABRTCommLayer.la
-dumpoops_CPPFLAGS = -I$(srcdir)/../../inc \
-                    -I$(srcdir)/../../lib/Utils \
-                    -I$(srcdir)/../../lib/Plugins \
-                    -I$(srcdir)/../../lib/MiddleWare \
-                    -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)\"
+dumpoops_SOURCES = \
+    dumpoops.cpp
+dumpoops_LDADD = \
+    ../../lib/Utils/libABRTUtils.la
+dumpoops_CPPFLAGS = \
+    -I$(srcdir)/../../inc \
+    -I$(srcdir)/../../lib/Utils \
+    -I$(srcdir)/../../lib/Plugins \
+    -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)\"
 
 python_PYTHON = sitecustomize.py abrt_exception_handler.py
 EXTRA_DIST = abrt_exception_handler.py.in