From: Thomas Monjalon <thomas.monjalon@6wind.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2] mk: fix pdf doc rules order
Date: Wed, 1 Apr 2015 14:31:18 +0200 [thread overview]
Message-ID: <1427891478-26398-1-git-send-email-thomas.monjalon@6wind.com> (raw)
In-Reply-To: <1427887965-19651-1-git-send-email-john.mcnamara@intel.com>
From: John McNamara <john.mcnamara@intel.com>
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>
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
v2: reorder also clean rules
mk/rte.sdkdoc.mk | 20 ++++++++++----------
1 file 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))))
--
2.2.2
next prev parent reply other threads:[~2015-04-01 12:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-01 9:17 [dpdk-dev] Cannot build doc using DPDK-2.0.0-rc3 Tetsuya Mukawa
2015-04-01 9:29 ` De Lara Guarch, Pablo
2015-04-01 9:49 ` Tetsuya Mukawa
2015-04-01 10:08 ` Mcnamara, John
2015-04-01 10:13 ` Masaru Oki
2015-04-01 10:49 ` Mcnamara, John
2015-04-01 11:13 ` Mcnamara, John
2015-04-02 1:04 ` Tetsuya Mukawa
2015-04-01 11:32 ` [dpdk-dev] [PATCH] mk: fix for "make doc-guides-pdf" with make 3.81 John McNamara
2015-04-01 12:07 ` De Lara Guarch, Pablo
2015-04-01 12:31 ` Thomas Monjalon [this message]
2015-04-01 13:29 ` [dpdk-dev] [PATCH v2] mk: fix pdf doc rules order Mcnamara, John
2015-04-01 19:22 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427891478-26398-1-git-send-email-thomas.monjalon@6wind.com \
--to=thomas.monjalon@6wind.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).