From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from tama50.ecl.ntt.co.jp (tama50.ecl.ntt.co.jp [129.60.39.147]) by dpdk.org (Postfix) with ESMTP id 38E7C2C55 for ; Fri, 31 Aug 2018 11:14:56 +0200 (CEST) Received: from vc1.ecl.ntt.co.jp (vc1.ecl.ntt.co.jp [129.60.86.153]) by tama50.ecl.ntt.co.jp (8.13.8/8.13.8) with ESMTP id w7V9Etlt030949; Fri, 31 Aug 2018 18:14:55 +0900 Received: from vc1.ecl.ntt.co.jp (localhost [127.0.0.1]) by vc1.ecl.ntt.co.jp (Postfix) with ESMTP id 2B78DEA8115; Fri, 31 Aug 2018 18:14:55 +0900 (JST) Received: from localhost.localdomain (unknown [129.60.13.51]) by vc1.ecl.ntt.co.jp (Postfix) with ESMTP id 14A39EA6DDE; Fri, 31 Aug 2018 18:14:55 +0900 (JST) From: ogawa.yasufumi@lab.ntt.co.jp To: spp@dpdk.org, ferruh.yigit@intel.com Cc: Yasufumi Ogawa Date: Fri, 31 Aug 2018 18:14:39 +0900 Message-Id: <20180831091441.39055-10-ogawa.yasufumi@lab.ntt.co.jp> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20180831091441.39055-1-ogawa.yasufumi@lab.ntt.co.jp> References: <20180831091441.39055-1-ogawa.yasufumi@lab.ntt.co.jp> X-TM-AS-MML: disable Subject: [spp] [PATCH 09/11] makefile: fix bug of PDF compilation X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Aug 2018 09:14:56 -0000 From: Yasufumi Ogawa This patch includes bug fix and refactor of Makefile. In target 'doc-pdf', PDF images embedded into the document is removed immediately after sphinx command is executed. However, it possibly remove PDF images before sphinx refers them. It is resulted in a failure of file not found. To fix the bug, move removing PDF images from 'doc-pdf' to 'doc-clean' to avoid the error. For refactoring, remove 'compile-doc.sh' for running Makefile in 'docs/guides' directory and do the task from project root Makefile. 'compile-doc.sh' is no needed any more. Signed-off-by: Yasufumi Ogawa --- Makefile | 11 +++++++---- docs/guides/compile-doc.sh | 11 ----------- 2 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 docs/guides/compile-doc.sh diff --git a/Makefile b/Makefile index 6d29dcc..47fa4cb 100644 --- a/Makefile +++ b/Makefile @@ -47,17 +47,20 @@ include $(RTE_SDK)/mk/rte.extsubdir.mk DOC_ROOT = docs/guides # Compile RST documents +.PHONY: doc-pdf +doc-all: doc-pdf doc-html + .PHONY: doc-html doc-html: - sh $(DOC_ROOT)/compile-doc.sh doc-html + make -C $(DOC_ROOT) html .PHONY: doc-pdf doc-pdf: python $(DOC_ROOT)/gen_pdf_imgs.py - sh $(DOC_ROOT)/compile-doc.sh doc-pdf - find $(DOC_ROOT)/images/ -type f -name "*.pdf" -delete + make -C $(DOC_ROOT) latexpdf @echo "Succeeded to generate '$(DOC_ROOT)/_build/latex/SoftPatchPanel.pdf'" .PHONY: doc-clean doc-clean: - sh $(DOC_ROOT)/compile-doc.sh clean + find $(DOC_ROOT)/images/ -type f -name "*.pdf" -delete + make -C $(DOC_ROOT) clean diff --git a/docs/guides/compile-doc.sh b/docs/guides/compile-doc.sh deleted file mode 100644 index 237c526..0000000 --- a/docs/guides/compile-doc.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -cd `dirname ${0}` - -if [ $1 = 'doc-html' ]; then - make html -elif [ $1 = 'doc-pdf' ]; then - make latexpdf -elif [ $1 = 'clean' ]; then - make clean -fi -- 2.7.4