2
0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 01:51:51 +00:00

common: Move atomic.h in

Since in criu we can't choose proper
arch inside include statements (well,
it will simply require more ifdefs),
I generate include/common/asm symlink
to point proper architecture.

travis-ci: success for Common headers
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Cyrill Gorcunov 2016-10-24 14:58:08 +03:00 committed by Pavel Emelyanov
parent 8fa72cf711
commit 4485723f80
6 changed files with 10 additions and 2 deletions

View File

@ -132,7 +132,7 @@ ifeq ($(GMON),1)
export GMON GMONLDOPT
endif
CFLAGS += $(WARNINGS) $(DEFINES)
CFLAGS += $(WARNINGS) $(DEFINES) -iquote include/common
# Default target
all: criu lib
@ -177,6 +177,13 @@ endif
$(Q) echo "#define CRIU_GITID \"$(GITID)\"" >> $@
$(Q) echo "#endif /* __CR_VERSION_H__ */" >> $@
#
# Setup proper link for asm headers in common code.
include/common/asm: include/common/arch/$(ARCH)/asm
$(call msg-gen, $@)
$(Q) ln -s ./arch/$(ARCH)/asm $@
$(VERSION_HEADER): include/common/asm
#
# piegen tool might be disabled by hands. Don't use it until
# you know what you're doing.
@ -243,6 +250,7 @@ mrproper: subclean
$(Q) $(MAKE) $(build)=criu $@
$(Q) $(RM) $(CONFIG_HEADER)
$(Q) $(RM) $(VERSION_HEADER)
$(Q) $(RM) include/common/asm
$(Q) $(RM) cscope.*
$(Q) $(RM) tags TAGS
.PHONY: mrproper

View File

@ -1,4 +1,4 @@
#ifndef __CR_INC_ATOMIC_H__
#define __CR_INC_ATOMIC_H__
#include "asm/atomic.h"
#include "common/asm/atomic.h"
#endif