diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-04-13 18:02:34 -0700 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-04-13 18:02:34 -0700 |
| commit | f44112198f499ddd978c6a761102114b90e77527 (patch) | |
| tree | 27c28ae85f84f2f1eacd92dc8320338762af0ea3 /templates | |
| parent | 7b3b058b577171406fab81c93703c752286e8f5b (diff) | |
| parent | b0b518e367fb7865f63de6666013ea00f369e985 (diff) | |
Merge pull request #1272 from yang-g/interop
Further refactor interop_client and server to libraries
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 2cfbfa36ec..331141fb24 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1269,9 +1269,6 @@ $(BINDIR)/$(CONFIG)/${tgt.name}: $(${tgt.name.upper()}_OBJS)\ $(Q) mkdir -p `dirname $@` $(Q) $(LDXX) $(LDFLAGS) $(${tgt.name.upper()}_OBJS)\ % endif -% if tgt.build == 'test': - $(GTEST_LIB)\ -% endif % else: ## C-only targets specificities. $(E) "[LD] Linking $@" @@ -1298,6 +1295,9 @@ $(BINDIR)/$(CONFIG)/${tgt.name}: $(${tgt.name.upper()}_OBJS)\ % elif tgt.get('secure', 'check') == 'yes' or tgt.get('secure', 'check') == 'check': $(LDLIBS_SECURE)\ % endif +% if tgt.language == 'c++' and tgt.build == 'test': + $(GTEST_LIB)\ +% endif -o $(BINDIR)/$(CONFIG)/${tgt.name} % if tgt.build == 'protoc' or tgt.language == 'c++': |