diff options
author | Jiri Moskovcak <jmoskovc@redhat.com> | 2011-06-15 14:34:50 +0200 |
---|---|---|
committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2011-06-15 14:34:50 +0200 |
commit | 591b445ba78c96cd91375fe79b2ac8a767131fb9 (patch) | |
tree | fb347fe4fa406e87f81cbe53188f73634d3508fc /src | |
parent | b4e0ff6fadd6bfcb2915a544747d0b09d53dbada (diff) | |
download | abrt-591b445ba78c96cd91375fe79b2ac8a767131fb9.tar.gz abrt-591b445ba78c96cd91375fe79b2ac8a767131fb9.tar.xz abrt-591b445ba78c96cd91375fe79b2ac8a767131fb9.zip |
move events and events config to libreport/events{.d} and libreport/plugins
- requires libreport commit: 219c304236910086fae00e3a65fef626b46f1f1e
Diffstat (limited to 'src')
-rw-r--r-- | src/daemon/Makefile.am | 1 | ||||
-rw-r--r-- | src/plugins/Makefile.am | 21 | ||||
-rw-r--r-- | src/plugins/smart_event.conf (renamed from src/daemon/smart_event.conf) | 0 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index f2f90d69..426e6dcb 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -1,7 +1,6 @@ eventsconfdir = $(EVENTS_CONF_DIR) dist_eventsconf_DATA = \ - smart_event.conf \ abrt_event.conf bin_SCRIPTS = \ diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 352c23af..543b424c 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -27,7 +27,11 @@ bin_PROGRAMS = \ pluginsconfdir = $(PLUGINS_CONF_DIR) dist_pluginsconf_DATA = \ - Python.conf \ + Python.conf + +reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR) + +dist_reportpluginsconf_DATA = \ Kerneloops.conf \ Bugzilla.conf \ Upload.conf @@ -53,7 +57,8 @@ dist_eventsconf_DATA = \ ccpp_events.conf \ mailx_events.conf \ koops_events.conf \ - rhtsupport_events.conf + rhtsupport_events.conf \ + smart_event.conf man_MANS = \ abrt-plugins.7 @@ -261,7 +266,7 @@ abrt_action_bugzilla_CPPFLAGS = \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ - -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ + -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \ $(GLIB_CFLAGS) \ $(LIBREPORT_CFLAGS) \ -D_GNU_SOURCE \ @@ -284,7 +289,7 @@ abrt_action_rhtsupport_CPPFLAGS = \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ - -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ + -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \ $(GLIB_CFLAGS) \ $(LIBREPORT_CFLAGS) \ $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \ @@ -309,7 +314,7 @@ abrt_action_upload_CPPFLAGS = \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ - -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ + -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \ $(GLIB_CFLAGS) \ $(CURL_CFLAGS) \ $(LIBREPORT_CFLAGS) \ @@ -333,7 +338,7 @@ abrt_action_kerneloops_CPPFLAGS = \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ - -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ + -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \ $(GLIB_CFLAGS) \ $(LIBREPORT_CFLAGS) \ -D_GNU_SOURCE \ @@ -355,7 +360,7 @@ abrt_action_mailx_CPPFLAGS = \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ - -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ + -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \ $(GLIB_CFLAGS) \ $(LIBREPORT_CFLAGS) \ -D_GNU_SOURCE \ @@ -375,7 +380,7 @@ abrt_action_print_CPPFLAGS = \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ - -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ + -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \ $(GLIB_CFLAGS) \ $(LIBREPORT_CFLAGS) \ -D_GNU_SOURCE \ diff --git a/src/daemon/smart_event.conf b/src/plugins/smart_event.conf index 9c23862b..9c23862b 100644 --- a/src/daemon/smart_event.conf +++ b/src/plugins/smart_event.conf |