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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | Makefile.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ## Process this file with automake to produce Makefile.in 1 ## Process this file with automake to produce Makefile.in
2 2
3 # Copyright (c) 2011, Google Inc. 3 # Copyright (c) 2011, Google Inc.
4 # All rights reserved. 4 # All rights reserved.
5 # 5 #
6 # Redistribution and use in source and binary forms, with or without 6 # Redistribution and use in source and binary forms, with or without
7 # modification, are permitted provided that the following conditions are 7 # modification, are permitted provided that the following conditions are
8 # met: 8 # met:
9 # 9 #
10 # * Redistributions of source code must retain the above copyright 10 # * Redistributions of source code must retain the above copyright
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 includep_HEADERS = $(top_srcdir)/src/processor/*.h 109 includep_HEADERS = $(top_srcdir)/src/processor/*.h
110 110
111 ## pkgconfig files 111 ## pkgconfig files
112 pkgconfigdir = $(libdir)/pkgconfig 112 pkgconfigdir = $(libdir)/pkgconfig
113 pkgconfig_DATA = 113 pkgconfig_DATA =
114 114
115 ## Common test logic 115 ## Common test logic
116 if SYSTEM_TEST_LIBS 116 if SYSTEM_TEST_LIBS
117 TEST_CFLAGS = $(GTEST_CFLAGS) $(GMOCK_CFLAGS) 117 TEST_CFLAGS = $(GTEST_CFLAGS) $(GMOCK_CFLAGS)
118 TEST_LIBS = $(GTEST_LIBS) -lgtest_main $(GMOCK_LIBS) 118 TEST_LIBS = $(GTEST_LIBS) -lgtest_main $(GMOCK_LIBS)
119 TEST_DEPS =
119 else 120 else
120 TEST_CFLAGS = \ 121 TEST_CFLAGS = \
121 -I$(top_srcdir)/src/testing/include \ 122 -I$(top_srcdir)/src/testing/include \
122 -I$(top_srcdir)/src/testing/gtest/include \ 123 -I$(top_srcdir)/src/testing/gtest/include \
123 -I$(top_srcdir)/src/testing/gtest \ 124 -I$(top_srcdir)/src/testing/gtest \
124 -I$(top_srcdir)/src/testing 125 -I$(top_srcdir)/src/testing
125 TEST_LIBS = src/testing/libtesting.a 126 TEST_LIBS = src/testing/libtesting.a
127 TEST_DEPS = $(TEST_LIBS)
126 endif 128 endif
127 129
128 ## Libraries 130 ## Libraries
129 check_LIBRARIES = 131 check_LIBRARIES =
130 noinst_LIBRARIES = 132 noinst_LIBRARIES =
131 lib_LIBRARIES = 133 lib_LIBRARIES =
132 bin_PROGRAMS = 134 bin_PROGRAMS =
133 check_PROGRAMS = 135 check_PROGRAMS =
134 EXTRA_PROGRAMS = 136 EXTRA_PROGRAMS =
135 CLEANFILES = 137 CLEANFILES =
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 if ANDROID_HOST 519 if ANDROID_HOST
518 src_client_linux_linux_client_unittest_shlib_SOURCES += \ 520 src_client_linux_linux_client_unittest_shlib_SOURCES += \
519 src/common/android/breakpad_getcontext_unittest.cc 521 src/common/android/breakpad_getcontext_unittest.cc
520 src_client_linux_linux_client_unittest_shlib_LDFLAGS += \ 522 src_client_linux_linux_client_unittest_shlib_LDFLAGS += \
521 -llog -lm 523 -llog -lm
522 endif 524 endif
523 525
524 src_client_linux_linux_client_unittest_shlib_DEPENDENCIES = \ 526 src_client_linux_linux_client_unittest_shlib_DEPENDENCIES = \
525 src/client/linux/linux_dumper_unittest_helper \ 527 src/client/linux/linux_dumper_unittest_helper \
526 src/client/linux/libbreakpad_client.a \ 528 src/client/linux/libbreakpad_client.a \
529 $(TEST_DEPS) \
527 src/libbreakpad.a 530 src/libbreakpad.a
528 531
529 src_client_linux_linux_client_unittest_SOURCES = 532 src_client_linux_linux_client_unittest_SOURCES =
530 # The extra-long build id is for a test in minidump_writer_unittest.cc. 533 # The extra-long build id is for a test in minidump_writer_unittest.cc.
531 src_client_linux_linux_client_unittest_LDFLAGS = \ 534 src_client_linux_linux_client_unittest_LDFLAGS = \
532 -Wl,-rpath,'$$ORIGIN' \ 535 -Wl,-rpath,'$$ORIGIN' \
533 -Wl,--build-id=0x000102030405060708090a0b0c0d0e0f101112131415161718191a1 b1c1d1e1f 536 -Wl,--build-id=0x000102030405060708090a0b0c0d0e0f101112131415161718191a1 b1c1d1e1f
534 if ANDROID_HOST 537 if ANDROID_HOST
535 src_client_linux_linux_client_unittest_LDFLAGS += \ 538 src_client_linux_linux_client_unittest_LDFLAGS += \
536 -llog 539 -llog
(...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
1332 src/tools/windows/dump_syms/dump_syms.vcproj \ 1335 src/tools/windows/dump_syms/dump_syms.vcproj \
1333 src/tools/windows/dump_syms/run_regtest.sh \ 1336 src/tools/windows/dump_syms/run_regtest.sh \
1334 src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc \ 1337 src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc \
1335 src/tools/windows/dump_syms/testdata/dump_syms_regtest.pdb \ 1338 src/tools/windows/dump_syms/testdata/dump_syms_regtest.pdb \
1336 src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym \ 1339 src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym \
1337 src/tools/windows/symupload/symupload.cc \ 1340 src/tools/windows/symupload/symupload.cc \
1338 src/tools/windows/symupload/symupload.vcproj 1341 src/tools/windows/symupload/symupload.vcproj
1339 1342
1340 mostlyclean-local: 1343 mostlyclean-local:
1341 -find src -name '*.dwo' -exec rm -f {} + 1344 -find src -name '*.dwo' -exec rm -f {} +
OLDNEW
« 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