Merge pull request FDio#12 from hagbard5235/reorg

artem-belov · Apr 20, 2018 · 64445b6 · 64445b6
2 parents d1591ba + 7ca016b
commit 64445b6
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 71 deletions.
diff --git a/Makefile b/Makefile
@@ -1,11 +1,11 @@
 GOPATH?=~/go
 GOBIN?=${GOPATH}/bin
 
-PROTOS = $(wildcard networkservice/*.proto)
+PROTOS = $(wildcard pkg/*/apis/**/*.proto)
 PBS = $(PROTOS:%.proto=%.pb)
 
 all: protos
 protos: ${PBS}
 
 %.pb: %.proto
-	PATH=~/bin:$${PATH}:$(GOBIN) protoc -I networkservice $*.proto --go_out=plugins=grpc:go
+	PATH=~/bin:$${PATH}:$(GOBIN) protoc -I $(dir $*.proto) $*.proto --go_out=plugins=grpc:$(dir $*.proto)
diff --git a/go/networkservice.pb.go → pkg/nsm/apis/pod2nsm/api.pb.go b/go/networkservice.pb.go → pkg/nsm/apis/pod2nsm/api.pb.go
diff --git a/networkservice/networkservice.proto → pkg/nsm/apis/pod2nsm/api.proto b/networkservice/networkservice.proto → pkg/nsm/apis/pod2nsm/api.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package networkservice;
+package pod2nsm;
 
 // NETWORK SERVICES