[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] 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>
Release-acked-by: Ian Jackson <iwj@xxxxxxxxxxxxxx>

--- 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
--- a/tools/libs/guest/Makefile
+++ b/tools/libs/guest/Makefile
@@ -108,6 +108,8 @@ $(eval $(genpath-target))
 xc_private.h: _paths.h
+-include $(DEPS_INCLUDE)
 .PHONY: cleanlocal
        rm -f libxenguest.map
--- 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)
--- a/tools/libs/store/Makefile
+++ b/tools/libs/store/Makefile
@@ -31,6 +31,8 @@ else
+-include $(DEPS_INCLUDE)
 .PHONY: install
 install: install-headers
--- a/tools/libs/util/Makefile
+++ b/tools/libs/util/Makefile
@@ -52,6 +52,8 @@ $(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) _pa
 genpath-target = $(call buildmakevars2header,_paths.h)
 $(eval $(genpath-target))
+-include $(DEPS_INCLUDE)
 clean: cleanlocal
 .PHONY: cleanlocal
--- a/tools/libs/vchan/Makefile
+++ b/tools/libs/vchan/Makefile
@@ -11,6 +11,7 @@ SRCS-y += io.c
 include $(XEN_ROOT)/tools/libs/libs.mk
+-include $(DEPS_INCLUDE)
 clean: cleanlocal



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.