From a5d7afb38b50c72449dcb3feb39d3b79041bdefc Mon Sep 17 00:00:00 2001 From: Ryo Hashimoto Date: Fri, 29 Jan 2021 19:29:45 +0900 Subject: [PATCH] Add src/processor/stackwalk_common.{cc,h} to src_libbreakpad_a_SOURCES To generate the out directory before compiling stackwalk_common.cc. Makefile.in and aclocal.m4 were generated by running `aclocal && automake`. BUG=chromium:1167503 BUG=b:177451284 TEST=./configure && make Change-Id: I7a7674aa5f81cf0016eb2f5170ea3676ccfe3bbb Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/2659000 Reviewed-by: Mike Frysinger --- Makefile.am | 2 ++ Makefile.in | 22 ++++++++++++++++++---- aclocal.m4 | 13 ++++--------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2a2e7e47..ee7454e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -278,6 +278,8 @@ src_libbreakpad_a_SOURCES = \ src/processor/source_line_resolver_base.cc \ src/processor/stack_frame_cpu.cc \ src/processor/stack_frame_symbolizer.cc \ + src/processor/stackwalk_common.cc \ + src/processor/stackwalk_common.h \ src/processor/stackwalker.cc \ src/processor/stackwalker_amd64.cc \ src/processor/stackwalker_amd64.h \ diff --git a/Makefile.in b/Makefile.in index 212e3f32..55ef6f3f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -478,7 +478,8 @@ am__src_libbreakpad_a_SOURCES_DIST = \ src/processor/source_line_resolver_base.cc \ src/processor/stack_frame_cpu.cc \ src/processor/stack_frame_symbolizer.cc \ - src/processor/stackwalker.cc \ + src/processor/stackwalk_common.cc \ + src/processor/stackwalk_common.h src/processor/stackwalker.cc \ src/processor/stackwalker_amd64.cc \ src/processor/stackwalker_amd64.h \ src/processor/stackwalker_arm.cc \ @@ -535,6 +536,7 @@ am__src_libbreakpad_a_SOURCES_DIST = \ @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.$(OBJEXT) \ @DISABLE_PROCESSOR_FALSE@ src/processor/stack_frame_cpu.$(OBJEXT) \ @DISABLE_PROCESSOR_FALSE@ src/processor/stack_frame_symbolizer.$(OBJEXT) \ +@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalk_common.$(OBJEXT) \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker.$(OBJEXT) \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_amd64.$(OBJEXT) \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_arm.$(OBJEXT) \ @@ -1852,6 +1854,7 @@ am__depfiles_remade = src/client/$(DEPDIR)/minidump_file_writer.Po \ src/processor/$(DEPDIR)/source_line_resolver_base.Po \ src/processor/$(DEPDIR)/stack_frame_cpu.Po \ src/processor/$(DEPDIR)/stack_frame_symbolizer.Po \ + src/processor/$(DEPDIR)/stackwalk_common.Po \ src/processor/$(DEPDIR)/stackwalker.Po \ src/processor/$(DEPDIR)/stackwalker_address_list.Po \ src/processor/$(DEPDIR)/stackwalker_address_list_unittest-stackwalker_address_list_unittest.Po \ @@ -2251,6 +2254,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) TEST_SUITE_LOG = test-suite.log TEST_EXTENSIONS = @EXEEXT@ .test @@ -2297,6 +2301,8 @@ am__post_remove_distdir = $(am__remove_distdir) DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -2604,6 +2610,8 @@ CLEANFILES = $(am__append_12) @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.cc \ @DISABLE_PROCESSOR_FALSE@ src/processor/stack_frame_cpu.cc \ @DISABLE_PROCESSOR_FALSE@ src/processor/stack_frame_symbolizer.cc \ +@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalk_common.cc \ +@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalk_common.h \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker.cc \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_amd64.cc \ @DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_amd64.h \ @@ -4262,6 +4270,9 @@ src/processor/stack_frame_cpu.$(OBJEXT): \ src/processor/stack_frame_symbolizer.$(OBJEXT): \ src/processor/$(am__dirstamp) \ src/processor/$(DEPDIR)/$(am__dirstamp) +src/processor/stackwalk_common.$(OBJEXT): \ + src/processor/$(am__dirstamp) \ + src/processor/$(DEPDIR)/$(am__dirstamp) src/processor/stackwalker.$(OBJEXT): src/processor/$(am__dirstamp) \ src/processor/$(DEPDIR)/$(am__dirstamp) src/processor/stackwalker_amd64.$(OBJEXT): \ @@ -5549,6 +5560,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/source_line_resolver_base.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stack_frame_cpu.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stack_frame_symbolizer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalk_common.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_address_list.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_address_list_unittest-stackwalker_address_list_unittest.Po@am__quote@ # am--include-marker @@ -8758,7 +8770,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -9229,7 +9241,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -9618,6 +9630,7 @@ distclean: distclean-am -rm -f src/processor/$(DEPDIR)/source_line_resolver_base.Po -rm -f src/processor/$(DEPDIR)/stack_frame_cpu.Po -rm -f src/processor/$(DEPDIR)/stack_frame_symbolizer.Po + -rm -f src/processor/$(DEPDIR)/stackwalk_common.Po -rm -f src/processor/$(DEPDIR)/stackwalker.Po -rm -f src/processor/$(DEPDIR)/stackwalker_address_list.Po -rm -f src/processor/$(DEPDIR)/stackwalker_address_list_unittest-stackwalker_address_list_unittest.Po @@ -9960,6 +9973,7 @@ maintainer-clean: maintainer-clean-am -rm -f src/processor/$(DEPDIR)/source_line_resolver_base.Po -rm -f src/processor/$(DEPDIR)/stack_frame_cpu.Po -rm -f src/processor/$(DEPDIR)/stack_frame_symbolizer.Po + -rm -f src/processor/$(DEPDIR)/stackwalk_common.Po -rm -f src/processor/$(DEPDIR)/stackwalker.Po -rm -f src/processor/$(DEPDIR)/stackwalker_address_list.Po -rm -f src/processor/$(DEPDIR)/stackwalker_address_list_unittest-stackwalker_address_list_unittest.Po diff --git a/aclocal.m4 b/aclocal.m4 index f57461e6..be219b42 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.16.2 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- Autoconf -*- # Copyright (C) 1996-2020 Free Software Foundation, Inc. @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.2], [], +m4_if([$1], [1.16.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.2])dnl +[AM_AUTOMAKE_VERSION([1.16.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -819,12 +819,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then