mirror of
https://github.com/checkpoint-restore/criu
synced 2025-08-22 01:51:51 +00:00
Makefile nitpicks
1. As __nmk_dir already ends with a slash, there's no need for an extra one. 2. No need to include macro.mk into criu/Makefile -- nothing it defines is used from there. Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Kir Kolyshkin <kir@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
parent
0aa9eee5f4
commit
9e2ce61cac
@ -1,6 +1,6 @@
|
||||
__nmk_dir ?= ../scripts/nmk/scripts/
|
||||
include $(__nmk_dir)/include.mk
|
||||
include $(__nmk_dir)/macro.mk
|
||||
include $(__nmk_dir)include.mk
|
||||
include $(__nmk_dir)macro.mk
|
||||
|
||||
ASCIIDOC := asciidoc
|
||||
A2X := a2x
|
||||
|
4
Makefile
4
Makefile
@ -3,8 +3,8 @@
|
||||
__nmk_dir=$(CURDIR)/scripts/nmk/scripts/
|
||||
export __nmk_dir
|
||||
|
||||
include $(__nmk_dir)/include.mk
|
||||
include $(__nmk_dir)/macro.mk
|
||||
include $(__nmk_dir)include.mk
|
||||
include $(__nmk_dir)macro.mk
|
||||
|
||||
#
|
||||
# To build host helpers.
|
||||
|
@ -35,7 +35,7 @@ ifneq ($(filter ia32 x86 ppc64,$(ARCH)),)
|
||||
endif
|
||||
|
||||
# msg-* printing
|
||||
include $(__nmk_dir)/msg.mk
|
||||
include $(__nmk_dir)msg.mk
|
||||
|
||||
#
|
||||
# Needed libraries checks
|
||||
|
@ -1,4 +1,4 @@
|
||||
include $(__nmk_dir)/utils.mk
|
||||
include $(__nmk_dir)utils.mk
|
||||
include $(__nmk_dir)msg.mk
|
||||
include $(SRC_DIR)/scripts/feature-tests.mak
|
||||
|
||||
|
@ -1,5 +1,4 @@
|
||||
include $(__nmk_dir)/include.mk
|
||||
include $(__nmk_dir)/macro.mk
|
||||
include $(__nmk_dir)include.mk
|
||||
|
||||
CRIU_SO := libcriu.so
|
||||
UAPI_HEADERS := c/criu.h ../images/rpc.proto
|
||||
|
Loading…
x
Reference in New Issue
Block a user