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

Kir Kolyshkin kir at openvz.org
Sat Dec 17 03:22:06 PST 2016


There is absolutely no need to create/remove this symlink
from Makefiles, as it is constant. Just 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            | 6 ------
 compel/include/uapi/compel | 1 +
 3 files changed, 1 insertion(+), 7 deletions(-)
 create mode 120000 compel/include/uapi/compel

diff --git a/Makefile b/Makefile
index a143870..8c61f0d 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/compel
 	$(Q) $(RM) compel/include/uapi/asm
 	$(Q) $(RM) compel/include/asm
 	$(Q) $(RM) cscope.*
diff --git a/Makefile.compel b/Makefile.compel
index ca50a58..4fcc6ea 100644
--- a/Makefile.compel
+++ b/Makefile.compel
@@ -14,11 +14,6 @@ $(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/compel: $(SRC_DIR)/compel/include/uapi
-	$(call msg-gen, $@)
-	$(Q) ln -s $^ $@
-$(COMPEL_VERSION_HEADER): $(SRC_DIR)/compel/include/uapi/compel
-
 $(SRC_DIR)/compel/include/uapi/asm: $(SRC_DIR)/compel/arch/$(ARCH)/src/lib/include/uapi/asm
 	$(call msg-gen, $@)
 	$(Q) ln -s $^ $@
@@ -29,7 +24,6 @@ $(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
 
diff --git a/compel/include/uapi/compel b/compel/include/uapi/compel
new file mode 120000
index 0000000..945c9b4
--- /dev/null
+++ b/compel/include/uapi/compel
@@ -0,0 +1 @@
+.
\ No newline at end of file
-- 
2.7.4



More information about the CRIU mailing list