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@suse.com>
Acked-by: Wei Liu <wl@xen.org>
Release-acked-by: Ian Jackson <iwj@xenproject.org>

diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile
index 4185dc3f22c8ff086c9a3d9d272120f342d7cf5a..6106e36c49f7b2b6d0f92b0bb9fec054b0ca2325 100644 (file)
--- 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 58c50250df63b4ec52aec25a447ca823bfd38c64..604e1695d6aff5f7963d73bb347c809240bfe3f9 100644 (file)
--- 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 68f6fa315f3f8af3e3b272e366d4511a0dbfa663..849d7e6863da7b3eb3e6c70a4204ff6d9c2beecf 100644 (file)
--- 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 bc89b9cd70a9188084bf613b2f1471c59ce3f078..bee57b562934a6a9bb4aca869d0d28b5241b486c 100644 (file)
--- 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 b739360be7c2d123f81b6f34e57b82ffbb6ca3c4..f5f9e89fee68c66051b58e147a8dfa913c1a2df2 100644 (file)
--- 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 83a45d2817b8b465e12603cc0f23c35cf8ea31a0..df112f1b8853b71e63cdf75a95ffc80d0000d9be 100644 (file)
--- 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