cpw.caseyho.crashreporter: 184c726c: Converting the remainder breakpad code i...

[caseyho at pidgin.im]

-----------------------------------------------------------------
Revision: 184c726cfb2c3f9d284ac9e15c547fd59d0741be
Ancestor: 2f1e8252956368e5ae52c200b8c1ea982d7d6200
Author: caseyho at pidgin.im
Date: 2009-02-12T23:29:48
Branch: im.pidgin.cpw.caseyho.crashreporter
URL: http://d.pidgin.im/viewmtn/revision/info/184c726cfb2c3f9d284ac9e15c547fd59d0741be

Modified files:
        Makefile.am pidgin/Makefile.am thirdparty/Makefile.am

ChangeLog: 

Converting the remainder breakpad code into a custom library with seperate linking.

-------------- next part --------------
============================================================
--- Makefile.am	73e5ae09c03ed9c87859eddc0d74ab03512159e7
+++ Makefile.am	18ee508ba8b8e27fab7bff4b50a5683279ef1abb
@@ -86,7 +86,7 @@ endif
 PO_DIR=po
 endif
 
-SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros $(PO_DIR) share/ca-certs share/sounds
+SUBDIRS = thirdparty libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros $(PO_DIR) share/ca-certs share/sounds
 
 docs: Doxyfile
 if HAVE_DOXYGEN
============================================================
--- pidgin/Makefile.am	e111ea64b04e7d59bf890e65f2c27e6832f09293
+++ pidgin/Makefile.am	4904b6f11dcf9f2975878fa365518d0d5591f335
@@ -130,16 +130,6 @@ pidgin_SOURCES += \
 
 if ENABLE_CRASHREPORTER
 pidgin_SOURCES += \
-	crash/google-breakpad/common/convert_UTF.c \
-	crash/google-breakpad/common/string_conversion.cc \
-	crash/google-breakpad/common/linux/dump_symbols.cc \
-	crash/google-breakpad/common/linux/file_id.cc \
-	crash/google-breakpad/common/md5.c \
-	crash/google-breakpad/common/linux/guid_creator.cc \
-	crash/google-breakpad/client/minidump_file_writer.cc \
-	crash/google-breakpad/client/linux/handler/exception_handler.cc \
-	crash/google-breakpad/client/linux/handler/minidump_generator.cc \
-	crash/google-breakpad/client/linux/handler/linux_thread.cc \
 	crash/crashhandler.cpp
 endif
 
@@ -223,7 +213,11 @@ pidgin_LDADD = \
 	$(LIBXML_LIBS) \
 	$(GTK_LIBS) \
 	$(top_builddir)/libpurple/libpurple.la
+if ENABLE_CRASHREPORTER
+pidgin_LDADD += $(top_builddir)/thirdparty/google-breakpad/src/libbreakpad_client.la
+endif
 
+
 if USE_INTERNAL_LIBGADU
 INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
 endif
@@ -249,7 +243,7 @@ if ENABLE_CRASHREPORTER
 	$(INTGG_CFLAGS)
 
 if ENABLE_CRASHREPORTER
-AM_CPPFLAGS += -I$(top_srcdir)/pidgin/crash/google-breakpad
+AM_CPPFLAGS += -I$(top_srcdir)/thirdparty/google-breakpad/src
 endif
 
 endif  # ENABLE_GTK
============================================================
--- thirdparty/Makefile.am	091b10bf29a15e51978f8f3ffee8da1b7bb5e7ca
+++ thirdparty/Makefile.am	9abb96cef98c274e6af4ddfdbb4d580e63e0ab39
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/thirdparty
 AM_CPPFLAGS = -I$(top_srcdir)/thirdparty/google-breakpad/src
 
 ## Libraries
-lib_LTLIBRARIES = google-breakpad/src/libbreakpad.la
+lib_LTLIBRARIES = google-breakpad/src/libbreakpad.la google-breakpad/src/libbreakpad_client.la
 
 google_breakpad_src_libbreakpad_la_SOURCES = \
 	google-breakpad/src/google_breakpad/common/breakpad_types.h \
@@ -60,5 +60,17 @@ google_breakpad_src_libbreakpad_la_SOURC
 	google-breakpad/src/processor/stackwalker_x86.cc \
 	google-breakpad/src/processor/stackwalker_x86.h
 
+google_breakpad_src_libbreakpad_client_la_SOURCES = \
+	google-breakpad/src/common/convert_UTF.c \
+	google-breakpad/src/common/string_conversion.cc \
+	google-breakpad/src/common/linux/dump_symbols.cc \
+	google-breakpad/src/common/linux/file_id.cc \
+	google-breakpad/src/common/md5.c \
+	google-breakpad/src/common/linux/guid_creator.cc \
+	google-breakpad/src/client/minidump_file_writer.cc \
+	google-breakpad/src/client/linux/handler/exception_handler.cc \
+	google-breakpad/src/client/linux/handler/minidump_generator.cc \
+	google-breakpad/src/client/linux/handler/linux_thread.cc
+
 endif