From 075e064089e1c2b6899db58c69be1a387eb5ffa7 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 17 Oct 2014 17:00:53 +0200 Subject: [PATCH] mk: fix doc cleaning With make 3.x, guides-% is matched instead of guides-%-clean. Move the less specific target pattern (guides-%) at the end to allow matching guides-%-clean first. Reported-by: Bernard Iremonger Signed-off-by: Thomas Monjalon --- mk/rte.sdkdoc.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk index 995daf3dd3..dabc0d6e74 100644 --- a/mk/rte.sdkdoc.mk +++ b/mk/rte.sdkdoc.mk @@ -70,11 +70,6 @@ api-html: api-html-clean doxygen - $(Q)$(RTE_SDK)/doc/api/doxy-html-custom.sh $(RTE_OUTPUT)/doc/html/api/doxygen.css -guides-%: - @echo 'sphinx for guides...' - $(Q)$(RTE_SPHINX_BUILD) -b $* $(RTE_SPHINX_VERBOSE) \ - -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides $(RTE_OUTPUT)/doc/$*/guides - .PHONY: api-html-clean api-html-clean: $(Q)rm -f $(RTE_OUTPUT)/doc/html/api/* @@ -83,3 +78,8 @@ api-html-clean: guides-%-clean: $(Q)rm -rf $(RTE_OUTPUT)/doc/$*/guides $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/$* 2>&- || true + +guides-%: + @echo 'sphinx for guides...' + $(Q)$(RTE_SPHINX_BUILD) -b $* $(RTE_SPHINX_VERBOSE) \ + -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides $(RTE_OUTPUT)/doc/$*/guides -- 2.20.1