[xen staging] tools/libs: honor build dependencies for recently moved subdirs

[patchbot@xxxxxxx]

commit 19d637617b9184ec58bad27b7756bd9ac492b005
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Jan 26 17:42:56 2021 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Jan 26 17:42:56 2021 +0100

    tools/libs: honor build dependencies for recently moved subdirs
    
    While the lack of proper dependency tracking of #include-d files is
    wider than just the libs/ subtree, dealing with the problem universally
    there or  in tools/Rules.mk is too much of a risk at this point in the
    release cycle. Add the missing inclusion of $(DEPS_INCLUDE) only in the
    specific Makefile-s, after having checked that their prior Makefile-s
    had such includes.
    
    Interestingly the $(DEPS_RM) use is present in tools/libs/libs.mk's
    clean target, so doesn't need taking care of in individual Makefile-s.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Wei Liu <wl@xxxxxxx>
    Release-acked-by: Ian Jackson <iwj@xxxxxxxxxxxxxx>
---
 tools/libs/ctrl/Makefile  | 2 ++
 tools/libs/guest/Makefile | 2 ++
 tools/libs/light/Makefile | 2 ++
 tools/libs/store/Makefile | 2 ++
 tools/libs/util/Makefile  | 2 ++
 tools/libs/vchan/Makefile | 1 +
 6 files changed, 11 insertions(+)

diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile
index 4185dc3f22..6106e36c49 100644
--- a/tools/libs/ctrl/Makefile
+++ b/tools/libs/ctrl/Makefile
@@ -62,6 +62,8 @@ $(eval $(genpath-target))
 
 $(LIB_OBJS) $(PIC_OBJS): _paths.h
 
+-include $(DEPS_INCLUDE)
+
 clean: cleanlocal
 
 .PHONY: cleanlocal
diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile
index 58c50250df..604e1695d6 100644
--- a/tools/libs/guest/Makefile
+++ b/tools/libs/guest/Makefile
@@ -109,6 +109,8 @@ $(eval $(genpath-target))
 
 xc_private.h: _paths.h
 
+-include $(DEPS_INCLUDE)
+
 .PHONY: cleanlocal
 cleanlocal:
        rm -f libxenguest.map
diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile
index 68f6fa315f..849d7e6863 100644
--- a/tools/libs/light/Makefile
+++ b/tools/libs/light/Makefile
@@ -271,3 +271,5 @@ cleanlocal:
        $(RM) -f libxenlight.map
        $(RM) -f $(AUTOSRCS) $(AUTOINCS)
        $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) clean
+
+-include $(DEPS_INCLUDE)
diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile
index bc89b9cd70..bee57b5629 100644
--- a/tools/libs/store/Makefile
+++ b/tools/libs/store/Makefile
@@ -31,6 +31,8 @@ else
 PKG_CONFIG_REMOVE += -ldl
 endif
 
+-include $(DEPS_INCLUDE)
+
 .PHONY: install
 install: install-headers
 
diff --git a/tools/libs/util/Makefile b/tools/libs/util/Makefile
index b739360be7..f5f9e89fee 100644
--- a/tools/libs/util/Makefile
+++ b/tools/libs/util/Makefile
@@ -52,6 +52,8 @@ $(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) _paths.h
 genpath-target = $(call buildmakevars2header,_paths.h)
 $(eval $(genpath-target))
 
+-include $(DEPS_INCLUDE)
+
 clean: cleanlocal
 
 .PHONY: cleanlocal
diff --git a/tools/libs/vchan/Makefile b/tools/libs/vchan/Makefile
index 83a45d2817..df112f1b88 100644
--- a/tools/libs/vchan/Makefile
+++ b/tools/libs/vchan/Makefile
@@ -11,6 +11,7 @@ SRCS-y += io.c
 NO_HEADERS_CHK := y
 
 include $(XEN_ROOT)/tools/libs/libs.mk
+-include $(DEPS_INCLUDE)
 
 clean: cleanlocal
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging