diff options
| author | Jacob Marble <jacobmarble@google.com> | 2016-01-20 15:58:33 -0800 |
|---|---|---|
| committer | Jacob Marble <jacobmarble@google.com> | 2016-01-21 01:50:09 +0000 |
| commit | 2da7e94bf6ba1e6a1363c38320eac6a3f58ed678 (patch) | |
| tree | 44ce50002e609af661751f97169d3b9534b8474f /examples | |
| parent | 674f0eb973b8ebf08f9abcb45b2271dc510aa2cf (diff) | |
| download | libweave-2da7e94bf6ba1e6a1363c38320eac6a3f58ed678.tar.gz | |
Change proxied Makefile dependencies to .h.
The third_party dependencies gtest/gmock and libevent are less
confusing when they are proxied by their header files. The compiled
libraries are included implicitly (like the header files before).
Change-Id: Ieb0eae473adfb9811214a40df8334c541e6ff9a3
BUG: 26564098
Reviewed-on: https://weave-review.googlesource.com/2237
Reviewed-by: Vitaly Buka <vitalybuka@google.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/examples/examples.mk b/examples/examples.mk index a25194c..06266a3 100644 --- a/examples/examples.mk +++ b/examples/examples.mk @@ -7,8 +7,7 @@ examples_provider_obj_files := $(EXAMPLES_PROVIDER_SRC_FILES:%.cc=out/$(BUILD_MODE)/%.o) -# We don't need libevent.a, but the headers files in third_party/include. -$(examples_provider_obj_files) : out/$(BUILD_MODE)/%.o : %.cc third_party/lib/libevent.a +$(examples_provider_obj_files) : out/$(BUILD_MODE)/%.o : %.cc third_party/include/event2/event.h mkdir -p $(dir $@) $(CXX) $(DEFS_$(BUILD_MODE)) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $< @@ -16,8 +15,7 @@ out/$(BUILD_MODE)/examples_provider.a : $(examples_provider_obj_files) rm -f $@ $(AR) crsT $@ $^ -# We don't need libevent.a, but the headers files in third_party/include. -out/$(BUILD_MODE)/examples/daemon/%.o : examples/daemon/%.cc third_party/lib/libevent.a +out/$(BUILD_MODE)/examples/daemon/%.o : examples/daemon/%.cc third_party/include/event2/event.h mkdir -p $(dir $@) $(CXX) $(DEFS_$(BUILD_MODE)) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $< |