1 files changed, 13 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index c7296970..d975983d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,16 +36,15 @@ lib_LTLIBRARIES = src/libairbag.la
 
 src_libairbag_la_SOURCES = \
 	src/google/airbag_types.h \
-	src/google/crash_report.h \
-	src/google/crash_report_processor.h \
+	src/google/minidump_processor.h \
 	src/google/stack_frame.h \
 	src/google/symbol_supplier.h \
-	src/processor/crash_report_processor.cc \
 	src/processor/linked_ptr.h \
 	src/processor/memory_region.h \
 	src/processor/minidump.cc \
 	src/processor/minidump.h \
 	src/processor/minidump_format.h \
+	src/processor/minidump_processor.cc \
 	src/processor/range_map.h \
 	src/processor/source_line_resolver.cc \
 	src/processor/source_line_resolver.h \
@@ -63,15 +62,24 @@ bin_PROGRAMS = \
 
 ## Tests
 check_PROGRAMS = \
+	src/processor/minidump_processor_unittest \
 	src/processor/range_map_unittest \
-	src/processor/source_line_resolver_unittest \
-	src/processor/crash_report_processor_unittest
+	src/processor/source_line_resolver_unittest
 check_SCRIPTS = \
 	src/processor/minidump_dump_test \
 	src/processor/minidump_stackwalk_test
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 TESTS_ENVIRONMENT =
 
+src_processor_minidump_processor_unittest_SOURCES = \
+	src/processor/minidump_processor_unittest.cc
+src_processor_minidump_processor_unittest_LDADD = \
+	src/processor/minidump_processor.lo \
+	src/processor/minidump.lo \
+	src/processor/stackwalker.lo \
+	src/processor/stackwalker_x86.lo \
+	src/processor/source_line_resolver.lo
+
 src_processor_range_map_unittest_SOURCES = \
 	src/processor/range_map_unittest.cc
 
@@ -80,15 +88,6 @@ src_processor_source_line_resolver_unittest_SOURCES = \
 src_processor_source_line_resolver_unittest_LDADD = \
 	src/processor/source_line_resolver.lo
 
-src_processor_crash_report_processor_unittest_SOURCES = \
-	src/processor/crash_report_processor_unittest.cc
-src_processor_crash_report_processor_unittest_LDADD = \
-	src/processor/crash_report_processor.lo \
-	src/processor/minidump.lo \
-	src/processor/stackwalker.lo \
-	src/processor/stackwalker_x86.lo \
-	src/processor/source_line_resolver.lo
-
 ## Non-installables
 noinst_PROGRAMS =
 noinst_SCRIPTS = $(check_SCRIPTS)