diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-02-19 15:23:00 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-02-19 15:23:00 +0100 |
| commit | 2f907417d37d83cefad7950397bd141c0586b1d5 (patch) | |
| tree | 12d58967607cac7f300e7dcaee456fdfe9bd95a1 /src | |
| parent | b472b75f70c7e9144fb29f9d142e9f52f4caab39 (diff) | |
| parent | 0c899d52e5e42caf8c5c394ef6c142c08ac38858 (diff) | |
| download | abrt-2f907417d37d83cefad7950397bd141c0586b1d5.tar.gz abrt-2f907417d37d83cefad7950397bd141c0586b1d5.tar.xz abrt-2f907417d37d83cefad7950397bd141c0586b1d5.zip | |
Merge branch 'master' of git://git.fedorahosted.org/git/crash-catcher
Conflicts:
lib/DBus/Makefile.am
lib/DBus/dbus-crash-catcher.conf
lib/DBus/dbus-crashcatcher.conf
src/Daemon/Makefile.am
src/Daemon/dbus-crashcatcher.conf
Diffstat (limited to 'src')
| -rw-r--r-- | src/Daemon/Makefile.am | 10 | ||||
| -rw-r--r-- | src/Hooks/CCpp.cpp | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index 891ee26..3752ca3 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -1,9 +1,9 @@ -bin_PROGRAMS = CrashCatcher -CrashCatcher_SOURCES = CrashWatcher.cpp CrashWatcher.h DBusServerProxy.h DBusCommon.h Daemon.cpp -CrashCatcher_CPPFLAGS = -I../../lib/MiddleWare \ +bin_PROGRAMS = crash-catcher +crash_catcher_SOURCES = CrashWatcher.cpp CrashWatcher.h Daemon.cpp +crash_catcher_CPPFLAGS = -I../../lib/MiddleWare\ + -I../../lib/DBus \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(DBUS_GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ -DCONF_DIR=\"$(CONF_DIR)\" -CrashCatcher_LDADD = ../../lib/MiddleWare/libMiddleWare.la $(DBUS_GLIB_LIBS) $(DBUSCPP_LIBS) $(DL_LIBS) - +crash_catcher_LDADD = ../../lib/MiddleWare/libMiddleWare.la ../../lib/DBus/libDBus.la $(DL_LIBS) $(RPM_LIBS) diff --git a/src/Hooks/CCpp.cpp b/src/Hooks/CCpp.cpp index 082c9d6..4d9124f 100644 --- a/src/Hooks/CCpp.cpp +++ b/src/Hooks/CCpp.cpp @@ -62,7 +62,6 @@ int main(int argc, char** argv) dd.Create(path); dd.SaveProc(pid); dd.SaveText(FILENAME_LANGUAGE, "CCpp"); - dd.SavePackage(); int size = CORESTEP*sizeof(char); int ii = 0; |