From patchwork Thu Jun 29 11:00:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 106633 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp4556939obb; Thu, 29 Jun 2017 04:02:28 -0700 (PDT) X-Received: by 10.55.53.68 with SMTP id c65mr16906310qka.225.1498734148296; Thu, 29 Jun 2017 04:02:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498734148; cv=none; d=google.com; s=arc-20160816; b=h74jo80qF4FOO3pFPPCk94mPWol8p2lXq40+zYFcB8ahyeSqWj13ta5Z9PRdnXxGk6 cnOwwal3Awe0H+fRCF+wiIrkLb372OFp2BosQuxp4Id91Y8w/mbMzjleKqKZUQl/FYZT gjhc4q+zZiEoPuNdo0Dp6ooWk+jDA0iGQHZieNsD4gMwVyReZHGMNSAUHnaLVUDgp5Cy fyNHbRHGOTJ/JaaH9Tv+YSY1BG42dR23spn/NDvVJ5Gk9iKTPUAwPEsp3T625peq69YG rsUIF0h9d16G3YWaRVWg1RdhRX+T7LYXS2RUEQF6HgiAsH6Ku7D14rD8/hzsW5bSlnvl +bRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=mJzNqsga5Pk0rOaqpTy2+v9C6TBRQADQEMIuQcyyaoY=; b=mFSUVTND18jLBL7C3OkTsnSr7kNl3zjg2rYQiHE4UYBzPWsYKniSY7zDJFbzh959O2 +mi/B9ZxncUSzYwlxZSAOkLPOWhRsGJrPQcxRP6KtDAAEQW9RBGC9tIWIARY/J+aGqOw jXC6P/DyjtH8rzMifZgP0BjeQy92keP/vBHMdcH2DKX4HpSjCwUVPiyLz5xzUMXECRYv 6ZYAIPJVwcxQNZ4+asVvnpOc63c/TkLUflekIJuM4P+crFcINk40C6pHrfpULYLRtb7b tXZzLg48Q/jkekWHmMOBApOgYBpT5+2KZK3qLtYlqlwUR2wlhb+gOCy4gVjw/WV1FQQP lCTQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q4si4607631qkd.363.2017.06.29.04.02.27; Thu, 29 Jun 2017 04:02:28 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id DDDE3611F4; Thu, 29 Jun 2017 11:02:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED, URIBL_SBL, URIBL_SBL_A autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id ACF1D60DB2; Thu, 29 Jun 2017 11:01:17 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6658960C4E; Thu, 29 Jun 2017 11:01:10 +0000 (UTC) Received: from forward3m.cmail.yandex.net (forward3m.cmail.yandex.net [5.255.216.21]) by lists.linaro.org (Postfix) with ESMTPS id ACD7660C37 for ; Thu, 29 Jun 2017 11:00:45 +0000 (UTC) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::27]) by forward3m.cmail.yandex.net (Yandex) with ESMTP id 4C4F321A0F for ; Thu, 29 Jun 2017 14:00:44 +0300 (MSK) Received: from smtp3o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp3o.mail.yandex.net (Yandex) with ESMTP id 712C92940EB3 for ; Thu, 29 Jun 2017 14:00:42 +0300 (MSK) Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id F0tMw2a6CH-0gL8gmte; Thu, 29 Jun 2017 14:00:42 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 29 Jun 2017 14:00:07 +0300 Message-Id: <1498734013-20982-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1498734013-20982-1-git-send-email-odpbot@yandex.ru> References: <1498734013-20982-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 61 Subject: [lng-odp] [PATCH v2 2/8] doc: fix documentation building X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Set VPATH to just $(srcdir) so that make can locate adoc files itself. Drop long paths starting from $(top_srcdir), which are unnecessary now. Properly declare SUFFIXES used in documentation building (so that automake can pass that to make to enable proper rules substitution). Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 61 (lumag:docs-fix) ** https://github.com/Linaro/odp/pull/61 ** Patch: https://github.com/Linaro/odp/pull/61.patch ** Base sha: 9b78da8e2373ab0530cfbbd72b2229059b57ddf1 ** Merge commit sha: f6c89347fdd7243f9ed80e2c0356345f034696a9 **/ doc/Makefile.am | 8 ++++---- doc/Makefile.inc | 4 +++- doc/implementers-guide/Makefile.am | 2 +- doc/process-guide/Makefile.am | 12 ++++++------ doc/users-guide/Makefile.am | 16 +++++++--------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 59d6a6c6..c6124f46 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -9,7 +9,7 @@ SUBDIRS += implementers-guide users-guide process-guide endif EXTRA_DIST = \ - $(top_srcdir)/doc/doxygenlayout.xml \ - $(top_srcdir)/doc/odpdoxygen.css \ - $(top_srcdir)/doc/glossary.adoc \ - $(top_srcdir)/doc/Doxyfile_common + doxygenlayout.xml \ + odpdoxygen.css \ + glossary.adoc \ + Doxyfile_common diff --git a/doc/Makefile.inc b/doc/Makefile.inc index 4a1acf98..23703127 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc @@ -1,6 +1,8 @@ IMAGES_DIR = $(top_srcdir)/doc/images -VPATH=$(top_builddir)/doc/images +VPATH = $(srcdir) + +SUFFIXES = .svg .msc .gv .html .adoc .msc.svg: mscgen -T svg -i $^ -o $@ diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 4bdb970e..2d48d840 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -1,6 +1,6 @@ include ../Makefile.inc -SRC = $(top_srcdir)/doc/implementers-guide/implementers-guide.adoc +SRC = implementers-guide.adoc TARGET = implementers-guide.html EXTRA_DIST = $(SRC) diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am index da8bb0ae..6db7c867 100644 --- a/doc/process-guide/Makefile.am +++ b/doc/process-guide/Makefile.am @@ -7,9 +7,9 @@ IMAGES = $(IMAGES_DIR)/aboutODP1.svg \ $(IMAGES_DIR)/aboutODP5.svg \ $(IMAGES_DIR)/overview.svg -EXTRA_DIST = $(top_srcdir)/doc/process-guide/bylaws-guide.adoc \ - $(top_srcdir)/doc/process-guide/release-guide.adoc \ - $(top_srcdir)/doc/process-guide/faq.adoc \ +EXTRA_DIST = bylaws-guide.adoc \ + release-guide.adoc \ + faq.adoc \ $(top_srcdir)/CONTRIBUTING \ $(IMAGES) @@ -26,13 +26,13 @@ clean-local: rm -f $(builddir)/CONTRIBUTING.html rm -f $(builddir)/CHANGELOG.html -release-guide.html: $(top_srcdir)/doc/process-guide/release-guide.adoc \ +release-guide.html: release-guide.adoc \ $(IMAGES_DIR)/simple_release_git.svg \ $(IMAGES_DIR)/release_git.svg -bylaws-guide.html: $(top_srcdir)/doc/process-guide/bylaws-guide.adoc +bylaws-guide.html: bylaws-guide.adoc -faq.html: $(top_srcdir)/doc/process-guide/faq.adoc \ +faq.html: faq.adoc \ $(IMAGES) #special case is not postfixed .adoc diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index ae718268..871e2eab 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -1,12 +1,12 @@ include ../Makefile.inc -SRC = $(top_srcdir)/doc/users-guide/users-guide.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-cls.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-crypto.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-packet.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-pktio.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-timer.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-tm.adoc +SRC = users-guide.adoc \ + users-guide-cls.adoc \ + users-guide-crypto.adoc \ + users-guide-packet.adoc \ + users-guide-pktio.adoc \ + users-guide-timer.adoc \ + users-guide-tm.adoc TARGET = users-guide.html IMAGES = $(IMAGES_DIR)/overview.svg \ $(IMAGES_DIR)/atomic_queue.svg \ @@ -50,5 +50,3 @@ $(TARGET): $(SRC) $(IMAGES) clean-local: rm -f $(builddir)/$(TARGET) - -$(SRC): $(IMAGES)