diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-09 12:40:32 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-09 12:40:32 -0800 |
| commit | 4a67be42a0298c0a726f92d8ca200ed2b5811dd3 (patch) | |
| tree | c5215c929b69163540f5aa1b71ec2b436c64f59c /templates/Makefile.template | |
| parent | 08946be5f4b98a53b5df81c5f3c2df6a49b0b810 (diff) | |
Further cleanup
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 6e74c6b953..218f492837 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -558,7 +558,7 @@ PC_LIB = -lgrpc GRPC_PC_FILE := $(PC_TEMPLATE) - # gprc_unsecure .pc file + # grpc_unsecure .pc file PC_NAME = gRPC unsecure PC_DESCRIPTION = high performance general RPC framework without SSL PC_CFLAGS = @@ -567,7 +567,7 @@ PC_LIB = -lgrpc GRPC_UNSECURE_PC_FILE := $(PC_TEMPLATE) - # gprc_zookeeper .pc file + # grpc_zookeeper .pc file PC_NAME = gRPC zookeeper PC_DESCRIPTION = gRPC's zookeeper plugin PC_CFLAGS = @@ -1522,14 +1522,12 @@ mingw_lib_deps += ' $(PROTOBUF_DEP)' if lib.get('deps_linkage', None) == 'static': for dep in lib.get('deps', []): - if dep == 'gpr': continue lib_archive = '$(LIBDIR)/$(CONFIG)/lib' + dep + '.a' common = common + ' ' + lib_archive lib_deps = lib_deps + ' ' + lib_archive mingw_lib_deps = mingw_lib_deps + ' ' + lib_archive else: for dep in lib.get('deps', []): - if dep == 'gpr': continue libs = libs + ' -l' + dep lib_deps = lib_deps + ' $(LIBDIR)/$(CONFIG)/lib' + dep + '.$(SHARED_EXT)' mingw_libs = mingw_libs + ' -l' + dep + '-imp' @@ -1539,8 +1537,6 @@ if security == True: common = common + ' $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE)' common = common + ' $(ZLIB_MERGE_LIBS)' - lib_deps += ' $(LIBDIR)/$(CONFIG)/libgpr.a' - common += ' $(LIBDIR)/$(CONFIG)/libgpr.a' if security in [True, 'check']: for src in lib.src: |