diff options
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | lib/CommLayer/Makefile.am | 32 | ||||
-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | lib/MiddleWare/Makefile.am | 34 | ||||
-rw-r--r-- | lib/Plugins/Makefile.am | 24 | ||||
-rw-r--r-- | lib/Utils/Action.h (renamed from lib/MiddleWare/Action.h) | 0 | ||||
-rw-r--r-- | lib/Utils/Analyzer.h (renamed from lib/MiddleWare/Analyzer.h) | 0 | ||||
-rw-r--r-- | lib/Utils/CommLayerInner.cpp (renamed from lib/CommLayer/CommLayerInner.cpp) | 0 | ||||
-rw-r--r-- | lib/Utils/CommLayerInner.h (renamed from lib/CommLayer/CommLayerInner.h) | 0 | ||||
-rw-r--r-- | lib/Utils/DBusClientProxy.cpp (renamed from lib/CommLayer/DBusClientProxy.cpp) | 0 | ||||
-rw-r--r-- | lib/Utils/DBusClientProxy.h (renamed from lib/CommLayer/DBusClientProxy.h) | 0 | ||||
-rw-r--r-- | lib/Utils/DBusCommon.h (renamed from lib/CommLayer/DBusCommon.h) | 0 | ||||
-rw-r--r-- | lib/Utils/Database.h (renamed from lib/MiddleWare/Database.h) | 0 | ||||
-rw-r--r-- | lib/Utils/Makefile.am | 47 | ||||
-rw-r--r-- | lib/Utils/Observer.h (renamed from lib/CommLayer/Observer.h) | 0 | ||||
-rw-r--r-- | lib/Utils/Plugin.cpp (renamed from lib/MiddleWare/Plugin.cpp) | 0 | ||||
-rw-r--r-- | lib/Utils/Plugin.h (renamed from lib/MiddleWare/Plugin.h) | 0 | ||||
-rw-r--r-- | lib/Utils/Reporter.h (renamed from lib/MiddleWare/Reporter.h) | 0 | ||||
-rw-r--r-- | lib/Utils/test.cpp (renamed from lib/MiddleWare/test.cpp) | 0 | ||||
-rw-r--r-- | src/Applet/Makefile.am | 16 | ||||
-rw-r--r-- | src/CLI/Makefile.am | 16 | ||||
-rw-r--r-- | src/Daemon/Makefile.am | 7 | ||||
-rw-r--r-- | src/Hooks/Makefile.am | 26 |
23 files changed, 82 insertions, 124 deletions
diff --git a/configure.ac b/configure.ac index ff427536..95999a49 100644 --- a/configure.ac +++ b/configure.ac @@ -76,8 +76,6 @@ AC_CONFIG_FILES([ Makefile lib/Makefile lib/Utils/Makefile - lib/MiddleWare/Makefile - lib/CommLayer/Makefile lib/Plugins/Makefile lib/Python/Makefile src/Makefile diff --git a/lib/CommLayer/Makefile.am b/lib/CommLayer/Makefile.am deleted file mode 100644 index be0c52bf..00000000 --- a/lib/CommLayer/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -lib_LTLIBRARIES = libABRTCommLayer.la - -libABRTCommLayer_la_SOURCES = \ - DBusClientProxy.h DBusClientProxy.cpp \ - CommLayerInner.h CommLayerInner.cpp \ - Observer.h \ - DBusCommon.h -libABRTCommLayer_la_LIBADD = \ - ../../lib/MiddleWare/libABRTMiddleWare.la \ - $(DL_LIBS) $(DBUSCPP_LIBS) -libABRTCommLayer_la_LDFLAGS = -version-info 0:1:0 -libABRTCommLayer_la_CPPFLAGS = \ - -Wall -Werror \ - -I$(srcdir)/../../inc \ - -I$(srcdir)/../../lib/MiddleWare \ - -I$(srcdir)/../../lib/DBus \ - -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) $(DBUSCPP_CFLAGS) \ - -D_GNU_SOURCE - -#check_PROGRAMS = test -#test_SOURCES = test.cpp -#test_LDADD = ../Utils/libABRTUtils.la libABRTCommLayer.la $(DL_LIBS) $(RPM_LIBS) -#test_CPPFLAGS = -I$(srcdir)/../Utils \ -# -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ -# -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ -# -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -# -DCONF_DIR=\"$(CONF_DIR)\" diff --git a/lib/Makefile.am b/lib/Makefile.am index 53a42fe4..6be37e8c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1 +1 @@ -SUBDIRS = Utils MiddleWare Plugins CommLayer Python +SUBDIRS = Utils Plugins Python diff --git a/lib/MiddleWare/Makefile.am b/lib/MiddleWare/Makefile.am deleted file mode 100644 index 0db4f79e..00000000 --- a/lib/MiddleWare/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -lib_LTLIBRARIES = libABRTMiddleWare.la - -libABRTMiddleWare_la_SOURCES = \ - Plugin.cpp Plugin.h \ - Action.h Database.h Reporter.h Analyzer.h -libABRTMiddleWare_la_LIBADD = \ - $(DL_LIBS) \ - ../Utils/libABRTUtils.la \ - $(RPM_LIBS) -libABRTMiddleWare_la_LDFLAGS = -version-info 0:1:0 -libABRTMiddleWare_la_CPPFLAGS = \ - -I$(srcdir)/../../inc \ - -I$(srcdir)/../Utils \ - -I$(srcdir)/../CommLayer \ - $(RPM_CFLAGS) - -# disabled: MiddleWare.* is moved to src/Daemon/ now -# -#check_PROGRAMS = test -# -#test_SOURCES = test.cpp -#test_LDADD = \ -# ../Utils/libABRTUtils.la \ -# ../CommLayer/libABRTCommLayer.la \ -# libABRTMiddleWare.la \ -# $(DL_LIBS) $(RPM_LIBS) -#test_CPPFLAGS = \ -# -I$(srcdir)/../../inc \ -# -I$(srcdir)/../Utils \ -# -I$(srcdir)/../CommLayer\ -# -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ -# -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ -# -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -# -DCONF_DIR=\"$(CONF_DIR)\" diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am index 02c821ad..cbd29dc9 100644 --- a/lib/Plugins/Makefile.am +++ b/lib/Plugins/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -I$(srcdir)/../CommLayer +AM_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils pluginslibdir=$(PLUGINS_LIB_DIR) pluginslib_LTLIBRARIES = libCCpp.la \ libMailx.la \ @@ -36,39 +36,39 @@ install-data-hook: libCCpp_la_SOURCES = CCpp.cpp CCpp.h libCCpp_la_LDFLAGS = -avoid-version libCCpp_la_LIBADD = $(NSS_LIBS) -libCCpp_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -DCCPP_HOOK_PATH=\"${libexecdir}/hookCCpp\" -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(NSS_CFLAGS) +libCCpp_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils -DCCPP_HOOK_PATH=\"${libexecdir}/hookCCpp\" -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(NSS_CFLAGS) # Kerneloops libKerneloops_la_SOURCES = Kerneloops.cpp Kerneloops.h libKerneloops_la_LDFLAGS = -avoid-version -libKerneloops_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils +libKerneloops_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils # KerneloopsReporter libKerneloopsReporter_la_SOURCES = KerneloopsReporter.cpp KerneloopsReporter.h libKerneloopsReporter_la_LDFLAGS = -avoid-version libKerneloopsReporter_la_LIBADD = $(CURL_LIBS) -libKerneloopsReporter_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare $(CURL_CFLAGS) -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" +libKerneloopsReporter_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils $(CURL_CFLAGS) -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" # KerneloopsScanner libKerneloopsScanner_la_SOURCES = KerneloopsScanner.cpp KerneloopsScanner.h KerneloopsSysLog.cpp KerneloopsSysLog.h libKerneloopsScanner_la_LDFLAGS = -avoid-version -libKerneloopsScanner_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" +libKerneloopsScanner_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" # Mailx libMailx_la_SOURCES = Mailx.cpp Mailx.h libMailx_la_LDFLAGS = -avoid-version -libMailx_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -I$(srcdir)/../CommLayer -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" +libMailx_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" # SQLite3 libSQLite3_la_SOURCES = SQLite3.cpp SQLite3.h libSQLite3_la_LDFLAGS = -avoid-version libSQLite3_la_LIBADD = $(SQLITE3_LIBS) -libSQLite3_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils $(SQLITE3_CFLAGS) -DLOCALSTATEDIR='"$(localstatedir)"' +libSQLite3_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils $(SQLITE3_CFLAGS) -DLOCALSTATEDIR='"$(localstatedir)"' # Logger libLogger_la_SOURCES = Logger.cpp Logger.h libLogger_la_LDFLAGS = -avoid-version -libLogger_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -I$(srcdir)/../CommLayer -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" +libLogger_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" # RunApp libRunApp_la_SOURCES = RunApp.h RunApp.cpp @@ -82,22 +82,22 @@ libSOSreport_la_LDFLAGS = -avoid-version libBugzilla_la_SOURCES = Bugzilla.h Bugzilla.cpp libBugzilla_la_LIBADD = $(XMLRPC_CPP_LIBS) $(XMLRPC_CLIENT_CPP_LIBS) $(NSS_LIBS) libBugzilla_la_LDFLAGS = -avoid-version -libBugzilla_la_CPPFLAGS = $(XMLRPC_CPP_CFLAGS) $(XMLRPC_CLIENT_CPP_CFLAGS) $(NSS_CFLAGS) -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" +libBugzilla_la_CPPFLAGS = $(XMLRPC_CPP_CFLAGS) $(XMLRPC_CLIENT_CPP_CFLAGS) $(NSS_CFLAGS) -I$(srcdir)/../../inc -I$(srcdir)/../Utils -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" # TicketUploader libTicketUploader_la_SOURCES = TicketUploader.h TicketUploader.cpp libTicketUploader_la_LDFLAGS = -avoid-version libTicketUploader_la_LIBADD = $(CURL_LIBS) -libTicketUploader_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils $(CURL_CFLAGS) -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" +libTicketUploader_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils $(CURL_CFLAGS) -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" # Python libPython_la_SOURCES = Python.h Python.cpp #libPython_la_LIBADD = $(NSS_LIBS) libPython_la_LDFLAGS = -avoid-version -libPython_la_CPPFLAGS = $(NSS_CFLAGS) -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils +libPython_la_CPPFLAGS = $(NSS_CFLAGS) -I$(srcdir)/../../inc -I$(srcdir)/../Utils # FileTrasfer libFileTransfer_la_SOURCES = FileTransfer.cpp FileTransfer.h libFileTransfer_la_LDFLAGS = -avoid-version libFileTransfer_la_LIBADD = $(CURL_LIBS) -libFileTransfer_la_CPPFLAGS = -I$(srcdir)/../CommLayer -I$(srcdir)/../../inc -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils $(CURL_CFLAGS) -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" +libFileTransfer_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils $(CURL_CFLAGS) -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" diff --git a/lib/MiddleWare/Action.h b/lib/Utils/Action.h index 1286feba..1286feba 100644 --- a/lib/MiddleWare/Action.h +++ b/lib/Utils/Action.h diff --git a/lib/MiddleWare/Analyzer.h b/lib/Utils/Analyzer.h index 4fe586b8..4fe586b8 100644 --- a/lib/MiddleWare/Analyzer.h +++ b/lib/Utils/Analyzer.h diff --git a/lib/CommLayer/CommLayerInner.cpp b/lib/Utils/CommLayerInner.cpp index b5b8db78..b5b8db78 100644 --- a/lib/CommLayer/CommLayerInner.cpp +++ b/lib/Utils/CommLayerInner.cpp diff --git a/lib/CommLayer/CommLayerInner.h b/lib/Utils/CommLayerInner.h index d161cfc7..d161cfc7 100644 --- a/lib/CommLayer/CommLayerInner.h +++ b/lib/Utils/CommLayerInner.h diff --git a/lib/CommLayer/DBusClientProxy.cpp b/lib/Utils/DBusClientProxy.cpp index ccb48d53..ccb48d53 100644 --- a/lib/CommLayer/DBusClientProxy.cpp +++ b/lib/Utils/DBusClientProxy.cpp diff --git a/lib/CommLayer/DBusClientProxy.h b/lib/Utils/DBusClientProxy.h index e43805bf..e43805bf 100644 --- a/lib/CommLayer/DBusClientProxy.h +++ b/lib/Utils/DBusClientProxy.h diff --git a/lib/CommLayer/DBusCommon.h b/lib/Utils/DBusCommon.h index b3e3af2c..b3e3af2c 100644 --- a/lib/CommLayer/DBusCommon.h +++ b/lib/Utils/DBusCommon.h diff --git a/lib/MiddleWare/Database.h b/lib/Utils/Database.h index 0fc31ee7..0fc31ee7 100644 --- a/lib/MiddleWare/Database.h +++ b/lib/Utils/Database.h diff --git a/lib/Utils/Makefile.am b/lib/Utils/Makefile.am index cb5b3377..b662ae9a 100644 --- a/lib/Utils/Makefile.am +++ b/lib/Utils/Makefile.am @@ -1,17 +1,40 @@ lib_LTLIBRARIES = libABRTUtils.la -libABRTUtils_la_SOURCES = \ - DebugDump.cpp DebugDump.h \ - CrashTypesSocket.cpp \ - xfuncs.cpp \ - read_write.cpp \ - logging.cpp \ - copyfd.cpp \ - Polkit.cpp \ - Polkit.h -libABRTUtils_la_LDFLAGS = -version-info 0:1:0 -libABRTUtils_la_LIBADD = -lmagic $(POLKIT_LIBS) -libABRTUtils_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../../lib/CommLayer $(POLKIT_CFLAGS) +libABRTUtils_la_SOURCES = \ + xfuncs.cpp \ + read_write.cpp \ + logging.cpp \ + copyfd.cpp \ + CrashTypesSocket.cpp \ + DebugDump.h DebugDump.cpp \ + DBusClientProxy.h DBusClientProxy.cpp \ + CommLayerInner.h CommLayerInner.cpp \ + Plugin.h Plugin.cpp \ + Polkit.h Polkit.cpp \ + Action.h Database.h Reporter.h Analyzer.h \ + Observer.h \ + DBusCommon.h +libABRTUtils_la_LDFLAGS = \ + -version-info 0:1:0 \ + $(DL_LIBS) \ + $(RPM_LIBS) \ + $(DBUSCPP_LIBS) +libABRTUtils_la_LIBADD = \ + -lmagic \ + $(POLKIT_LIBS) +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)\" \ + $(RPM_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(DBUSCPP_CFLAGS) \ + $(POLKIT_CFLAGS) \ + -D_GNU_SOURCE install-data-local: $(mkdir_p) '$(DESTDIR)/$(DEBUG_DUMPS_DIR)' diff --git a/lib/CommLayer/Observer.h b/lib/Utils/Observer.h index 421dc0cc..421dc0cc 100644 --- a/lib/CommLayer/Observer.h +++ b/lib/Utils/Observer.h diff --git a/lib/MiddleWare/Plugin.cpp b/lib/Utils/Plugin.cpp index 161ead8a..161ead8a 100644 --- a/lib/MiddleWare/Plugin.cpp +++ b/lib/Utils/Plugin.cpp diff --git a/lib/MiddleWare/Plugin.h b/lib/Utils/Plugin.h index 39290231..39290231 100644 --- a/lib/MiddleWare/Plugin.h +++ b/lib/Utils/Plugin.h diff --git a/lib/MiddleWare/Reporter.h b/lib/Utils/Reporter.h index c74a10c3..c74a10c3 100644 --- a/lib/MiddleWare/Reporter.h +++ b/lib/Utils/Reporter.h diff --git a/lib/MiddleWare/test.cpp b/lib/Utils/test.cpp index fbad1db9..fbad1db9 100644 --- a/lib/MiddleWare/test.cpp +++ b/lib/Utils/test.cpp diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am index 5190649b..1c810350 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 be896020..9823965e 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 f6bb9c15..a4698afc 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 b2e90eb4..2831cf9e 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 |