summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Moskovcak <jmoskovc@redhat.com>2009-08-06 16:19:40 +0200
committerJiri Moskovcak <jmoskovc@redhat.com>2009-08-06 16:19:40 +0200
commitb9c0e8f9f8b3148e7ffc95b4eaf25299d9ead2a2 (patch)
treee51067a3a4019221cabf5b710742d14f948b5310
parent84348ccea878d509f838927e1bf393e5443d3ac8 (diff)
parentb64e1671afd1cd1c25604ffb3bf6f681a864b639 (diff)
downloadabrt-b9c0e8f9f8b3148e7ffc95b4eaf25299d9ead2a2.tar.gz
abrt-b9c0e8f9f8b3148e7ffc95b4eaf25299d9ead2a2.tar.xz
abrt-b9c0e8f9f8b3148e7ffc95b4eaf25299d9ead2a2.zip
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
-rw-r--r--lib/MiddleWare/Makefile.am2
-rw-r--r--src/Daemon/ABRTPlugin.cpp (renamed from lib/MiddleWare/ABRTPlugin.cpp)0
-rw-r--r--src/Daemon/ABRTPlugin.h (renamed from lib/MiddleWare/ABRTPlugin.h)0
-rw-r--r--src/Daemon/DynamicLibrary.cpp (renamed from lib/MiddleWare/DynamicLibrary.cpp)0
-rw-r--r--src/Daemon/DynamicLibrary.h (renamed from lib/MiddleWare/DynamicLibrary.h)0
-rw-r--r--src/Daemon/Makefile.am2
6 files changed, 2 insertions, 2 deletions
diff --git a/lib/MiddleWare/Makefile.am b/lib/MiddleWare/Makefile.am
index b84dcba1..8fbb4060 100644
--- a/lib/MiddleWare/Makefile.am
+++ b/lib/MiddleWare/Makefile.am
@@ -1,8 +1,6 @@
lib_LTLIBRARIES = libABRTMiddleWare.la
libABRTMiddleWare_la_SOURCES = \
- ABRTPlugin.cpp ABRTPlugin.h \
- DynamicLibrary.cpp DynamicLibrary.h \
RPM.cpp RPM.h \
Plugin.h MiddleWareTypes.h Action.h Database.h \
Reporter.h Analyzer.h
diff --git a/lib/MiddleWare/ABRTPlugin.cpp b/src/Daemon/ABRTPlugin.cpp
index f2afa416..f2afa416 100644
--- a/lib/MiddleWare/ABRTPlugin.cpp
+++ b/src/Daemon/ABRTPlugin.cpp
diff --git a/lib/MiddleWare/ABRTPlugin.h b/src/Daemon/ABRTPlugin.h
index cdf72bb3..cdf72bb3 100644
--- a/lib/MiddleWare/ABRTPlugin.h
+++ b/src/Daemon/ABRTPlugin.h
diff --git a/lib/MiddleWare/DynamicLibrary.cpp b/src/Daemon/DynamicLibrary.cpp
index ffb2a6e4..ffb2a6e4 100644
--- a/lib/MiddleWare/DynamicLibrary.cpp
+++ b/src/Daemon/DynamicLibrary.cpp
diff --git a/lib/MiddleWare/DynamicLibrary.h b/src/Daemon/DynamicLibrary.h
index f3a95f5d..f3a95f5d 100644
--- a/lib/MiddleWare/DynamicLibrary.h
+++ b/src/Daemon/DynamicLibrary.h
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index 41d60a73..7964177d 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -1,6 +1,8 @@
sbin_PROGRAMS = abrt
abrt_SOURCES = \
+ DynamicLibrary.cpp DynamicLibrary.h \
+ ABRTPlugin.cpp ABRTPlugin.h \
PluginManager.cpp PluginManager.h \
MiddleWare.cpp MiddleWare.h \
CrashWatcher.cpp CrashWatcher.h \