From c225a738fc6ce90d167c98a131f999a8f629a0e1 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Tue, 20 Nov 2018 12:19:30 +0100 Subject: move nanopb generated files to nanopbbench.pb.* --- src/app/prototest/Makefile.inc | 9 +++++---- src/app/prototest/main.cc | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/prototest/Makefile.inc b/src/app/prototest/Makefile.inc index 00c576c..a3477e6 100644 --- a/src/app/prototest/Makefile.inc +++ b/src/app/prototest/Makefile.inc @@ -34,7 +34,7 @@ endif ifeq (${prototest_nanopb}, 1) COMMON_FLAGS += -DPROTOTEST_NANOPB - CXX_TARGETS += src/app/prototest/nanopb.pb.cc src/lib/nanopb/pb_common.cc + CXX_TARGETS += src/app/prototest/nanopbbench.pb.cc src/lib/nanopb/pb_common.cc CXX_TARGETS += src/lib/nanopb/pb_decode.cc src/lib/nanopb/pb_encode.cc INCLUDES += -Iinclude/lib/nanopb endif @@ -51,6 +51,7 @@ ifeq (${prototest_xdr}, 1) endif %.pb.cc: %.proto - protoc --plugin=protoc-gen-nanopb=${HOME}/var/ess/protocol-modeling/nanopb/generator/protoc-gen-nanopb --nanopb_out=. src/app/prototest/nanopb.proto - mv src/app/prototest/nanopb.pb.c src/app/prototest/nanopb.pb.cc - sed -i 's!src/app/prototest/!!' src/app/prototest/nanopb.pb.cc + protoc --plugin=protoc-gen-nanopb=${HOME}/var/ess/protocol-modeling/nanopb/generator/protoc-gen-nanopb --nanopb_out=. src/app/prototest/nanopbbench.proto + mv src/app/prototest/nanopbbench.pb.c src/app/prototest/nanopbbench.pb.cc + sed -i 's!src/app/prototest/!!' src/app/prototest/nanopbbench.pb.cc + sed -i 's!\#include "src/app/prototest/nanopb.pb.h"!!' src/app/prototest/nanopbbench.pb.h diff --git a/src/app/prototest/main.cc b/src/app/prototest/main.cc index 0b5e5d3..b4d2254 100644 --- a/src/app/prototest/main.cc +++ b/src/app/prototest/main.cc @@ -14,7 +14,7 @@ #endif #ifdef PROTOTEST_NANOPB #include -#include "nanopb.pb.h" +#include "nanopbbench.pb.h" #include #include #endif -- cgit v1.2.3