diff options
| author | Ted Mielczarek <ted@mielczarek.org> | 2016-04-12 14:55:18 -0400 |
|---|---|---|
| committer | Ted Mielczarek <ted@mielczarek.org> | 2016-04-12 14:55:18 -0400 |
| commit | 205b5ac6edd63988309290ac15e69775f3b3f564 (patch) | |
| tree | 447163ae77d91c77a339cd4738e2307168373ee2 /Makefile.am | |
| parent | tweak IGNORE_RET behavior a bit (diff) | |
| download | breakpad-205b5ac6edd63988309290ac15e69775f3b3f564.tar.xz | |
Fix a dependency issue in automake
Doing a `make -jN check` from a fresh build breaks (and has probably been
broken for a while). linux_client_unittest_shlib is missing $(TEST_LIBS)
from its _DEPENDENCIES. The automake manual says if _DEPENDENCIES are not
specified they'll be computed from _LDADD, but we are specifying it and just
leaving out $(TEST_LIBS).
R=vapier@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1870733005 .
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 8af3830e..21c2bbaa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,6 +116,7 @@ pkgconfig_DATA = if SYSTEM_TEST_LIBS TEST_CFLAGS = $(GTEST_CFLAGS) $(GMOCK_CFLAGS) TEST_LIBS = $(GTEST_LIBS) -lgtest_main $(GMOCK_LIBS) +TEST_DEPS = else TEST_CFLAGS = \ -I$(top_srcdir)/src/testing/include \ @@ -123,6 +124,7 @@ TEST_CFLAGS = \ -I$(top_srcdir)/src/testing/gtest \ -I$(top_srcdir)/src/testing TEST_LIBS = src/testing/libtesting.a +TEST_DEPS = $(TEST_LIBS) endif ## Libraries @@ -524,6 +526,7 @@ endif src_client_linux_linux_client_unittest_shlib_DEPENDENCIES = \ src/client/linux/linux_dumper_unittest_helper \ src/client/linux/libbreakpad_client.a \ + $(TEST_DEPS) \ src/libbreakpad.a src_client_linux_linux_client_unittest_SOURCES = |