Commit c225a738 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

move nanopb generated files to nanopbbench.pb.*

parent 0a4a3e08

src/app/prototest/Makefile.inc

+5 −4
Original line number Diff line number Diff line
@@ -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

src/app/prototest/main.cc

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#endif

#ifdef PROTOTEST_NANOPB

#include <pb.h>

#include "nanopb.pb.h"

#include "nanopbbench.pb.h"

#include <pb_encode.h>

#include <pb_decode.h>

#endif