summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McNamara <john.mcnamara@intel.com>2015-04-01 12:32:45 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2015-04-01 21:13:24 +0200
commit2b1a5509101fc9d90ec922acb1c062fc15d0695f (patch)
tree4ca652b51d1264f056d4b6917a93d67555331e7a
parentb5a1f1ae2f98c644389293bd97e81a0ab2b2b31f (diff)
downloaddpdk-2b1a5509101fc9d90ec922acb1c062fc15d0695f.zip
dpdk-2b1a5509101fc9d90ec922acb1c062fc15d0695f.tar.gz
dpdk-2b1a5509101fc9d90ec922acb1c062fc15d0695f.tar.xz
mk: fix pdf doc rules order
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. Fixes: ebf8050afd44 ("doc: add pdf output") Reported-by: Tetsuya Mukawa <mukawa@igel.co.jp> Signed-off-by: John McNamara <john.mcnamara@intel.com> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
-rw-r--r--mk/rte.sdkdoc.mk20
1 files changed, 10 insertions, 10 deletions
diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk
index 5b44083..f91e079 100644
--- a/mk/rte.sdkdoc.mk
+++ b/mk/rte.sdkdoc.mk
@@ -85,21 +85,15 @@ api-html-clean:
$(Q)rm -f $(RTE_OUTPUT)/doc/html/api/*
$(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/html/api 2>&- || true
-guides-%-clean:
- $(Q)rm -rf $(RTE_OUTPUT)/doc/$*/guides
- $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/$* 2>&- || true
-
guides-pdf-clean: guides-pdf-img-clean
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-%-clean:
+ $(Q)rm -rf $(RTE_OUTPUT)/doc/$*/guides
+ $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/$* 2>&- || true
+guides-pdf: $(addprefix guides-pdf-, $(notdir $(RTE_GUIDES:/=))) ;
guides-pdf-%:
@echo 'sphinx processing $@...'
$(Q)$(RTE_SPHINX_BUILD) -b latex $(RTE_SPHINX_VERBOSE) \
@@ -112,6 +106,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))))