Commit e6b26e73 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Pavel Emelyanov

criu/build: include msg.mk in files that use msg-*

This patch fixes accidental dropping of msg-gen, msg-link messages.
Just run make with another warn enabled:
[criu]$ make --warn-undefined-variable 2>&1 | grep msg
  PBCC     images/ipc-msg.pb-c.c
  DEP      images/ipc-msg.pb-c.d
  CC       images/ipc-msg.o
Makefile.config:17: warning: undefined variable 'msg-gen'
Makefile.version:20: warning: undefined variable 'msg-gen'
Makefile:120: warning: undefined variable 'msg-link'
Makefile:149: warning: undefined variable 'msg-link'
Makefile:15: warning: undefined variable 'msg-gen'
Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarDmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 5f6c2eb9
...@@ -84,6 +84,9 @@ ifneq ($(filter ia32 x86 ppc64,$(ARCH)),) ...@@ -84,6 +84,9 @@ ifneq ($(filter ia32 x86 ppc64,$(ARCH)),)
endif endif
endif endif
# msg-* printing
include $(__nmk_dir)/msg.mk
# #
# Version header file. # Version header file.
include Makefile.version include Makefile.version
......
include $(__nmk_dir)/utils.mk include $(__nmk_dir)/utils.mk
include $(__nmk_dir)msg.mk
include ../scripts/feature-tests.mak include ../scripts/feature-tests.mak
CONFIG_HEADER := include/config.h CONFIG_HEADER := include/config.h
......
include $(__nmk_dir)msg.mk
CRTOOLSVERSION := $(VERSION_MAJOR)$(if $(VERSION_MINOR),.$(VERSION_MINOR))$(if $(VERSION_SUBLEVEL),.$(VERSION_SUBLEVEL)) CRTOOLSVERSION := $(VERSION_MAJOR)$(if $(VERSION_MINOR),.$(VERSION_MINOR))$(if $(VERSION_SUBLEVEL),.$(VERSION_SUBLEVEL))
VERSION_HEADER := include/version.h VERSION_HEADER := include/version.h
GITID_FILE := ../.gitid GITID_FILE := ../.gitid
......
include $(__nmk_dir)msg.mk
all: pb.py images magic.py all: pb.py images magic.py
.PHONY: all images clean pb.py .PHONY: all images clean pb.py
......
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