diff options
| author | Mike Frysinger <vapier@google.com> | 2016-04-06 16:44:18 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2016-04-06 20:56:26 +0000 |
| commit | eae016cab6044d22b150afdf6f3f3cb5cc1c79fd (patch) | |
| tree | 4438d6047ceeb857f9126cc1f096ee88d670c268 /third_party | |
| parent | fcffce31f3c6f7594b0790f92d4e042aa489d42f (diff) | |
| download | libweave-eae016cab6044d22b150afdf6f3f3cb5cc1c79fd.tar.gz | |
clean up example/test_device clashes
Move the duplicated libevhtp logic to third_party.mk so that multiple
targets can rely on it being set up in the same way.
Delete the duplicate example object rules from tests_schema.mk. We
already include examples.mk before tests_schema.mk, so we know those
rules are defined for us. We just need to depend on the output libs.
Finally namespace the daemon variables in examples & tests_schema so
they don't stop on each other in weird ways.
Change-Id: I28fa152d8c8a30c84f7095e335e31a52889b5682
Reviewed-on: https://weave-review.googlesource.com/3152
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/third_party.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/third_party/third_party.mk b/third_party/third_party.mk index 18f9b98..e1da63c 100644 --- a/third_party/third_party.mk +++ b/third_party/third_party.mk @@ -94,3 +94,14 @@ $(third_party_libevhtp_lib) : $(third_party_libevhtp_header) clean-libevhtp : rm -rf $(third_party_libevhtp) + +# These settings are exported for other code to use as needed. +USE_INTERNAL_LIBEVHTP ?= 1 + +ifeq (1, $(USE_INTERNAL_LIBEVHTP)) +LIBEVHTP_INCLUDES = -Ithird_party/libevhtp -I$(dir $(third_party_libevhtp_header)) +LIBEVHTP_HEADERS = $(third_party_libevhtp_header) +else +LIBEVHTP_INCLUDES = +LIBEVHTP_HEADERS = +endif |