mirror of
https://github.com/checkpoint-restore/criu
synced 2025-08-31 14:25:49 +00:00
zdtm/make: Include Makefile.inc after defining $(DEP)
Otherwise, tests dependencies are not considered for build. Add an error in Makefile.inc so this won't happen again. Cc: Cyrill Gorcunov <gorcunov@openvz.org> Reported-by: Andrei Vagin <avagin@virtuozzo.com> Signed-off-by: Dmitry Safonov <dima@arista.com> Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
committed by
Andrei Vagin
parent
bf455467cf
commit
18d4be7cca
@@ -98,6 +98,9 @@ dep: $(DEP)
|
||||
|
||||
no-deps-targets := clean cleandep cleanout realclean groups.cleanout
|
||||
|
||||
ifeq ($(strip $(DEP)),)
|
||||
$(error No DEP defined in sub-make)
|
||||
endif
|
||||
ifeq ($(filter $(no-deps-targets), $(MAKECMDGOALS)),)
|
||||
-include $(wildcard $(DEP))
|
||||
endif
|
||||
|
@@ -205,8 +205,6 @@ TST_NOFILE := \
|
||||
unlink_multiple_largefiles \
|
||||
# jobctl00 \
|
||||
|
||||
include ../Makefile.inc
|
||||
|
||||
ifneq ($(SRCARCH),arm)
|
||||
ifneq ($(COMPAT_TEST),y)
|
||||
TST_NOFILE += maps03
|
||||
@@ -365,6 +363,8 @@ OUT = $(TST:%=%.out)
|
||||
STATE = $(TST_STATE:%=%.state)
|
||||
STATE_OUT = $(TST_STATE:%=%.out)
|
||||
|
||||
include ../Makefile.inc
|
||||
|
||||
all: $(TST) criu-rtc.so
|
||||
install: all
|
||||
.PHONY: all install
|
||||
|
Reference in New Issue
Block a user