From patchwork Wed Apr 1 12:31:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 4216 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 7BF595A35; Wed, 1 Apr 2015 14:32:16 +0200 (CEST) Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by dpdk.org (Postfix) with ESMTP id 4B1545686 for ; Wed, 1 Apr 2015 14:32:14 +0200 (CEST) Received: by wgbdm7 with SMTP id dm7so51673477wgb.1 for ; Wed, 01 Apr 2015 05:32:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EqsZ5t4ZaCJXwsmtIbCHjZSvK9v7NnRSUV70b4x2Lxg=; b=dzhDvmIBATk0UPfwFw27SZD6LTk5Cwi8Ys74ALXijKfnOoyQIdhqHDS8uf/0V8Xece WuxjR6cg4MPC8e40BVZObYHVLzHp2Im7nBnUGAgBMrqugqSrE6DtLjb16Uyj3r77YVKj MQmfqO4e4c/gcCnbaoD7LJoqI936P2xWVZ51R/tnp7ATosmXCns53CMt4Z+UHmNIfHrm pFYJYo414Ta7O9qZTUq1Y5fcKHC32CkR/ays2DZd7miYGMBfZxzlzjQt78fgcamvuVWA H2vrVP6/vwZ9J+9XUgEGQpMhW+CZcAyf5T5Ny86Thc4fzso7S7eptlucnExzU5TDRDFT OIGA== X-Gm-Message-State: ALoCoQk4TreQiUq3B0j1LN1ywg9lnFBv5YV87t0w/CmQIvieYCHDXZkA0GzxtZBxLtP5aKIY/t1C X-Received: by 10.194.142.205 with SMTP id ry13mr85559139wjb.73.1427891534133; Wed, 01 Apr 2015 05:32:14 -0700 (PDT) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by mx.google.com with ESMTPSA id a10sm2526590wjy.0.2015.04.01.05.32.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Apr 2015 05:32:13 -0700 (PDT) From: Thomas Monjalon To: dev@dpdk.org Date: Wed, 1 Apr 2015 14:31:18 +0200 Message-Id: <1427891478-26398-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1427887965-19651-1-git-send-email-john.mcnamara@intel.com> References: <1427887965-19651-1-git-send-email-john.mcnamara@intel.com> Subject: [dpdk-dev] [PATCH v2] mk: fix pdf doc rules order X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: John McNamara 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 Signed-off-by: John McNamara Signed-off-by: Thomas Monjalon --- 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))))