[CRIU] [PATCHv2 2/2] criu/build: include msg.mk in files that use msg-*

[Dmitry Safonov]

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: Cyrill Gorcunov <gorcunov at openvz.org>
Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
---
 criu/Makefile              | 3 +++
 criu/Makefile.config       | 1 +
 criu/Makefile.version      | 2 ++
 lib/pycriu/images/Makefile | 1 +
 4 files changed, 7 insertions(+)

diff --git a/criu/Makefile b/criu/Makefile
index b009c7b..9ff8699 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -84,6 +84,9 @@ ifneq ($(filter ia32 x86 ppc64,$(ARCH)),)
         endif
 endif
 
+# msg-* printing
+include $(__nmk_dir)/msg.mk
+
 #
 # Version header file.
 include Makefile.version
diff --git a/criu/Makefile.config b/criu/Makefile.config
index a39f4cd..36686d7 100644
--- a/criu/Makefile.config
+++ b/criu/Makefile.config
@@ -1,4 +1,5 @@
 include $(__nmk_dir)/utils.mk
+include $(__nmk_dir)msg.mk
 include ../scripts/feature-tests.mak
 
 CONFIG_HEADER := include/config.h
diff --git a/criu/Makefile.version b/criu/Makefile.version
index 44dad6c..6007958 100644
--- a/criu/Makefile.version
+++ b/criu/Makefile.version
@@ -1,3 +1,5 @@
+include $(__nmk_dir)msg.mk
+
 CRTOOLSVERSION		:= $(VERSION_MAJOR)$(if $(VERSION_MINOR),.$(VERSION_MINOR))$(if $(VERSION_SUBLEVEL),.$(VERSION_SUBLEVEL))
 VERSION_HEADER		:= include/version.h
 GITID_FILE		:= ../.gitid
diff --git a/lib/pycriu/images/Makefile b/lib/pycriu/images/Makefile
index c8a748e..8fad6d8 100644
--- a/lib/pycriu/images/Makefile
+++ b/lib/pycriu/images/Makefile
@@ -1,3 +1,4 @@
+include $(__nmk_dir)msg.mk
 all: pb.py images magic.py
 
 .PHONY: all images clean pb.py
-- 
2.7.1