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

[Cyrill Gorcunov]

 - fix typo in proto-obj-y
 - drop unneeded opts.pb-c.c dep due to prev typo
 - do explicit include of deps

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

diff --git a/protobuf/Makefile b/protobuf/Makefile
index 7c7df68325de..1c25fae10f96 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)
@@ -121,8 +121,8 @@ $(obj)/built-in.o: $(addprefix $(obj)/,$(proto-obj-y))
 _all += $(obj)/built-in.o
 
 ifneq ($(MAKECMDGOALS),clean)
--include $(addprefix $(obj)/,$(proto-obj-y:.o=.proto.d))
--include $(addprefix $(obj)/,$(proto-obj-y:.o=.proto.c.d))
+include $(addprefix $(obj)/,$(proto-obj-y:.o=.proto.d))
+include $(addprefix $(obj)/,$(proto-obj-y:.o=.proto.c.d))
 endif
 
 cleanup-y += $(obj)/*.c.d $(obj)/*.pb-c.c $(obj)/*.pb-c.h
-- 
1.9.3