Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Unified Diff: Makefile.am

Issue 1870733005: Fix a dependency issue in automake (Closed) Base URL: https://chromium.googlesource.com/breakpad/breakpad.git@master
Patch Set: Add TEST_DEPS Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Makefile.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 8af3830e9ffae4a5d6a7a5a0f66a988f040141dc..21c2bbaa140f4bed660a94f511076e14a0dde8cf 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 =
« no previous file with comments | « no previous file | Makefile.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698