From 9219708b1392769bb760eb96aefa39aefa03b282 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Wed, 21 Apr 2021 11:12:53 +0200 Subject: [PATCH] build: fix protobuf out-of-tree build Otherwise it aborts with "File does not reside within any path specified using --proto_path (or -I)" Signed-off-by: David Lamparter --- grpc/subdir.am | 6 +++--- qpb/subdir.am | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/grpc/subdir.am b/grpc/subdir.am index 045848aee7..d9ec365ba8 100644 --- a/grpc/subdir.am +++ b/grpc/subdir.am @@ -23,12 +23,12 @@ EXTRA_DIST += grpc/frr-northbound.proto AM_V_PROTOC = $(am__v_PROTOC_$(V)) am__v_PROTOC_ = $(am__v_PROTOC_$(AM_DEFAULT_VERBOSITY)) -am__v_PROTOC_0 = @echo " PROTOC" $@; +am__v_PROTOC_0 = @echo " PROTOC " $@; am__v_PROTOC_1 = SUFFIXES += .pb.h .pb.cc .grpc.pb.cc .proto.pb.cc: - $(AM_V_PROTOC)$(PROTOC) -I$(top_srcdir) --cpp_out=$(top_srcdir) $(top_srcdir)/$^ + $(AM_V_PROTOC)$(PROTOC) -I$(top_srcdir) --cpp_out=$(top_builddir) $^ .proto.grpc.pb.cc: - $(AM_V_PROTOC)$(PROTOC) -I$(top_srcdir) --grpc_out=$(top_srcdir) --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` $(top_srcdir)/$^ + $(AM_V_PROTOC)$(PROTOC) -I$(top_srcdir) --grpc_out=$(top_builddir) --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` $^ diff --git a/qpb/subdir.am b/qpb/subdir.am index 80f8f3aca9..4f826355d9 100644 --- a/qpb/subdir.am +++ b/qpb/subdir.am @@ -35,7 +35,7 @@ if HAVE_PROTOBUF # Rules .proto.pb.h: - $(PROTOC) -I$(top_srcdir) --cpp_out=$(top_srcdir) $(top_srcdir)/$^ + $(PROTOC) -I$(top_srcdir) --cpp_out=$(top_builddir) $^ AM_V_PROTOC_C = $(am__v_PROTOC_C_$(V)) am__v_PROTOC_C_ = $(am__v_PROTOC_C_$(AM_DEFAULT_VERBOSITY)) @@ -43,7 +43,7 @@ am__v_PROTOC_C_0 = @echo " PROTOC_C" $@; am__v_PROTOC_C_1 = .proto.pb-c.c: - $(AM_V_PROTOC_C)$(PROTOC_C) -I$(top_srcdir) --c_out=$(top_srcdir) $(top_srcdir)/$^ + $(AM_V_PROTOC_C)$(PROTOC_C) -I$(top_srcdir) --c_out=$(top_builddir) $^ .pb-c.c.pb-c.h: @/bin/true -- 2.39.5