From a56f0cf16a90579c5e3743855f025d1dbd2f0b59 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Wed, 2 Nov 2016 20:35:39 +0300 Subject: [PATCH] make: Fixup dependency on config.h after pulling patches from -dev In -dev branch the deps scheme is different as we have soccr and compel bits there, so in master the criu vs piegen vs config deps should look differently. Signed-off-by: Pavel Emelyanov --- Makefile | 2 +- criu/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c585cb598..d8ff07e5a 100644 --- a/Makefile +++ b/Makefile @@ -211,7 +211,7 @@ $(eval $(call gen-built-in,images)) # the nmk so we can reuse it there. criu/%: images/built-in.o $(VERSION_HEADER) .FORCE $(Q) $(MAKE) $(build)=criu $@ -criu: images/built-in.o $(VERSION_HEADER) +criu: images/built-in.o $(VERSION_HEADER) $(CONFIG_HEADER) $(Q) $(MAKE) $(build)=criu all .PHONY: criu diff --git a/criu/Makefile b/criu/Makefile index fe87a3417..279abf558 100644 --- a/criu/Makefile +++ b/criu/Makefile @@ -50,7 +50,7 @@ $(ARCH-LIB): syscalls_lib ifeq ($(piegen-y),y) piegen-bin := criu/pie/piegen/piegen -criu/pie/piegen/%: config +criu/pie/piegen/%: $(CONFIG_HEADER) $(Q) CC=$(HOSTCC) LD=$(HOSTLD) CFLAGS="$(ccflags-y) $(HOSTCFLAGS) $(WARNINGS) $(DEFINES)" $(MAKE) $(build)=criu/pie/piegen $@ $(piegen-bin): criu/pie/piegen/built-in.o $(call msg-link, $@)