Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/checkpoint-restore/criu.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@openvz.org>2016-10-27 19:01:21 +0300
committerAndrei Vagin <avagin@virtuozzo.com>2017-03-15 00:06:02 +0300
commita0810481e571a22bffe27120a9d73fb9b0d7f8d8 (patch)
tree583decb71d7ad5d6dc8802cc22bf0b92bce83a7f /Makefile.compel
parenta714fff5a3d799cbf4d4f05fef8e7e095fb26443 (diff)
compel: Include compel headers as system ones
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Diffstat (limited to 'Makefile.compel')
-rw-r--r--Makefile.compel20
1 files changed, 14 insertions, 6 deletions
diff --git a/Makefile.compel b/Makefile.compel
index a5999581b..84d5c0769 100644
--- a/Makefile.compel
+++ b/Makefile.compel
@@ -26,30 +26,38 @@ $(SRC_DIR)/compel/include/asm: $(SRC_DIR)/compel/arch/$(ARCH)/src/lib/include
$(Q) ln -s $^ $@
$(COMPEL_VERSION_HEADER): $(SRC_DIR)/compel/include/asm
+compel-uapi-links += $(SRC_DIR)/compel/include/uapi/compel
+compel-uapi-links += $(SRC_DIR)/compel/include/uapi/asm
+compel-uapi-links += $(SRC_DIR)/compel/include/asm
+
+compel-deps += $(compel-uapi-links)
+compel-deps += $(COMPEL_VERSION_HEADER)
+compel-deps += $(CONFIG_HEADER)
+
#
# Compel itself.
-compel/%: $(COMPEL_VERSION_HEADER) $(CONFIG_HEADER) .FORCE
+compel/%: $(compel-deps) .FORCE
$(Q) $(MAKE) $(build)=compel $@
#
# Plugins
-compel/plugins/%: $(COMPEL_VERSION_HEADER) $(CONFIG_HEADER) .FORCE
+compel/plugins/%: $(compel-deps) .FORCE
$(Q) $(MAKE) $(build)=compel/plugins $@
#
# GNU make 4.x supports targets matching via wide
# match targeting, where GNU make 3.x series (used on
# Travis) is not, so we have to write them here explicitly.
-compel/plugins/std.built-in.o: $(COMPEL_VERSION_HEADER) .FORCE
+compel/plugins/std.built-in.o: $(compel-deps) .FORCE
$(Q) $(MAKE) $(build)=compel/plugins $@
-compel/plugins/shmem.built-in.o: $(COMPEL_VERSION_HEADER) .FORCE
+compel/plugins/shmem.built-in.o: $(compel-deps) .FORCE
$(Q) $(MAKE) $(build)=compel/plugins $@
-compel/plugins/fds.built-in.o: $(COMPEL_VERSION_HEADER) .FORCE
+compel/plugins/fds.built-in.o: $(compel-deps) .FORCE
$(Q) $(MAKE) $(build)=compel/plugins $@
-compel/compel: compel/built-in.o compel/lib.a $(COMPEL_VERSION_HEADER)
+compel/compel: compel/built-in.o compel/lib.a | $(compel-deps)
$(call msg-link, $@)
$(Q) $(CC) $(CFLAGS) $^ $(WRAPFLAGS) $(LDFLAGS) -rdynamic -o $@