Commit 56e89b20 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Pavel Emelyanov

protobuf: regenerate images on Makefile changes

Result:
  [japdoll@dsafonov criu]$ touch Makefile
  [japdoll@dsafonov criu]$ make
  make[1]: Entering directory '/home/japdoll/tools/criu'
    PBCC     images/macvlan.pb-c.c
    DEP      images/macvlan.pb-c.d
    PBCC     images/autofs.pb-c.c
    DEP      images/autofs.pb-c.d
    PBCC     images/sysctl.pb-c.c
    DEP      images/sysctl.pb-c.d
  <...>

travis-ci: success for Fix rebuild on Makefile changes
Signed-off-by: 's avatarDmitry Safonov <dsafonov@virtuozzo.com>
Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 8ea0ba7d
...@@ -75,10 +75,12 @@ $(shell grep "^[[:blank:]]*import[[:blank:]]" $(1) | \ ...@@ -75,10 +75,12 @@ $(shell grep "^[[:blank:]]*import[[:blank:]]" $(1) | \
sort | uniq) sort | uniq)
endef endef
makefile-deps := Makefile $(obj)/Makefile
# #
# Generates rules needed to compile protobuf files. # Generates rules needed to compile protobuf files.
define gen-proto-rules define gen-proto-rules
$(obj)/$(1).pb-c.c $(obj)/$(1).pb-c.h: $(obj)/$(1).proto $(addsuffix .pb-c.c,$(addprefix $(obj)/,$(2))) $(obj)/$(1).pb-c.c $(obj)/$(1).pb-c.h: $(obj)/$(1).proto $(addsuffix .pb-c.c,$(addprefix $(obj)/,$(2))) $(makefile-deps)
$$(E) " PBCC " $$@ $$(E) " PBCC " $$@
$$(Q) protoc-c --proto_path=$(obj)/ --c_out=$(obj)/ $$< $$(Q) protoc-c --proto_path=$(obj)/ --c_out=$(obj)/ $$<
ifeq ($(PROTOUFIX),y) ifeq ($(PROTOUFIX),y)
...@@ -86,7 +88,7 @@ ifeq ($(PROTOUFIX),y) ...@@ -86,7 +88,7 @@ ifeq ($(PROTOUFIX),y)
$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.c,%.h,$$@) $$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.c,%.h,$$@)
$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.h,%.c,$$@) $$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.h,%.c,$$@)
endif endif
$(obj)/$(1).pb-c.d: $(obj)/$(1).pb-c.c $(addsuffix .pb-c.d,$(addprefix $(obj)/,$(2))) $(obj)/$(1).pb-c.d: $(obj)/$(1).pb-c.c $(addsuffix .pb-c.d,$(addprefix $(obj)/,$(2))) $(makefile-deps)
$$(E) " DEP " $$@ $$(E) " DEP " $$@
$$(Q) $$(CC) -M -MT $$@ -MT $(patsubst %.d,%.o,$$@) $$(CFLAGS) $$< -o $$@ $$(Q) $$(CC) -M -MT $$@ -MT $(patsubst %.d,%.o,$$@) $$(CFLAGS) $$< -o $$@
endef endef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment