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

[Xen-changelog] [xen master] build: more adjustments to top-level Makefile dependencies

commit 728d21b29b48f6c45a8e3677e62bd4655d8f737b
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Fri May 19 12:55:26 2017 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Fri May 19 14:31:53 2017 +0100

    build: more adjustments to top-level Makefile dependencies
    In the original code, top-level dist target unconditionally invokes
    dist target for tools/include, which is wrong when tools component is
    not enabled.
    Make dist-tools depend on dist-tools-public-headers, which depends on
    Discovered by Travis-CI.
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    elease-acked-by: Julien Grall <julien.grall@xxxxxxx>
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e958bdc..fc30b3c 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,10 @@ export DESTDIR
        $(MAKE) -C tools/include
+.PHONY: dist-tools-public-headers
+dist-tools-public-headers: build-tools-public-headers
+       $(MAKE) -C tools/include dist
 # build and install everything into the standard system directories
 .PHONY: install
 install: $(TARGS_INSTALL)
@@ -80,13 +84,15 @@ test:
 .PHONY: dist
 dist: DESTDIR=$(DISTDIR)/install
 dist: $(TARGS_DIST) dist-misc
-       make -C tools/include dist
        $(INSTALL_DIR) $(DISTDIR)/
        $(INSTALL_PROG) ./install.sh $(DISTDIR)
+dist-tools: dist-tools-public-headers
 dist-%: DESTDIR=$(DISTDIR)/install
 dist-%: install-%
        @: # do nothing
generated by git-patchbot for /home/xen/git/xen.git#master

Xen-changelog mailing list



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