Revert "renamed libreport.so to libreport2.so"

This is not needed at the end.
This reverts commit ef96cd431369b2cf0dd640a0bb66be4fb029b9c0.

11 files changed, 33 insertions, 33 deletions

diff --git a/src/applet/Makefile.am b/src/applet/Makefile.am
index 7b0d0dca..cd4a643f 100644
--- a/src/applet/Makefile.am
+++ b/src/applet/Makefile.am
@@ -23,7 +23,7 @@ abrt_applet_CPPFLAGS = \
 #    $(LIBNOTIFY_CFLAGS)
 #    $(DBUS_GLIB_CFLAGS)
 abrt_applet_LDADD = \
-    ../lib/libreport2.la \
+    ../lib/libreport.la \
     ../lib/libabrt_dbus.la \
     -lglib-2.0 \
     -lgthread-2.0 \
@@ -39,7 +39,7 @@ abrt_applet_LDADD = \
 #    -D_GNU_SOURCE \
 #    -Wall -Werror
 #test_report_LDADD = \
-#    ../lib/libreport2.la
+#    ../lib/libreport.la
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
diff --git a/src/btparser/Makefile.am b/src/btparser/Makefile.am
index ad93b317..9f64f826 100644
--- a/src/btparser/Makefile.am
+++ b/src/btparser/Makefile.am
@@ -15,7 +15,7 @@ libbtparser_la_SOURCES = \
 	utils.h utils.c
 libbtparser_la_CFLAGS = -Wall -Werror -D_GNU_SOURCE -I../lib
 libbtparser_la_LDFLAGS = -version-info 1:1:0
-libbtparser_la_LIBADD = ../lib/libreport2.la
+libbtparser_la_LIBADD = ../lib/libreport.la
 
 # From http://www.seul.org/docs/autotut/
 # Version consists 3 numbers: CURRENT, REVISION, AGE.
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 0cf463f7..0a5c6e1a 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -16,7 +16,7 @@ abrt_cli_CPPFLAGS = \
     -Wall -Werror
 #    $(GTK_CFLAGS)
 abrt_cli_LDADD = \
-    ../lib/libreport2.la \
+    ../lib/libreport.la \
     ../lib/libabrt_dbus.la \
     $(GLIB_LIBS)
 
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index a8e0bfb6..6fe73065 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -34,7 +34,7 @@ abrtd_CPPFLAGS = \
 abrtd_LDADD = \
     $(DL_LIBS) \
     $(DBUS_LIBS) \
-    ../lib/libreport2.la \
+    ../lib/libreport.la \
     ../lib/libabrt_dbus.la
 
 abrt_server_SOURCES = \
@@ -53,7 +53,7 @@ abrt_server_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_server_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_handle_crashdump_SOURCES = \
     abrt-handle-crashdump.c
@@ -73,7 +73,7 @@ abrt_handle_crashdump_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_handle_crashdump_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_save_package_data_SOURCES = \
     rpm.h rpm.c \
@@ -95,7 +95,7 @@ abrt_action_save_package_data_CPPFLAGS = \
     -Wall -Werror
 abrt_action_save_package_data_LDADD = \
     $(RPM_LIBS) \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/
 dist_dbusabrtconf_DATA = dbus-abrt.conf
diff --git a/src/gui-gtk/Makefile.am b/src/gui-gtk/Makefile.am
index 054253d2..a0d0de40 100644
--- a/src/gui-gtk/Makefile.am
+++ b/src/gui-gtk/Makefile.am
@@ -22,7 +22,7 @@ abrt_gtk_CFLAGS = \
 #    $(LIBNOTIFY_CFLAGS)
 #    $(DBUS_GLIB_CFLAGS)
 abrt_gtk_LDADD = \
-    ../lib/libreport2.la \
+    ../lib/libreport.la \
     ../lib/libabrt_dbus.la \
     -lglib-2.0 \
     -lgthread-2.0 \
@@ -38,7 +38,7 @@ abrt_gtk_LDADD = \
 #    -D_GNU_SOURCE \
 #    -Wall -Werror
 #test_report_LDADD = \
-#    ../lib/libreport2.la
+#    ../lib/libreport.la
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
diff --git a/src/gui-wizard-gtk/Makefile.am b/src/gui-wizard-gtk/Makefile.am
index 789501ee..4281c470 100644
--- a/src/gui-wizard-gtk/Makefile.am
+++ b/src/gui-wizard-gtk/Makefile.am
@@ -30,7 +30,7 @@ bug_reporting_wizard_CFLAGS = \
 # -lgmodule-2.0
 # -lgthread-2.0
 bug_reporting_wizard_LDADD = \
-    ../lib/libreport2.la \
+    ../lib/libreport.la \
     ../lib/libabrt_dbus.la \
     $(GLIB_LIBS) \
     $(GTK_LIBS) \
diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am
index 40e57ff5..6ebf3628 100644
--- a/src/hooks/Makefile.am
+++ b/src/hooks/Makefile.am
@@ -13,7 +13,7 @@ abrt_hook_ccpp_CPPFLAGS = \
     -Wall \
     -D_GNU_SOURCE
 abrt_hook_ccpp_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 python_PYTHON = abrt.pth abrt_exception_handler.py
 EXTRA_DIST = abrt_exception_handler.py.in $(man_MANS)
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index b11c3332..477963c3 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,5 +1,5 @@
-libreport2_includedir = $(includedir)/report
-libreport2_include_HEADERS = \
+libreport_includedir = $(includedir)/report
+libreport_include_HEADERS = \
     report/crash_data.h \
     report/dump_dir.h \
     report/run_event.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index e30f38bc..bad3e63a 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,8 +1,8 @@
-# libreport2 - the stuff shared among most of abrt (like xmalloc, logging)
+# libreport - the stuff shared among most of abrt (like xmalloc, logging)
 # libabrt_dbus - daemon, cli and applet use this
 # libabrt_web - for abrt-action-foo where foo deals with network/web/ftp/...
 lib_LTLIBRARIES = \
-    libreport2.la \
+    libreport.la \
     libabrt_dbus.la \
     libabrt_web.la
 
@@ -10,7 +10,7 @@ lib_LTLIBRARIES = \
 # time.cpp
 # xconnect.cpp
 
-libreport2_la_SOURCES = \
+libreport_la_SOURCES = \
     xfuncs.c \
     encbase64.c \
     binhex.c \
@@ -44,7 +44,7 @@ libreport2_la_SOURCES = \
     parse_release.c \
     parse_options.c parse_options.h \
     steal_directory.c
-libreport2_la_CPPFLAGS = \
+libreport_la_CPPFLAGS = \
     -Wall -Werror \
     -I$(srcdir)/../include/report -I$(srcdir)/../include \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
@@ -55,9 +55,9 @@ libreport2_la_CPPFLAGS = \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE
-libreport2_la_LDFLAGS = \
+libreport_la_LDFLAGS = \
     -version-info 0:1:0
-libreport2_la_LIBADD = \
+libreport_la_LIBADD = \
     $(GLIB_LIBS)
 
 libabrt_dbus_la_SOURCES = \
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 1a3921b9..59e0f1a4 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -79,7 +79,7 @@ abrt_dump_oops_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_dump_oops_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_analyze_c_SOURCES = \
     abrt-action-analyze-c.c
@@ -98,7 +98,7 @@ abrt_action_analyze_c_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_c_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_analyze_python_SOURCES = \
     abrt-action-analyze-python.c
@@ -117,7 +117,7 @@ abrt_action_analyze_python_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_python_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_analyze_oops_SOURCES = \
     abrt-action-analyze-oops.c
@@ -136,7 +136,7 @@ abrt_action_analyze_oops_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_oops_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_generate_backtrace_SOURCES = \
     abrt-action-generate-backtrace.c
@@ -155,7 +155,7 @@ abrt_action_generate_backtrace_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_generate_backtrace_LDADD = \
-    ../lib/libreport2.la \
+    ../lib/libreport.la \
     ../btparser/libbtparser.la
 
 abrt_action_bugzilla_SOURCES = \
@@ -177,7 +177,7 @@ abrt_action_bugzilla_CPPFLAGS = \
 abrt_action_bugzilla_LDADD = \
     $(GLIB_LIBS) \
     ../lib/libabrt_web.la \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_rhtsupport_SOURCES = \
     abrt_rh_support.h abrt_rh_support.c \
@@ -202,7 +202,7 @@ abrt_action_rhtsupport_LDADD = \
     $(GLIB_LIBS) \
     $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
     ../lib/libabrt_web.la \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_upload_SOURCES = \
     abrt-action-upload.c
@@ -225,7 +225,7 @@ abrt_action_upload_LDFLAGS = -ltar
 abrt_action_upload_LDADD = \
     $(GLIB_LIBS) \
     $(CURL_LIBS) \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_kerneloops_SOURCES = \
     abrt-action-kerneloops.c
@@ -245,7 +245,7 @@ abrt_action_kerneloops_CPPFLAGS = \
     -Wall -Werror
 abrt_action_kerneloops_LDADD = \
     ../lib/libabrt_web.la \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_mailx_SOURCES = \
     abrt-action-mailx.c
@@ -264,7 +264,7 @@ abrt_action_mailx_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_mailx_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_print_SOURCES = \
     abrt-action-print.c
@@ -283,7 +283,7 @@ abrt_action_print_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_print_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_install_debuginfo_SOURCES = \
     abrt-action-install-debuginfo.c
@@ -305,7 +305,7 @@ abrt_retrace_client_SOURCES = \
      -D_GNU_SOURCE \
      -Wall -Werror
  abrt_retrace_client_LDADD = \
-     ../lib/libreport2.la \
+     ../lib/libreport.la \
      ../btparser/libbtparser.la \
      $(NSS_LIBS)
 
diff --git a/src/report-python/Makefile.am b/src/report-python/Makefile.am
index cff7af64..a00e2d7b 100644
--- a/src/report-python/Makefile.am
+++ b/src/report-python/Makefile.am
@@ -29,7 +29,7 @@ _pyreport_la_LDFLAGS = \
     -avoid-version \
     -export-symbols-regex init_pyreport
 _pyreport_la_LIBADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 # report compat: