[dpdk-dev] mk: fix for "make doc-guides-pdf" with make 3.81
Commit Message
Re-ordered the guide-pdf-% and guide-% rules to allow
the doc-guides-pdf target to build with make 3.81. It
builds unmodified with all later versions of make.
Reported-by: Tetsuya Mukawa <mukawa@igel.co.jp>
Signed-off-by: John McNamara <john.mcnamara@intel.com>
---
mk/rte.sdkdoc.mk | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Comments
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of John McNamara
> Sent: Wednesday, April 01, 2015 12:33 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] mk: fix for "make doc-guides-pdf" with make
> 3.81
>
> Re-ordered the guide-pdf-% and guide-% rules to allow
> the doc-guides-pdf target to build with make 3.81. It
> builds unmodified with all later versions of make.
>
> Reported-by: Tetsuya Mukawa <mukawa@igel.co.jp>
> Signed-off-by: John McNamara <john.mcnamara@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
@@ -94,11 +94,6 @@ guides-pdf-img-clean:
$(Q)rm -f $(RTE_SDK)/doc/guides/*/img/*.pdf
guides-pdf: $(addprefix guides-pdf-, $(notdir $(RTE_GUIDES:/=))) ;
-guides-%:
- @echo 'sphinx processing $@...'
- $(Q)$(RTE_SPHINX_BUILD) -b $* $(RTE_SPHINX_VERBOSE) \
- -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides \
- $(RTE_OUTPUT)/doc/$*/guides
guides-pdf-%:
@echo 'sphinx processing $@...'
@@ -112,6 +107,12 @@ guides-pdf-%:
$(Q)mv $(RTE_OUTPUT)/doc/pdf/guides/$*/doc.pdf \
$(RTE_OUTPUT)/doc/pdf/guides/$*.pdf
+guides-%:
+ @echo 'sphinx processing $@...'
+ $(Q)$(RTE_SPHINX_BUILD) -b $* $(RTE_SPHINX_VERBOSE) \
+ -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides \
+ $(RTE_OUTPUT)/doc/$*/guides
+
# Each PDF depends on generated images *.pdf from *.svg
$(foreach guide, $(RTE_GUIDES), $(foreach img, $(wildcard $(guide)img/*.svg), \
$(eval guides-pdf-$(notdir $(guide:/=)): $(img:svg=pdf))))