[CRIU] [PATCH 14/24] compel: make include/uapi/asm symlink permanent

[Kir Kolyshkin]

Similar to the previous commit, there is absolutely no need
to create/remove this symlink from Makefiles, as it can be
made a constant one. Add the symlink to sources and save
a few lines in Makefiles.

Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 Makefile                |  1 -
 Makefile.compel         | 10 +---------
 compel/include/uapi/asm |  1 +
 3 files changed, 2 insertions(+), 10 deletions(-)
 create mode 120000 compel/include/uapi/asm

diff --git a/Makefile b/Makefile
index 8c61f0d..03c3dce 100644
--- a/Makefile
+++ b/Makefile
@@ -266,7 +266,6 @@ mrproper: subclean
 	$(Q) $(RM) $(VERSION_HEADER)
 	$(Q) $(RM) $(COMPEL_VERSION_HEADER)
 	$(Q) $(RM) include/common/asm
-	$(Q) $(RM) compel/include/uapi/asm
 	$(Q) $(RM) compel/include/asm
 	$(Q) $(RM) cscope.*
 	$(Q) $(RM) tags TAGS
diff --git a/Makefile.compel b/Makefile.compel
index 4fcc6ea..301b5a8 100644
--- a/Makefile.compel
+++ b/Makefile.compel
@@ -14,20 +14,12 @@ $(COMPEL_VERSION_HEADER): $(SRC_DIR)/Makefile.versions
 	$(Q) echo "#define COMPEL_SO_VERSION_SUBLEVEL " $(COMPEL_SO_VERSION_SUBLEVEL)	>> $(COMPEL_VERSION_HEADER)
 	$(Q) echo "#endif /* COMPEL_SO_VERSION_H__ */"					>> $(COMPEL_VERSION_HEADER)
 
-$(SRC_DIR)/compel/include/uapi/asm: $(SRC_DIR)/compel/arch/$(ARCH)/src/lib/include/uapi/asm
-	$(call msg-gen, $@)
-	$(Q) ln -s $^ $@
-$(COMPEL_VERSION_HEADER): $(SRC_DIR)/compel/include/uapi/asm
-
 $(SRC_DIR)/compel/include/asm: $(SRC_DIR)/compel/arch/$(ARCH)/src/lib/include
 	$(call msg-gen, $@)
 	$(Q) ln -s $^ $@
 $(COMPEL_VERSION_HEADER): $(SRC_DIR)/compel/include/asm
 
-compel-uapi-links	+= $(SRC_DIR)/compel/include/uapi/asm
-compel-uapi-links	+= $(SRC_DIR)/compel/include/asm
-
-compel-deps		+= $(compel-uapi-links)
+compel-deps		+= $(SRC_DIR)/compel/include/asm
 compel-deps		+= $(COMPEL_VERSION_HEADER)
 compel-deps		+= $(CONFIG_HEADER)
 compel-deps		+= include/common/asm
diff --git a/compel/include/uapi/asm b/compel/include/uapi/asm
new file mode 120000
index 0000000..36f9e04
--- /dev/null
+++ b/compel/include/uapi/asm
@@ -0,0 +1 @@
+../asm/uapi/asm
\ No newline at end of file
-- 
2.7.4