diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-05-31 23:47:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 23:47:20 +0000 |
| commit | 24b97cc306d4834f865f9599b379e73e1b326ab8 (patch) | |
| tree | dd9041de1b74c6133fb3a07fcaa321de989b9668 /examples/examples.mk | |
| parent | 389403d79405277ec53c450eccf33a8174f74964 (diff) | |
| parent | d77dfa0b5a854a80a586b89f13f602ee5a523d06 (diff) | |
| download | libweave-24b97cc306d4834f865f9599b379e73e1b326ab8.tar.gz | |
Revert "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'" am: abfe7a063b
am: d77dfa0b5a
* commit 'd77dfa0b5a854a80a586b89f13f602ee5a523d06':
Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
Change-Id: I0045e9f0eca8cb5701451c028b486e90477fe059
Diffstat (limited to 'examples/examples.mk')
| -rw-r--r-- | examples/examples.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/examples/examples.mk b/examples/examples.mk index cb64e2b..555322c 100644 --- a/examples/examples.mk +++ b/examples/examples.mk @@ -21,7 +21,9 @@ EXAMPLES_DAEMON_SRC_FILES := \ examples/daemon/ledflasher/ledflasher.cc \ examples/daemon/light/light.cc \ examples/daemon/lock/lock.cc \ - examples/daemon/sample/sample.cc + examples/daemon/oven/oven.cc \ + examples/daemon/sample/sample.cc \ + examples/daemon/speaker/speaker.cc examples_daemon_obj_files := $(EXAMPLES_DAEMON_SRC_FILES:%.cc=out/$(BUILD_MODE)/%.o) @@ -60,10 +62,16 @@ out/$(BUILD_MODE)/weave_daemon_light : out/$(BUILD_MODE)/examples/daemon/light/l out/$(BUILD_MODE)/weave_daemon_lock : out/$(BUILD_MODE)/examples/daemon/lock/lock.o $(example_daemon_deps) $(CXX) -o $@ $^ $(CFLAGS) $(example_daemon_common_flags) +out/$(BUILD_MODE)/weave_daemon_oven : out/$(BUILD_MODE)/examples/daemon/oven/oven.o $(example_daemon_deps) + $(CXX) -o $@ $^ $(CFLAGS) $(example_daemon_common_flags) + out/$(BUILD_MODE)/weave_daemon_sample : out/$(BUILD_MODE)/examples/daemon/sample/sample.o $(example_daemon_deps) $(CXX) -o $@ $^ $(CFLAGS) $(example_daemon_common_flags) -all-examples : out/$(BUILD_MODE)/weave_daemon_ledflasher out/$(BUILD_MODE)/weave_daemon_light out/$(BUILD_MODE)/weave_daemon_lock out/$(BUILD_MODE)/weave_daemon_sample +out/$(BUILD_MODE)/weave_daemon_speaker : out/$(BUILD_MODE)/examples/daemon/speaker/speaker.o $(example_daemon_deps) + $(CXX) -o $@ $^ $(CFLAGS) $(example_daemon_common_flags) + +all-examples : out/$(BUILD_MODE)/weave_daemon_ledflasher out/$(BUILD_MODE)/weave_daemon_light out/$(BUILD_MODE)/weave_daemon_lock out/$(BUILD_MODE)/weave_daemon_oven out/$(BUILD_MODE)/weave_daemon_sample out/$(BUILD_MODE)/weave_daemon_speaker .PHONY : all-examples |