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
build-tools-public-headers.

Discovered by Travis-CI.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
elease-acked-by: Julien Grall <julien.grall@arm.com>
This commit is contained in:
Wei Liu committed 2017-05-19 14:31:53 +01:00
1 parent 9d3011bd1c
commit 728d21b29b
1 file changed
+7 -1
+7 -1
View File
@@ -42,6 +42,10 @@ export DESTDIR
build-tools-public-headers:
$(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
dist-misc:
$(INSTALL_DIR) $(DISTDIR)/
$(INSTALL_DATA) ./COPYING $(DISTDIR)
$(INSTALL_DATA) ./README $(DISTDIR)
$(INSTALL_PROG) ./install.sh $(DISTDIR)
dist-tools: dist-tools-public-headers
dist-%: DESTDIR=$(DISTDIR)/install
dist-%: install-%
@: # do nothing
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.