Commit 4485723f authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

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: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 8fa72cf7
......@@ -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
......
#ifndef __CR_INC_ATOMIC_H__
#define __CR_INC_ATOMIC_H__
#include "asm/atomic.h"
#include "common/asm/atomic.h"
#endif
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