suyu/breakpad
26
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Restructure Makefile conditionals/targets

Browse source 
As the conditionals and targets was becoming quite hard to
grasp with lots of conditionals applied unnecessarily to target
properties, there were issues with targets being defined without
any sources.
This commit fixes that while restructuring the Makefile so that
all targets are declared (conditionally if needed) upfront and
then all the target properties are defined (source, flags, deps, etc.)

Change-Id: I666d153c476fbf1aafabb89cee7af4eee5795ab6
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3928024
Reviewed-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Marvin Scholz 2022-09-30 13:55:51 +02:00 committed by Mike Frysinger
parent 41474d905f
commit 9aa786f03d
2 changed files with 2222 additions and 2634 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

415
Makefile.am
View file

@ -118,6 +118,22 @@ TEST_LIBS = src/testing/libtesting.a
TEST_DEPS = $(TEST_LIBS) TEST_DEPS = $(TEST_LIBS)
endif endif
## Setup test driver
if ANDROID_HOST
# Since Autotools 1.2, tests are run through a special "test driver" script.
# Unfortunately, it's not possible anymore to specify an alternative shell to
# run them on connected devices, so use a slightly modified version of the
# driver for Android.
LOG_DRIVER = $(top_srcdir)/android/test-driver
else
if TESTS_AS_ROOT
LOG_DRIVER = $(top_srcdir)/autotools/root-test-driver $(top_srcdir)/autotools/test-driver
else
LOG_DRIVER = $(top_srcdir)/autotools/test-driver
endif !TESTS_AS_ROOT
endif !ANDROID_HOST
## Libraries ## Libraries
check_LIBRARIES = check_LIBRARIES =
noinst_LIBRARIES = noinst_LIBRARIES =
@ -125,13 +141,17 @@ lib_LIBRARIES =
libexec_PROGRAMS = libexec_PROGRAMS =
bin_PROGRAMS = bin_PROGRAMS =
check_PROGRAMS = check_PROGRAMS =
noinst_PROGRAMS =
noinst_SCRIPTS =
EXTRA_PROGRAMS = EXTRA_PROGRAMS =
CLEANFILES = CLEANFILES =
check_LIBRARIES += src/testing/libtesting.a #
check_PROGRAMS += src/common/safe_math_unittest # Tests helper library
#
if !SYSTEM_TEST_LIBS if !SYSTEM_TEST_LIBS
check_LIBRARIES += src/testing/libtesting.a
endif
src_testing_libtesting_a_SOURCES = \ src_testing_libtesting_a_SOURCES = \
src/breakpad_googletest_includes.h \ src/breakpad_googletest_includes.h \
src/testing/googletest/src/gtest-all.cc \ src/testing/googletest/src/gtest-all.cc \
@ -139,62 +159,171 @@ src_testing_libtesting_a_SOURCES = \
src/testing/googlemock/src/gmock-all.cc src/testing/googlemock/src/gmock-all.cc
src_testing_libtesting_a_CPPFLAGS = \ src_testing_libtesting_a_CPPFLAGS = \
$(AM_CPPFLAGS) $(TEST_CFLAGS) $(AM_CPPFLAGS) $(TEST_CFLAGS)
endif
#
# General
# Not specific to processor, client or tools
#
check_PROGRAMS += src/common/safe_math_unittest
#
# Breakpad minidump and microdump
# processor library, tools and tests
#
if !DISABLE_PROCESSOR if !DISABLE_PROCESSOR
lib_LIBRARIES += src/libbreakpad.a lib_LIBRARIES += src/libbreakpad.a
pkgconfig_DATA += breakpad.pc pkgconfig_DATA += breakpad.pc
noinst_LIBRARIES += src/third_party/libdisasm/libdisasm.a noinst_LIBRARIES += src/third_party/libdisasm/libdisasm.a
endif
## Programs
bin_PROGRAMS += \
src/processor/microdump_stackwalk \
src/processor/minidump_dump \
src/processor/minidump_stackwalk
## Tests (binaries)
check_PROGRAMS += \
src/common/test_assembler_unittest \
src/common/dwarf/dwarf2reader_lineinfo_unittest \
src/common/dwarf/dwarf2reader_splitfunctions_unittest \
src/processor/address_map_unittest \
src/processor/basic_source_line_resolver_unittest \
src/processor/cfi_frame_info_unittest \
src/processor/contained_range_map_unittest \
src/processor/disassembler_objdump_unittest \
src/processor/disassembler_x86_unittest \
src/processor/exploitability_unittest \
src/processor/fast_source_line_resolver_unittest \
src/processor/map_serializers_unittest \
src/processor/microdump_processor_unittest \
src/processor/minidump_processor_unittest \
src/processor/minidump_unittest \
src/processor/static_address_map_unittest \
src/processor/static_contained_range_map_unittest \
src/processor/static_map_unittest \
src/processor/static_range_map_unittest \
src/processor/pathname_stripper_unittest \
src/processor/postfix_evaluator_unittest \
src/processor/proc_maps_linux_unittest \
src/processor/range_map_truncate_lower_unittest \
src/processor/range_map_truncate_upper_unittest \
src/processor/range_map_unittest \
src/processor/stackwalker_amd64_unittest \
src/processor/stackwalker_arm_unittest \
src/processor/stackwalker_arm64_unittest \
src/processor/stackwalker_address_list_unittest \
src/processor/stackwalker_mips_unittest \
src/processor/stackwalker_mips64_unittest \
src/processor/stackwalker_riscv_unittest \
src/processor/stackwalker_riscv64_unittest \
src/processor/stackwalker_x86_unittest \
src/processor/synth_minidump_unittest
if SELFTEST
check_PROGRAMS += \
src/processor/stackwalker_selftest
endif SELFTEST
## Tests (scripts)
check_SCRIPTS = \
src/processor/microdump_stackwalk_test \
src/processor/microdump_stackwalk_machine_readable_test \
src/processor/minidump_dump_test \
src/processor/minidump_stackwalk_test \
src/processor/minidump_stackwalk_machine_readable_test
endif !DISABLE_PROCESSOR
#
# Breakpad client library and tests
#
# Currently Linux only, the macOS client
# is built using an Xcode project instead.
#
if LINUX_HOST if LINUX_HOST
lib_LIBRARIES += src/client/linux/libbreakpad_client.a lib_LIBRARIES += src/client/linux/libbreakpad_client.a
pkgconfig_DATA += breakpad-client.pc pkgconfig_DATA += breakpad-client.pc
src_client_linux_libbreakpad_client_a_SOURCES = \ check_PROGRAMS += \
src/client/linux/crash_generation/crash_generation_client.cc \ src/client/linux/linux_client_unittest \
src/client/linux/crash_generation/crash_generation_server.cc \ src/common/linux/google_crashdump_uploader_test
src/client/linux/dump_writer_common/thread_info.cc \
src/client/linux/dump_writer_common/ucontext_reader.cc \ EXTRA_PROGRAMS += \
src/client/linux/handler/exception_handler.cc \ src/client/linux/linux_dumper_unittest_helper \
src/client/linux/handler/exception_handler.h \ src/client/linux/linux_client_unittest_shlib
src/client/linux/handler/minidump_descriptor.cc \
src/client/linux/handler/minidump_descriptor.h \ CLEANFILES += \
src/client/linux/log/log.cc \ src/client/linux/linux_dumper_unittest_helper \
src/client/linux/log/log.h \ src/client/linux/linux_client_unittest_shlib
src/client/linux/microdump_writer/microdump_writer.cc \
src/client/linux/microdump_writer/microdump_writer.h \
src/client/linux/minidump_writer/linux_core_dumper.cc \
src/client/linux/minidump_writer/linux_dumper.cc \
src/client/linux/minidump_writer/linux_ptrace_dumper.cc \
src/client/linux/minidump_writer/minidump_writer.cc \
src/client/linux/minidump_writer/pe_file.cc \
src/client/minidump_file_writer-inl.h \
src/client/minidump_file_writer.cc \
src/client/minidump_file_writer.h \
src/common/convert_UTF.cc \
src/common/convert_UTF.h \
src/common/md5.cc \
src/common/md5.h \
src/common/string_conversion.cc \
src/common/string_conversion.h \
src/common/linux/elf_core_dump.cc \
src/common/linux/elfutils.cc \
src/common/linux/elfutils.h \
src/common/linux/file_id.cc \
src/common/linux/file_id.h \
src/common/linux/guid_creator.cc \
src/common/linux/guid_creator.h \
src/common/linux/linux_libc_support.cc \
src/common/linux/memory_mapped_file.cc \
src/common/linux/safe_readlink.cc
if !HAVE_GETCONTEXT
src_client_linux_libbreakpad_client_a_SOURCES += \
src/common/linux/breakpad_getcontext.S
endif
endif LINUX_HOST endif LINUX_HOST
if !DISABLE_PROCESSOR
#
# Various Breakpad tools
# This includes symbol dumpers and uploaders
#
if !DISABLE_TOOLS
if LINUX_HOST
bin_PROGRAMS += \
src/tools/linux/core2md/core2md \
src/tools/linux/pid2md/pid2md \
src/tools/linux/dump_syms/dump_syms \
src/tools/linux/md2core/minidump-2-core \
src/tools/linux/symupload/minidump_upload \
src/tools/linux/symupload/sym_upload
if X86_HOST
bin_PROGRAMS += \
src/tools/mac/dump_syms/dump_syms_mac
endif
if HAVE_MEMFD_CREATE
libexec_PROGRAMS += \
src/tools/linux/core_handler/core_handler
endif
check_PROGRAMS += \
src/common/dumper_unittest \
src/tools/linux/md2core/minidump_2_core_unittest
if X86_HOST
check_PROGRAMS += \
src/common/mac/macho_reader_unittest
endif
endif LINUX_HOST
endif !DISABLE_TOOLS
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
## Non-installables
noinst_SCRIPTS += $(check_SCRIPTS)
## Target definitions
# All targets that were defined above should now be
# declared below. This should be done unconditionally
# so DO NOT wrap them in conditions!
# Execept for conditionally adding a specific file or
# flag that should only be added for a specific arch,
# system, etc.
src_common_safe_math_unittest_SOURCES = \
src/common/safe_math.h \
src/common/safe_math_unittest.cc
src_common_safe_math_unittest_CPPFLAGS = \
$(AM_CPPFLAGS) $(TEST_CFLAGS)
src_common_safe_math_unittest_LDADD = \
$(TEST_LIBS) \
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
# Breakpad processor library
src_libbreakpad_a_SOURCES = \ src_libbreakpad_a_SOURCES = \
src/google_breakpad/common/breakpad_types.h \ src/google_breakpad/common/breakpad_types.h \
src/google_breakpad/common/minidump_format.h \ src/google_breakpad/common/minidump_format.h \
@ -321,6 +450,7 @@ src_libbreakpad_a_SOURCES = \
src/processor/tokenize.cc \ src/processor/tokenize.cc \
src/processor/tokenize.h src/processor/tokenize.h
# libdisasm 3rd party library
src_third_party_libdisasm_libdisasm_a_SOURCES = \ src_third_party_libdisasm_libdisasm_a_SOURCES = \
src/third_party/libdisasm/ia32_implicit.c \ src/third_party/libdisasm/ia32_implicit.c \
src/third_party/libdisasm/ia32_implicit.h \ src/third_party/libdisasm/ia32_implicit.h \
@ -349,134 +479,51 @@ src_third_party_libdisasm_libdisasm_a_SOURCES = \
src/third_party/libdisasm/x86_operand_list.c \ src/third_party/libdisasm/x86_operand_list.c \
src/third_party/libdisasm/x86_operand_list.h src/third_party/libdisasm/x86_operand_list.h
## Programs # Breakpad client
bin_PROGRAMS += \ src_client_linux_libbreakpad_client_a_SOURCES = \
src/processor/microdump_stackwalk \ src/client/linux/crash_generation/crash_generation_client.cc \
src/processor/minidump_dump \ src/client/linux/crash_generation/crash_generation_server.cc \
src/processor/minidump_stackwalk src/client/linux/dump_writer_common/thread_info.cc \
endif !DISABLE_PROCESSOR src/client/linux/dump_writer_common/ucontext_reader.cc \
src/client/linux/handler/exception_handler.cc \
if LINUX_HOST src/client/linux/handler/exception_handler.h \
EXTRA_PROGRAMS += \ src/client/linux/handler/minidump_descriptor.cc \
src/client/linux/linux_dumper_unittest_helper src/client/linux/handler/minidump_descriptor.h \
CLEANFILES += \ src/client/linux/log/log.cc \
src/client/linux/linux_dumper_unittest_helper src/client/linux/log/log.h \
src/client/linux/microdump_writer/microdump_writer.cc \
if !DISABLE_TOOLS src/client/linux/microdump_writer/microdump_writer.h \
bin_PROGRAMS += \ src/client/linux/minidump_writer/linux_core_dumper.cc \
src/tools/linux/core2md/core2md \ src/client/linux/minidump_writer/linux_dumper.cc \
src/tools/linux/pid2md/pid2md \ src/client/linux/minidump_writer/linux_ptrace_dumper.cc \
src/tools/linux/dump_syms/dump_syms \ src/client/linux/minidump_writer/minidump_writer.cc \
src/tools/linux/md2core/minidump-2-core \ src/client/linux/minidump_writer/pe_file.cc \
src/tools/linux/symupload/minidump_upload \ src/client/minidump_file_writer-inl.h \
src/tools/linux/symupload/sym_upload src/client/minidump_file_writer.cc \
if X86_HOST src/client/minidump_file_writer.h \
bin_PROGRAMS += \ src/common/convert_UTF.cc \
src/tools/mac/dump_syms/dump_syms_mac src/common/convert_UTF.h \
endif src/common/md5.cc \
if HAVE_MEMFD_CREATE src/common/md5.h \
libexec_PROGRAMS += \ src/common/string_conversion.cc \
src/tools/linux/core_handler/core_handler src/common/string_conversion.h \
endif src/common/linux/elf_core_dump.cc \
endif src/common/linux/elfutils.cc \
endif LINUX_HOST src/common/linux/elfutils.h \
src/common/linux/file_id.cc \
src/common/linux/file_id.h \
## Tests src/common/linux/guid_creator.cc \
if !DISABLE_PROCESSOR src/common/linux/guid_creator.h \
check_PROGRAMS += \ src/common/linux/linux_libc_support.cc \
src/common/test_assembler_unittest \ src/common/linux/memory_mapped_file.cc \
src/common/dwarf/dwarf2reader_lineinfo_unittest \ src/common/linux/safe_readlink.cc
src/common/dwarf/dwarf2reader_splitfunctions_unittest \ if !HAVE_GETCONTEXT
src/processor/address_map_unittest \ src_client_linux_libbreakpad_client_a_SOURCES += \
src/processor/basic_source_line_resolver_unittest \ src/common/linux/breakpad_getcontext.S
src/processor/cfi_frame_info_unittest \
src/processor/contained_range_map_unittest \
src/processor/disassembler_objdump_unittest \
src/processor/disassembler_x86_unittest \
src/processor/exploitability_unittest \
src/processor/fast_source_line_resolver_unittest \
src/processor/map_serializers_unittest \
src/processor/microdump_processor_unittest \
src/processor/minidump_processor_unittest \
src/processor/minidump_unittest \
src/processor/static_address_map_unittest \
src/processor/static_contained_range_map_unittest \
src/processor/static_map_unittest \
src/processor/static_range_map_unittest \
src/processor/pathname_stripper_unittest \
src/processor/postfix_evaluator_unittest \
src/processor/proc_maps_linux_unittest \
src/processor/range_map_truncate_lower_unittest \
src/processor/range_map_truncate_upper_unittest \
src/processor/range_map_unittest \
src/processor/stackwalker_amd64_unittest \
src/processor/stackwalker_arm_unittest \
src/processor/stackwalker_arm64_unittest \
src/processor/stackwalker_address_list_unittest \
src/processor/stackwalker_mips_unittest \
src/processor/stackwalker_mips64_unittest \
src/processor/stackwalker_riscv_unittest \
src/processor/stackwalker_riscv64_unittest \
src/processor/stackwalker_x86_unittest \
src/processor/synth_minidump_unittest
endif endif
if LINUX_HOST # Client tests
EXTRA_PROGRAMS += \
src/client/linux/linux_client_unittest_shlib
CLEANFILES += \
src/client/linux/linux_client_unittest_shlib
check_PROGRAMS += \
src/client/linux/linux_client_unittest \
src/common/linux/google_crashdump_uploader_test
if !DISABLE_TOOLS
check_PROGRAMS += \
src/common/dumper_unittest \
src/tools/linux/md2core/minidump_2_core_unittest
if X86_HOST
check_PROGRAMS += \
src/common/mac/macho_reader_unittest
endif
endif
endif LINUX_HOST
if !DISABLE_PROCESSOR
if SELFTEST
check_PROGRAMS += \
src/processor/stackwalker_selftest
endif SELFTEST
endif !DISABLE_PROCESSOR
if !DISABLE_PROCESSOR
check_SCRIPTS = \
src/processor/microdump_stackwalk_test \
src/processor/microdump_stackwalk_machine_readable_test \
src/processor/minidump_dump_test \
src/processor/minidump_stackwalk_test \
src/processor/minidump_stackwalk_machine_readable_test
endif
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
if ANDROID_HOST
# Since Autotools 1.2, tests are run through a special "test driver" script.
# Unfortunately, it's not possible anymore to specify an alternative shell to
# run them on connected devices, so use a slightly modified version of the
# driver for Android.
LOG_DRIVER = $(top_srcdir)/android/test-driver
else
# The default Autotools test driver script.
if TESTS_AS_ROOT
LOG_DRIVER = $(top_srcdir)/autotools/root-test-driver $(top_srcdir)/autotools/test-driver
else
LOG_DRIVER = $(top_srcdir)/autotools/test-driver
endif !TESTS_AS_ROOT
endif !ANDROID_HOST
if LINUX_HOST
src_client_linux_linux_dumper_unittest_helper_SOURCES = \ src_client_linux_linux_dumper_unittest_helper_SOURCES = \
src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
src_client_linux_linux_dumper_unittest_helper_LDFLAGS=$(PTHREAD_CFLAGS) src_client_linux_linux_dumper_unittest_helper_LDFLAGS=$(PTHREAD_CFLAGS)
@ -584,7 +631,8 @@ src_client_linux_linux_client_unittest_LDADD = \
src_client_linux_linux_client_unittest_DEPENDENCIES = \ src_client_linux_linux_client_unittest_DEPENDENCIES = \
src/client/linux/linux_client_unittest_shlib src/client/linux/linux_client_unittest_shlib
if !DISABLE_TOOLS # Tools
src_tools_linux_core2md_core2md_SOURCES = \ src_tools_linux_core2md_core2md_SOURCES = \
src/tools/linux/core2md/core2md.cc src/tools/linux/core2md/core2md.cc
@ -592,14 +640,12 @@ src_tools_linux_core2md_core2md_LDADD = \
src/client/linux/libbreakpad_client.a \ src/client/linux/libbreakpad_client.a \
src/common/path_helper.o src/common/path_helper.o
if HAVE_MEMFD_CREATE
src_tools_linux_core_handler_core_handler_SOURCES = \ src_tools_linux_core_handler_core_handler_SOURCES = \
src/tools/linux/core_handler/core_handler.cc src/tools/linux/core_handler/core_handler.cc
src_tools_linux_core_handler_core_handler_LDADD = \ src_tools_linux_core_handler_core_handler_LDADD = \
src/client/linux/libbreakpad_client.a \ src/client/linux/libbreakpad_client.a \
src/common/path_helper.o src/common/path_helper.o
endif
src_tools_linux_pid2md_pid2md_SOURCES = \ src_tools_linux_pid2md_pid2md_SOURCES = \
src/tools/linux/pid2md/pid2md.cc src/tools/linux/pid2md/pid2md.cc
@ -700,15 +746,6 @@ src_tools_mac_dump_syms_dump_syms_mac_CXXFLAGS= \
src_tools_mac_dump_syms_dump_syms_mac_LDADD= \ src_tools_mac_dump_syms_dump_syms_mac_LDADD= \
$(RUSTC_DEMANGLE_LIBS) $(RUSTC_DEMANGLE_LIBS)
src_common_safe_math_unittest_SOURCES = \
src/common/safe_math.h \
src/common/safe_math_unittest.cc
src_common_safe_math_unittest_CPPFLAGS = \
$(AM_CPPFLAGS) $(TEST_CFLAGS)
src_common_safe_math_unittest_LDADD = \
$(TEST_LIBS) \
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
src_common_dumper_unittest_SOURCES = \ src_common_dumper_unittest_SOURCES = \
src/common/byte_cursor_unittest.cc \ src/common/byte_cursor_unittest.cc \
src/common/convert_UTF.cc \ src/common/convert_UTF.cc \
@ -809,7 +846,6 @@ src_common_mac_macho_reader_unittest_CPPFLAGS = \
src_common_mac_macho_reader_unittest_LDADD = \ src_common_mac_macho_reader_unittest_LDADD = \
$(TEST_LIBS) \ $(TEST_LIBS) \
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
endif
src_common_linux_google_crashdump_uploader_test_SOURCES = \ src_common_linux_google_crashdump_uploader_test_SOURCES = \
src/common/linux/google_crashdump_uploader.cc \ src/common/linux/google_crashdump_uploader.cc \
@ -830,9 +866,6 @@ src_tools_linux_md2core_minidump_2_core_unittest_LDADD = \
$(TEST_LIBS) \ $(TEST_LIBS) \
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
endif LINUX_HOST
if !DISABLE_PROCESSOR
src_processor_address_map_unittest_SOURCES = \ src_processor_address_map_unittest_SOURCES = \
src/processor/address_map_unittest.cc src/processor/address_map_unittest.cc
src_processor_address_map_unittest_LDADD = \ src_processor_address_map_unittest_LDADD = \
@ -1324,10 +1357,6 @@ src_common_dwarf_dwarf2reader_splitfunctions_unittest_LDADD = \
$(TEST_LIBS) \ $(TEST_LIBS) \
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
## Non-installables
noinst_PROGRAMS =
noinst_SCRIPTS = $(check_SCRIPTS)
src_processor_minidump_dump_SOURCES = \ src_processor_minidump_dump_SOURCES = \
src/processor/minidump_dump.cc src/processor/minidump_dump.cc
src_processor_minidump_dump_LDADD = \ src_processor_minidump_dump_LDADD = \
@ -1421,8 +1450,6 @@ src_processor_minidump_stackwalk_LDADD = \
src/processor/tokenize.o \ src/processor/tokenize.o \
src/third_party/libdisasm/libdisasm.a src/third_party/libdisasm/libdisasm.a
endif !DISABLE_PROCESSOR
## Additional files to be included in a source distribution ## Additional files to be included in a source distribution
## ##
## find src/client src/common src/processor/testdata src/tools \ ## find src/client src/common src/processor/testdata src/tools \

4441
Makefile.in
View file

File diff suppressed because it is too large Load diff