From patchwork Thu Jun 29 00:00:00 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: 106585 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp488750qge; Wed, 28 Jun 2017 17:01:57 -0700 (PDT) X-Received: by 10.107.13.143 with SMTP id 137mr187739ion.203.1498694517454; Wed, 28 Jun 2017 17:01:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498694517; cv=none; d=google.com; s=arc-20160816; b=SQHB93o9nDDQMHYyIPRNTDI+5mr0vHwwGgHso44jbpjDSfLHWS2PX/ovpycDLNfhWS gYqkI7jHKORClfqLDCfhCwYMx7Iz54v6MFlAuKfreSgh9d4eOKoNBkWxzDkm5jZ5uXlr AJ4pLoFqE2WarOJsL60V3RJeE4YVv5Vf7EEJzdEzdJhD8JdcTzbjrbT4DTjTwNsijEr0 uRpdv6FEd8iVTJBNIr/6hgjHbPfVQUwUvtmXruujFqIBxVUC0Ofnb24iUbI5arDJE4Lf vNuJg83D4QHleb9hajfXRe1nkoDbnRtvWcjvj8peYPB9cElEOKYP2KV0R7ZA8l3BqqnX jqKQ== 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=GbBLyoN+gVyQewb7pd9xo0okUdK9nv8qg/178Wjkoys=; b=ELYWENT0YwVt3MDH1F7bQV72cPcqKJeWpNCCeR17YIPW69zDWetaYexvDywc0d8qt9 58tTqGspr93PKWv8Hex53nuaWo4G4vYyaUFh53vfyse+nJYXmoUWGPvqC3Un1v/deHda NnnN9/ZjgDIjWsusRHzHQovdXw97/xrO4STda4OidMi6iV8fbPm7EmsukL1CXb4qIb5n Va/UEvR6eJ/dsu7rwft7tiObeaIZo25esV2Gi+VJwUtBhKPCN/0cewKGgkS7DG0neNHz JeYavfaBs8035d73RN63JD0ZOQtUS0/dAluBoEKQJ0ffK/NPsrwyCSriyqGORmB/1VCK HInA== 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 r72si3147447ioi.218.2017.06.28.17.01.57; Wed, 28 Jun 2017 17:01:57 -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 0436D61BC5; Thu, 29 Jun 2017 00:01:57 +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 6A84860EC3; Thu, 29 Jun 2017 00:00:43 +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 E7F9360BE4; Thu, 29 Jun 2017 00:00:36 +0000 (UTC) Received: from forward3p.cmail.yandex.net (forward3p.cmail.yandex.net [77.88.31.18]) by lists.linaro.org (Postfix) with ESMTPS id 14B446050B for ; Thu, 29 Jun 2017 00:00:35 +0000 (UTC) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [IPv6:2a02:6b8:0:1402::15:6]) by forward3p.cmail.yandex.net (Yandex) with ESMTP id 12ADA20B5F for ; Thu, 29 Jun 2017 03:00:34 +0300 (MSK) Received: from smtp4p.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp4p.mail.yandex.net (Yandex) with ESMTP id DC7E66500E5A for ; Thu, 29 Jun 2017 03:00:33 +0300 (MSK) Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id lqJUGDUALt-0Wg8qWPm; Thu, 29 Jun 2017 03:00:32 +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 03:00:00 +0300 Message-Id: <1498694405-16518-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1498694405-16518-1-git-send-email-odpbot@yandex.ru> References: <1498694405-16518-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 61 Subject: [lng-odp] [PATCH v1 2/7] 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: beb74541650c77e8682b58cfcdb8424e62c5b053 **/ 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)