[CRIU] [PATCH 2/2] make: protobuf -- Fix building, v2

Cyrill Gorcunov gorcunov at gmail.com
Tue Jan 20 12:23:08 PST 2015


On Tue, Jan 20, 2015 at 11:18:14PM +0300, Cyrill Gorcunov wrote:
>  - fix typo in proto-obj-y
>  - drop unneeded opts.pb-c.c dep due to prev typo

attached
-------------- next part --------------
>From 383a4dce448b863bbc3a2429593d6ad1b2bbfe52 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov at openvz.org>
Date: Tue, 20 Jan 2015 23:15:36 +0300
Subject: [PATCH 2/2] make: protobuf -- Fix building

 - fix typo in proto-obj-y
 - drop unneeded opts.pb-c.c dep due to prev typo

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 protobuf/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/protobuf/Makefile b/protobuf/Makefile
index 7c7df68325de..f8283496b4cc 100644
--- a/protobuf/Makefile
+++ b/protobuf/Makefile
@@ -64,7 +64,7 @@ proto-obj-y	+= ext-file.o
 proto-obj-y	+= cgroup.o
 proto-obj-y	+= userns.o
 proto-obj-y	+= google/protobuf/descriptor.o # To make protoc-c happy and compile opts.proto
-proto-pbj-y	+= opts.o
+proto-obj-y	+= opts.o
 
 proto		:= $(proto-obj-y:.o=)
 proto-c		:= $(proto-obj-y:.o=.pb-c.c)
@@ -89,7 +89,7 @@ $(obj)/%.proto.c.d: $(obj)/%.proto | $(obj)/%.proto.d
 		-e 's/.*/$(subst .proto,.pb-c.c,$(subst /,\/,$<)): $(subst /,\/,$(obj))\/&/'	| \
 		uniq > $@
 
-$(obj)/%.pb-c.c $(obj)/%.pb-c.h: $(obj)/%.proto $(obj)/%.proto.c.d $(obj)/opts.pb-c.c
+$(obj)/%.pb-c.c $(obj)/%.pb-c.h: $(obj)/%.proto $(obj)/%.proto.c.d
 	$(E) "  PBCC    " $@
 	$(Q) protoc-c --proto_path=$(obj)/ --c_out=$(obj)/ $<
 ifeq ($(SRCARCH),arm)
-- 
1.9.3



More information about the CRIU mailing list