diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-01-23 17:09:51 -0800 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-01-23 17:09:51 -0800 |
| commit | 6694bb079a74c0636acd6c107d0c3b9c32317338 (patch) | |
| tree | 4d86f6d2904bd020463fbeb4ecd3b65135544ace /templates/Makefile.template | |
| parent | d27945e4994151c58ece47818e1ec7822e72b340 (diff) | |
Migrate to the new c-ares dir
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 917c69ab34..a3d6eeebb5 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -408,7 +408,7 @@ SHARED_VERSION_CPP = -${settings.cpp_version.major} SHARED_VERSION_CSHARP = -${settings.csharp_version.major} else ifeq ($(SYSTEM),Darwin) - EXECUTABLE_SUFFIX = + EXECUTABLE_SUFFIX = SHARED_EXT_CORE = dylib SHARED_EXT_CPP = dylib SHARED_EXT_CSHARP = dylib @@ -417,7 +417,7 @@ SHARED_VERSION_CPP = SHARED_VERSION_CSHARP = else - EXECUTABLE_SUFFIX = + EXECUTABLE_SUFFIX = SHARED_EXT_CORE = so.$(CORE_VERSION) SHARED_EXT_CPP = so.$(CPP_VERSION) SHARED_EXT_CSHARP = so.$(CSHARP_VERSION) @@ -561,7 +561,7 @@ HAS_EMBEDDED_PROTOBUF = true endif - ifeq ($(wildcard third_party/c-ares/ares.h),) + ifeq ($(wildcard third_party/cares/cares/ares.h),) HAS_EMBEDDED_CARES = false else HAS_EMBEDDED_CARES = true @@ -616,7 +616,7 @@ CARES_DEP = $(LIBDIR)/$(CONFIG)/libares.a CARES_MERGE_OBJS = $(LIBARES_OBJS) CARES_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libares.a - CPPFLAGS := -Ithird_party/c-ares -Isrc/c-ares $(CPPFLAGS) + CPPFLAGS := -Ithird_party/cares -Ithird_party/cares/cares $(CPPFLAGS) LDFLAGS := -L$(LIBDIR)/$(CONFIG)/c-ares $(LDFLAGS) else ifeq ($(HAS_PKG_CONFIG),true) |