[CRIU] [PATCH 1/3] Revert "test/make: Include .d files"

Dmitry Safonov dima at arista.com
Mon Apr 30 21:41:56 MSK 2018


This reverts commit dcafa78b96084216e32b757be62b7fa8aebbdd87.

I've found that we already include deps in Makefile.inc,
was to fast on the first attempt and overlooked this.
(the include just doesn't work like it should yet..)

The origin patch may be just dropped before preparing master's merge.

Signed-off-by: Dmitry Safonov <dima at arista.com>
---
 test/zdtm/lib/Makefile        | 1 -
 test/zdtm/static/Makefile     | 2 --
 test/zdtm/transition/Makefile | 1 -
 3 files changed, 4 deletions(-)

diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index d0a667862aeb..d2d9f1cc31dc 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -16,7 +16,6 @@ LDLIBS	:= $(LIB)
 TARGETS	:= $(LIB) $(BIN)
 
 include ../Makefile.inc
-include $(DEP)
 
 all:	$(TARGETS)
 .PHONY: all
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index ee74b47c9c5c..244b7070640e 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -376,8 +376,6 @@ OUT	= $(TST:%=%.out)
 STATE	= $(TST_STATE:%=%.state)
 STATE_OUT	= $(TST_STATE:%=%.out)
 
-include $(DEP)
-
 all:	$(TST) criu-rtc.so
 install: all
 .PHONY: all install
diff --git a/test/zdtm/transition/Makefile b/test/zdtm/transition/Makefile
index ea4eb8639f1d..35301ac85e87 100644
--- a/test/zdtm/transition/Makefile
+++ b/test/zdtm/transition/Makefile
@@ -39,7 +39,6 @@ PID	= $(TST:%=%.pid)
 OUT	= $(TST:%=%.out)
 
 include ../Makefile.inc
-include $(DEP)
 
 all:	$(TST)
 install: all
-- 
2.13.6



More information about the CRIU mailing list