From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id CF4825A35 for ; Wed, 1 Apr 2015 13:32:58 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 01 Apr 2015 04:32:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,503,1422950400"; d="scan'208";a="549501483" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 01 Apr 2015 04:32:56 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t31BWtKR028036; Wed, 1 Apr 2015 12:32:55 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id t31BWt25019931; Wed, 1 Apr 2015 12:32:55 +0100 Received: (from jmcnam2x@localhost) by sivswdev02.ir.intel.com with id t31BWt5K019927; Wed, 1 Apr 2015 12:32:55 +0100 From: John McNamara To: dev@dpdk.org Date: Wed, 1 Apr 2015 12:32:45 +0100 Message-Id: <1427887965-19651-1-git-send-email-john.mcnamara@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <551BB7C0.1020004@igel.co.jp> References: <551BB7C0.1020004@igel.co.jp> Subject: [dpdk-dev] [PATCH] mk: fix for "make doc-guides-pdf" with make 3.81 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: , X-List-Received-Date: Wed, 01 Apr 2015 11:32:59 -0000 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 --- mk/rte.sdkdoc.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk index 5b44083..0b69d99 100644 --- a/mk/rte.sdkdoc.mk +++ b/mk/rte.sdkdoc.mk @@ -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)))) -- 1.8.1.4 Fix for issue: $ ~/tmp/make-3.81/make doc-guides-pdf sphinx processing guides-pdf-freebsd_gsg... Sphinx error: Builder name pdf-freebsd_gsg not registered make[1]: *** [guides-pdf-freebsd_gsg] Error 1 make: *** [doc-guides-pdf] Error 2