diff --git a/.gitignore b/.gitignore index e214d3fab..44e43c970 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ criu/arch/*/syscalls.S criu/include/config.h criu/include/syscall-codes.h criu/include/syscall.h +soccr/config.h criu/include/version.h criu/pie/restorer-blob.h criu/pie/parasite-blob.h diff --git a/Makefile b/Makefile index 3f99d0061..c11d1fa04 100644 --- a/Makefile +++ b/Makefile @@ -188,7 +188,8 @@ endif # # Configure variables. -export CONFIG_HEADER := $(SRC_DIR)/criu/include/config.h +CONFIG_HEADER_REL := criu/include/config.h +export CONFIG_HEADER := $(SRC_DIR)/$(CONFIG_HEADER_REL) ifeq ($(filter clean mrproper,$(MAKECMDGOALS)),) include $(SRC_DIR)/Makefile.config endif @@ -204,9 +205,12 @@ $(eval $(call gen-built-in,images)) # Next the socket CR library # SOCCR_A := soccr/libsoccr.a -soccr/%: $(CONFIG_HEADER) .FORCE +SOCCR_CONFIG := $(SRC_DIR)/soccr/config.h +$(SOCCR_CONFIG): $(CONFIG_HEADER) + $(Q) ln -s ../$(CONFIG_HEADER_REL) $@ +soccr/%: $(SOCCR_CONFIG) .FORCE $(Q) $(MAKE) $(build)=soccr $@ -soccr/built-in.o: $(CONFIG_HEADER) .FORCE +soccr/built-in.o: $(SOCCR_CONFIG) .FORCE $(Q) $(MAKE) $(build)=soccr all $(SOCCR_A): |soccr/built-in.o @@ -253,6 +257,7 @@ mrproper: subclean $(Q) $(MAKE) $(build)=criu $@ $(Q) $(MAKE) $(build)=soccr $@ $(Q) $(RM) $(CONFIG_HEADER) + $(Q) $(RM) $(SOCCR_CONFIG) $(Q) $(RM) $(VERSION_HEADER) $(Q) $(RM) include/common/asm $(Q) $(RM) cscope.* diff --git a/soccr/config.h b/soccr/config.h deleted file mode 120000 index 106aa8bf2..000000000 --- a/soccr/config.h +++ /dev/null @@ -1 +0,0 @@ -../criu/include/config.h \ No newline at end of file