Index: Makefile.in |
diff --git a/Makefile.in b/Makefile.in |
index 87441fcb84529fa4d283e671e09c9cc433c35e62..a0140408899b0ab7f0d95ed284c148df555b4373 100644 |
--- a/Makefile.in |
+++ b/Makefile.in |
@@ -143,10 +143,9 @@ host_triplet = @host@ |
# Build as PIC on Linux, for linux_client_unittest_shlib |
@LINUX_HOST_TRUE@am__append_3 = -fPIC |
@LINUX_HOST_TRUE@am__append_4 = -fPIC |
-bin_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \ |
- $(am__EXEEXT_5) |
-check_PROGRAMS = $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \ |
- $(am__EXEEXT_9) |
+bin_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) |
+check_PROGRAMS = $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \ |
+ $(am__EXEEXT_8) |
EXTRA_PROGRAMS = $(am__EXEEXT_1) |
@DISABLE_PROCESSOR_FALSE@am__append_5 = src/libbreakpad.a |
@DISABLE_PROCESSOR_FALSE@am__append_6 = breakpad.pc |
@@ -161,20 +160,21 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) |
@DISABLE_PROCESSOR_FALSE@ src/processor/minidump_dump \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/minidump_stackwalk |
-@LINUX_HOST_TRUE@am__append_12 = \ |
-@LINUX_HOST_TRUE@ src/client/linux/linux_dumper_unittest_helper |
- |
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__append_13 = \ |
+@LINUX_HOST_TRUE@am__append_12 = src/client/linux/linux_dumper_unittest_helper \ |
+@LINUX_HOST_TRUE@ src/client/linux/linux_client_unittest_shlib |
+@LINUX_HOST_TRUE@am__append_13 = src/client/linux/linux_dumper_unittest_helper \ |
+@LINUX_HOST_TRUE@ src/client/linux/linux_client_unittest_shlib |
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__append_14 = \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/core2md/core2md \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/dump_syms/dump_syms \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/md2core/minidump-2-core \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/symupload/minidump_upload \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/symupload/sym_upload |
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@am__append_14 = \ |
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@am__append_15 = \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@ src/tools/mac/dump_syms/dump_syms_mac |
-@DISABLE_PROCESSOR_FALSE@am__append_15 = \ |
+@DISABLE_PROCESSOR_FALSE@am__append_16 = \ |
@DISABLE_PROCESSOR_FALSE@ src/common/test_assembler_unittest \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/address_map_unittest \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver_unittest \ |
@@ -203,33 +203,27 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) |
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86_unittest \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/synth_minidump_unittest |
-@LINUX_HOST_TRUE@am__append_16 = \ |
-@LINUX_HOST_TRUE@ src/client/linux/linux_client_unittest_shlib |
- |
@LINUX_HOST_TRUE@am__append_17 = \ |
-@LINUX_HOST_TRUE@ src/client/linux/linux_client_unittest_shlib |
- |
-@LINUX_HOST_TRUE@am__append_18 = \ |
@LINUX_HOST_TRUE@ src/client/linux/linux_client_unittest |
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__append_19 = \ |
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__append_18 = \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/common/dumper_unittest \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/common/mac/macho_reader_unittest \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/md2core/minidump_2_core_unittest |
-@DISABLE_PROCESSOR_FALSE@@SELFTEST_TRUE@am__append_20 = \ |
+@DISABLE_PROCESSOR_FALSE@@SELFTEST_TRUE@am__append_19 = \ |
@DISABLE_PROCESSOR_FALSE@@SELFTEST_TRUE@ src/processor/stackwalker_selftest |
-@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@am__append_21 = \ |
+@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@am__append_20 = \ |
@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@ src/common/android/breakpad_getcontext.S |
-@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@am__append_22 = \ |
+@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@am__append_21 = \ |
@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@ src/common/android/breakpad_getcontext_unittest.cc |
-@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@am__append_23 = \ |
+@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@am__append_22 = \ |
@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@ -llog -lm |
-@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@am__append_24 = \ |
+@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@am__append_23 = \ |
@ANDROID_HOST_TRUE@@LINUX_HOST_TRUE@ -llog |
noinst_PROGRAMS = |
@@ -544,18 +538,18 @@ am__src_third_party_libdisasm_libdisasm_a_SOURCES_DIST = \ |
@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/x86_operand_list.$(OBJEXT) |
src_third_party_libdisasm_libdisasm_a_OBJECTS = \ |
$(am_src_third_party_libdisasm_libdisasm_a_OBJECTS) |
-@LINUX_HOST_TRUE@am__EXEEXT_1 = src/client/linux/linux_client_unittest_shlib$(EXEEXT) |
+@LINUX_HOST_TRUE@am__EXEEXT_1 = src/client/linux/linux_dumper_unittest_helper$(EXEEXT) \ |
+@LINUX_HOST_TRUE@ src/client/linux/linux_client_unittest_shlib$(EXEEXT) |
@DISABLE_PROCESSOR_FALSE@am__EXEEXT_2 = src/processor/microdump_stackwalk$(EXEEXT) \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/minidump_dump$(EXEEXT) \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/minidump_stackwalk$(EXEEXT) |
-@LINUX_HOST_TRUE@am__EXEEXT_3 = src/client/linux/linux_dumper_unittest_helper$(EXEEXT) |
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__EXEEXT_4 = src/tools/linux/core2md/core2md$(EXEEXT) \ |
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__EXEEXT_3 = src/tools/linux/core2md/core2md$(EXEEXT) \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/dump_syms/dump_syms$(EXEEXT) \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/md2core/minidump-2-core$(EXEEXT) \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/symupload/minidump_upload$(EXEEXT) \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/symupload/sym_upload$(EXEEXT) |
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@am__EXEEXT_5 = src/tools/mac/dump_syms/dump_syms_mac$(EXEEXT) |
-@DISABLE_PROCESSOR_FALSE@am__EXEEXT_6 = src/common/test_assembler_unittest$(EXEEXT) \ |
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@@X86_HOST_TRUE@am__EXEEXT_4 = src/tools/mac/dump_syms/dump_syms_mac$(EXEEXT) |
+@DISABLE_PROCESSOR_FALSE@am__EXEEXT_5 = src/common/test_assembler_unittest$(EXEEXT) \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/address_map_unittest$(EXEEXT) \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver_unittest$(EXEEXT) \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info_unittest$(EXEEXT) \ |
@@ -582,11 +576,11 @@ src_third_party_libdisasm_libdisasm_a_OBJECTS = \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_mips_unittest$(EXEEXT) \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86_unittest$(EXEEXT) \ |
@DISABLE_PROCESSOR_FALSE@ src/processor/synth_minidump_unittest$(EXEEXT) |
-@LINUX_HOST_TRUE@am__EXEEXT_7 = src/client/linux/linux_client_unittest$(EXEEXT) |
-@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__EXEEXT_8 = src/common/dumper_unittest$(EXEEXT) \ |
+@LINUX_HOST_TRUE@am__EXEEXT_6 = src/client/linux/linux_client_unittest$(EXEEXT) |
+@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@am__EXEEXT_7 = src/common/dumper_unittest$(EXEEXT) \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/common/mac/macho_reader_unittest$(EXEEXT) \ |
@DISABLE_TOOLS_FALSE@@LINUX_HOST_TRUE@ src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT) |
-@DISABLE_PROCESSOR_FALSE@@SELFTEST_TRUE@am__EXEEXT_9 = src/processor/stackwalker_selftest$(EXEEXT) |
+@DISABLE_PROCESSOR_FALSE@@SELFTEST_TRUE@am__EXEEXT_8 = src/processor/stackwalker_selftest$(EXEEXT) |
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) |
am_src_client_linux_linux_client_unittest_OBJECTS = |
src_client_linux_linux_client_unittest_OBJECTS = \ |
@@ -1996,7 +1990,7 @@ pkgconfig_DATA = $(am__append_6) $(am__append_9) |
check_LIBRARIES = src/testing/libtesting.a |
noinst_LIBRARIES = $(am__append_7) |
lib_LIBRARIES = $(am__append_5) $(am__append_8) |
-CLEANFILES = $(am__append_17) |
+CLEANFILES = $(am__append_13) |
@SYSTEM_TEST_LIBS_FALSE@src_testing_libtesting_a_SOURCES = \ |
@SYSTEM_TEST_LIBS_FALSE@ src/testing/gtest/src/gtest-all.cc \ |
@SYSTEM_TEST_LIBS_FALSE@ src/testing/gtest/src/gtest_main.cc \ |
@@ -2221,15 +2215,15 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
@LINUX_HOST_TRUE@ src/processor/minidump.cc \ |
@LINUX_HOST_TRUE@ src/processor/pathname_stripper.cc \ |
@LINUX_HOST_TRUE@ src/processor/proc_maps_linux.cc \ |
-@LINUX_HOST_TRUE@ $(am__append_21) \ |
+@LINUX_HOST_TRUE@ $(am__append_20) \ |
@LINUX_HOST_TRUE@ src/client/linux/microdump_writer/microdump_writer_unittest.cc \ |
-@LINUX_HOST_TRUE@ $(am__append_22) |
+@LINUX_HOST_TRUE@ $(am__append_21) |
@LINUX_HOST_TRUE@src_client_linux_linux_client_unittest_shlib_CPPFLAGS = \ |
@LINUX_HOST_TRUE@ $(AM_CPPFLAGS) $(TEST_CFLAGS) |
@LINUX_HOST_TRUE@src_client_linux_linux_client_unittest_shlib_LDFLAGS = \ |
@LINUX_HOST_TRUE@ -shared -Wl,-h,linux_client_unittest_shlib \ |
-@LINUX_HOST_TRUE@ $(am__append_23) |
+@LINUX_HOST_TRUE@ $(am__append_22) |
@LINUX_HOST_TRUE@src_client_linux_linux_client_unittest_shlib_LDADD = \ |
@LINUX_HOST_TRUE@ src/client/linux/crash_generation/crash_generation_client.o \ |
@LINUX_HOST_TRUE@ src/client/linux/dump_writer_common/thread_info.o \ |
@@ -2261,7 +2255,7 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
@LINUX_HOST_TRUE@src_client_linux_linux_client_unittest_SOURCES = |
@LINUX_HOST_TRUE@src_client_linux_linux_client_unittest_LDFLAGS = \ |
-@LINUX_HOST_TRUE@ -Wl,-rpath,'$$ORIGIN' $(am__append_24) |
+@LINUX_HOST_TRUE@ -Wl,-rpath,'$$ORIGIN' $(am__append_23) |
@LINUX_HOST_TRUE@src_client_linux_linux_client_unittest_LDADD = \ |
@LINUX_HOST_TRUE@ src/client/linux/linux_client_unittest_shlib \ |
@LINUX_HOST_TRUE@ $(TEST_LIBS) |