diff options
| author | Mike Frysinger <vapier@google.com> | 2016-03-17 04:14:27 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2016-03-17 19:02:12 +0000 |
| commit | d70a965a113d6abc28befa5b0c1b46f61f7bb1e6 (patch) | |
| tree | e1aafe6992401c94eb2280280bb94c262a19de78 /Makefile | |
| parent | 8bf475745726c1fd672eed2b34c52cf5bfad58e0 (diff) | |
| download | libweave-d70a965a113d6abc28befa5b0c1b46f61f7bb1e6.tar.gz | |
gtest/gmock: build checked out copy
Now that gtest/gmock are part of the manifest, build them directly
and store the results in out/.
BUG=b/27707648
TEST+`make` still works, as does the unittests
Change-Id: I8a8235b4bc0100731168a44c6553859a5d85bbe1
Reviewed-on: https://weave-review.googlesource.com/2952
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -16,6 +16,8 @@ INCLUDES := \ -Iinclude \ -Ithird_party/chromium \ -Ithird_party/include \ + -Ithird_party/googletest/googletest/include \ + -Ithird_party/googletest/googlemock/include \ -Ithird_party/libuweave \ -Ithird_party/modp_b64/modp_b64 @@ -90,7 +92,10 @@ out/$(BUILD_MODE)/libweave_common.a : $(weave_obj_files) $(third_party_chromium_ rm -f $@ $(AR) crsT $@ $^ -all : out/$(BUILD_MODE)/libweave.so all-examples out/$(BUILD_MODE)/libweave_exports_testrunner out/$(BUILD_MODE)/libweave_testrunner +all-libs : out/$(BUILD_MODE)/libweave.so +all-tests : out/$(BUILD_MODE)/libweave_exports_testrunner out/$(BUILD_MODE)/libweave_testrunner + +all : all-libs all-examples all-tests clean : rm -rf out |