From dbcd02efb5c104a61abb9b6784c0c0619c417ae5 Mon Sep 17 00:00:00 2001 From: dsavvinov Date: Fri, 12 Aug 2016 17:20:38 +0300 Subject: [PATCH] Protobuf: rewrited Makefile for protoc* according to new file structure of test project --- .../google/src/google/protobuf/compiler/kotlin/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/Makefile b/proto/compiler/google/src/google/protobuf/compiler/kotlin/Makefile index 60865a036c7..6a1fcdb6340 100644 --- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/Makefile +++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/Makefile @@ -7,8 +7,8 @@ SRCDIR = src BINDIR = bin TESTDIR = test KTPROJECT = protoc-test-project -KTOUT = $(KTPROJECT)/src -JAVAOUT = $(KTPROJECT)/src/java +KTOUT = $(KTPROJECT)/src/kotlin +JAVAOUT = $(KTPROJECT)/src OBJECTS = $(patsubst $(SRCDIR)/%.cc,$(BINDIR)/%.o,$(wildcard $(SRCDIR)/*.cc)) KTARTIFACTS = $(patsubst $(TESTDIR)/%.proto,$(KTOUT)/%.kt,$(wildcard $(TESTDIR)/*.proto))