Commit 207bbd89 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

soccr: Generate config.h dynamically

Otherwise there is a broken symlink which makes tags/etags unhappy.

travis-ci: success for soccr: Generate config.h dynamically (rev5)
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
[extended .gitignore, maked link relative to sources]
Signed-off-by: 's avatarDmitry Safonov <dsafonov@virtuozzo.com>
Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent f92b8d9c
...@@ -27,6 +27,7 @@ criu/arch/*/syscalls.S ...@@ -27,6 +27,7 @@ criu/arch/*/syscalls.S
criu/include/config.h criu/include/config.h
criu/include/syscall-codes.h criu/include/syscall-codes.h
criu/include/syscall.h criu/include/syscall.h
soccr/config.h
criu/include/version.h criu/include/version.h
criu/pie/restorer-blob.h criu/pie/restorer-blob.h
criu/pie/parasite-blob.h criu/pie/parasite-blob.h
......
...@@ -188,7 +188,8 @@ endif ...@@ -188,7 +188,8 @@ endif
# #
# Configure variables. # 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)),) ifeq ($(filter clean mrproper,$(MAKECMDGOALS)),)
include $(SRC_DIR)/Makefile.config include $(SRC_DIR)/Makefile.config
endif endif
...@@ -204,9 +205,12 @@ $(eval $(call gen-built-in,images)) ...@@ -204,9 +205,12 @@ $(eval $(call gen-built-in,images))
# Next the socket CR library # Next the socket CR library
# #
SOCCR_A := soccr/libsoccr.a 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 $@ $(Q) $(MAKE) $(build)=soccr $@
soccr/built-in.o: $(CONFIG_HEADER) .FORCE soccr/built-in.o: $(SOCCR_CONFIG) .FORCE
$(Q) $(MAKE) $(build)=soccr all $(Q) $(MAKE) $(build)=soccr all
$(SOCCR_A): |soccr/built-in.o $(SOCCR_A): |soccr/built-in.o
...@@ -253,6 +257,7 @@ mrproper: subclean ...@@ -253,6 +257,7 @@ mrproper: subclean
$(Q) $(MAKE) $(build)=criu $@ $(Q) $(MAKE) $(build)=criu $@
$(Q) $(MAKE) $(build)=soccr $@ $(Q) $(MAKE) $(build)=soccr $@
$(Q) $(RM) $(CONFIG_HEADER) $(Q) $(RM) $(CONFIG_HEADER)
$(Q) $(RM) $(SOCCR_CONFIG)
$(Q) $(RM) $(VERSION_HEADER) $(Q) $(RM) $(VERSION_HEADER)
$(Q) $(RM) include/common/asm $(Q) $(RM) include/common/asm
$(Q) $(RM) cscope.* $(Q) $(RM) cscope.*
......
../criu/include/config.h
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment