From b9e1b4435a406a8a27c078ea05dee1240e51704a Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 2 May 2017 18:29:37 +0200 Subject: Added external libraries from openXC CMake files. Now libraries are cleanly included and built. Change-Id: Iaa85639578b55b2da8357bc438426403e2cca8de Signed-off-by: Romain Forlot --- CAN-binder/libs/nanopb/extra/nanopb.mk | 37 ---------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 CAN-binder/libs/nanopb/extra/nanopb.mk (limited to 'CAN-binder/libs/nanopb/extra/nanopb.mk') diff --git a/CAN-binder/libs/nanopb/extra/nanopb.mk b/CAN-binder/libs/nanopb/extra/nanopb.mk deleted file mode 100644 index 5c2cff5..0000000 --- a/CAN-binder/libs/nanopb/extra/nanopb.mk +++ /dev/null @@ -1,37 +0,0 @@ -# This is an include file for Makefiles. It provides rules for building -# .pb.c and .pb.h files out of .proto, as well the path to nanopb core. - -# Path to the nanopb root directory -NANOPB_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../) - -# Files for the nanopb core -NANOPB_CORE = $(NANOPB_DIR)/pb_encode.c $(NANOPB_DIR)/pb_decode.c $(NANOPB_DIR)/pb_common.c - -# Check if we are running on Windows -ifdef windir -WINDOWS = 1 -endif -ifdef WINDIR -WINDOWS = 1 -endif - -# Check whether to use binary version of nanopb_generator or the -# system-supplied python interpreter. -ifneq "$(wildcard $(NANOPB_DIR)/generator-bin)" "" - # Binary package - PROTOC = $(NANOPB_DIR)/generator-bin/protoc - PROTOC_OPTS = -else - # Source only or git checkout - PROTOC = protoc - ifdef WINDOWS - PROTOC_OPTS = --plugin=protoc-gen-nanopb=$(NANOPB_DIR)/generator/protoc-gen-nanopb.bat - else - PROTOC_OPTS = --plugin=protoc-gen-nanopb=$(NANOPB_DIR)/generator/protoc-gen-nanopb - endif -endif - -# Rule for building .pb.c and .pb.h -%.pb.c %.pb.h: %.proto $(wildcard %.options) - $(PROTOC) $(PROTOC_OPTS) --nanopb_out=. $< - -- cgit 1.2.3-korg