From patchwork Wed Jun 28 12:00:14 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: 106520 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp930366qge; Wed, 28 Jun 2017 05:04:27 -0700 (PDT) X-Received: by 10.237.59.28 with SMTP id p28mr12799995qte.95.1498651467405; Wed, 28 Jun 2017 05:04:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498651467; cv=none; d=google.com; s=arc-20160816; b=gjwu6u3tk2f9gViLhg+qQTkeFYa+5ssD4RQUXMvQVrdOhcQRTpNn2fTApCd8zQpdOo 3vV0erx9tkgs4s9xl4eHZRQI3il+2Y4pJASx3YFWNc30av6OiRyGASzcJ/MLE72FVYAq f/gA7Pr+akUGWBqWrQt8OxZ0tNuLSujAt3jBEZMuNgMLdizX5mNj/9x5LsGIApqvSqoh tsvHeoRpiya2a9PI8DVN45CI4srSqKXau0Q8IpuYy6sCI6nR9Rmulp1AnlxTVCXQLj64 X/OE0xDBoMDbNkB6P9Tvltq5pr3NelsvnvPmuoplfHgWR2Hcdz5Y3pwf9Qc9IOSsZiJM B/9Q== 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=ZFRpPBGKCZkOLRH7jBd1tY87gz6wq6x1dau4ZgQtdz8=; b=Q3Q7hCqWH5jmZCiVBtCP/zxBkBPGGVl6ZqJJDoXDeVK5EcuS3lkGi1h5ULS19n/1Q5 QX4vWhJdQGgpGT9vvwFfjEtpQLKpjpoQwR19gKjyrd2erZUaT3Hyd5RonF0PM4UDvukr Jglt66zwlrwJHygUY92tZ5fSvMrwNkucQoilvGWigeuyGPFSkNuybUIo/WSj4zHgiiX2 ohL4haAgnBIfBI80QUOfXKmkvIRmCMNgaj7IYvYptcysLVvXQkUsqBoakh2kCBIOTv/6 /cb4TJ13JFwpAhoWHl24Duj/QFWIBEbIPd9mBMRJdMjIJ2iR4aCgYRzpq7L/HsSjpJiy Z+RQ== 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 g129si1793519qkf.220.2017.06.28.05.04.26; Wed, 28 Jun 2017 05:04:27 -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 E053A60D4E; Wed, 28 Jun 2017 12:04:26 +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, 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 B372E60D77; Wed, 28 Jun 2017 12:01:41 +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 56C2960B06; Wed, 28 Jun 2017 12:01:20 +0000 (UTC) Received: from forward4o.cmail.yandex.net (forward4o.cmail.yandex.net [37.9.109.248]) by lists.linaro.org (Postfix) with ESMTPS id 5148A60D6B for ; Wed, 28 Jun 2017 12:00:50 +0000 (UTC) Received: from smtp2o.mail.yandex.net (smtp2o.mail.yandex.net [37.140.190.27]) by forward4o.cmail.yandex.net (Yandex) with ESMTP id 396A520E9C for ; Wed, 28 Jun 2017 15:00:48 +0300 (MSK) Received: from smtp2o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp2o.mail.yandex.net (Yandex) with ESMTP id 873BD5081119 for ; Wed, 28 Jun 2017 15:00:45 +0300 (MSK) Received: by smtp2o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id vsQvWKSvTY-0ij8iB4v; Wed, 28 Jun 2017 15:00:45 +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: Wed, 28 Jun 2017 15:00:14 +0300 Message-Id: <1498651220-13948-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1498651220-13948-1-git-send-email-odpbot@yandex.ru> References: <1498651220-13948-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 61 Subject: [lng-odp] [PATCH v1 1/7] doc: add IMAGES_DIR instead of specifying full path to images 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 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: c6a309f00f882fabe70fa535ebe8b765f6e9bd11 ** Merge commit sha: ab4e27ee16b8da05ab2d4d61c58f41235cfddbcf **/ doc/Makefile.inc | 2 ++ doc/process-guide/Makefile.am | 16 +++++------ doc/users-guide/Makefile.am | 62 +++++++++++++++++++++---------------------- 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/doc/Makefile.inc b/doc/Makefile.inc index 643b1d4e..4a1acf98 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc @@ -1,3 +1,5 @@ +IMAGES_DIR = $(top_srcdir)/doc/images + VPATH=$(top_builddir)/doc/images .msc.svg: diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am index 1abaf7e4..da8bb0ae 100644 --- a/doc/process-guide/Makefile.am +++ b/doc/process-guide/Makefile.am @@ -1,11 +1,11 @@ include ../Makefile.inc -IMAGES = $(top_srcdir)/doc/images/aboutODP1.svg \ - $(top_srcdir)/doc/images/aboutODP2.svg \ - $(top_srcdir)/doc/images/aboutODP3.svg \ - $(top_srcdir)/doc/images/packet_flow.svg \ - $(top_srcdir)/doc/images/aboutODP5.svg \ - $(top_srcdir)/doc/images/overview.svg +IMAGES = $(IMAGES_DIR)/aboutODP1.svg \ + $(IMAGES_DIR)/aboutODP2.svg \ + $(IMAGES_DIR)/aboutODP3.svg \ + $(IMAGES_DIR)/packet_flow.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 \ @@ -27,8 +27,8 @@ clean-local: rm -f $(builddir)/CHANGELOG.html release-guide.html: $(top_srcdir)/doc/process-guide/release-guide.adoc \ - $(top_srcdir)/doc/images/simple_release_git.svg \ - $(top_srcdir)/doc/images/release_git.svg + $(IMAGES_DIR)/simple_release_git.svg \ + $(IMAGES_DIR)/release_git.svg bylaws-guide.html: $(top_srcdir)/doc/process-guide/bylaws-guide.adoc diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 01b4df36..ae718268 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -8,39 +8,39 @@ SRC = $(top_srcdir)/doc/users-guide/users-guide.adoc \ $(top_srcdir)/doc/users-guide/users-guide-timer.adoc \ $(top_srcdir)/doc/users-guide/users-guide-tm.adoc TARGET = users-guide.html -IMAGES = $(top_srcdir)/doc/images/overview.svg \ - $(top_srcdir)/doc/images/atomic_queue.svg \ - $(top_srcdir)/doc/images/odp_components.svg \ - $(top_srcdir)/doc/images/ODP-Logo-HQ.svg \ - $(top_srcdir)/doc/images/odp_rx_processing.svg \ - $(top_srcdir)/doc/images/odp_scheduling.svg \ - $(top_srcdir)/doc/images/odp_traffic_manager.svg \ - $(top_srcdir)/doc/images/ordered_queue.svg \ - $(top_srcdir)/doc/images/packet_flow.svg \ - $(top_srcdir)/doc/images/packet-adddata.svg \ - $(top_srcdir)/doc/images/packet-align.svg \ - $(top_srcdir)/doc/images/packet-copyops.svg \ - $(top_srcdir)/doc/images/packet-remdata.svg \ - $(top_srcdir)/doc/images/packet-split.svg \ - $(top_srcdir)/doc/images/packet.svg \ - $(top_srcdir)/doc/images/parallel_queue.svg \ - $(top_srcdir)/doc/images/pktin_direct_recv.svg \ - $(top_srcdir)/doc/images/pktin_queue_recv.svg \ - $(top_srcdir)/doc/images/pktin_sched_recv.svg \ - $(top_srcdir)/doc/images/pktio_fsm.svg \ - $(top_srcdir)/doc/images/pktout_direct_send.svg \ - $(top_srcdir)/doc/images/pktout_queue_send.svg \ - $(top_srcdir)/doc/images/release_git.svg \ - $(top_srcdir)/doc/images/segment.svg \ - $(top_srcdir)/doc/images/simple_release_git.svg \ - $(top_srcdir)/doc/images/timeout_fsm.svg \ - $(top_srcdir)/doc/images/timer_fsm.svg \ - $(top_srcdir)/doc/images/tm_hierarchy.svg \ - $(top_srcdir)/doc/images/tm_node.svg \ - $(top_srcdir)/doc/images/pktin_sched_cls.svg +IMAGES = $(IMAGES_DIR)/overview.svg \ + $(IMAGES_DIR)/atomic_queue.svg \ + $(IMAGES_DIR)/odp_components.svg \ + $(IMAGES_DIR)/ODP-Logo-HQ.svg \ + $(IMAGES_DIR)/odp_rx_processing.svg \ + $(IMAGES_DIR)/odp_scheduling.svg \ + $(IMAGES_DIR)/odp_traffic_manager.svg \ + $(IMAGES_DIR)/ordered_queue.svg \ + $(IMAGES_DIR)/packet_flow.svg \ + $(IMAGES_DIR)/packet-adddata.svg \ + $(IMAGES_DIR)/packet-align.svg \ + $(IMAGES_DIR)/packet-copyops.svg \ + $(IMAGES_DIR)/packet-remdata.svg \ + $(IMAGES_DIR)/packet-split.svg \ + $(IMAGES_DIR)/packet.svg \ + $(IMAGES_DIR)/parallel_queue.svg \ + $(IMAGES_DIR)/pktin_direct_recv.svg \ + $(IMAGES_DIR)/pktin_queue_recv.svg \ + $(IMAGES_DIR)/pktin_sched_recv.svg \ + $(IMAGES_DIR)/pktio_fsm.svg \ + $(IMAGES_DIR)/pktout_direct_send.svg \ + $(IMAGES_DIR)/pktout_queue_send.svg \ + $(IMAGES_DIR)/release_git.svg \ + $(IMAGES_DIR)/segment.svg \ + $(IMAGES_DIR)/simple_release_git.svg \ + $(IMAGES_DIR)/timeout_fsm.svg \ + $(IMAGES_DIR)/timer_fsm.svg \ + $(IMAGES_DIR)/tm_hierarchy.svg \ + $(IMAGES_DIR)/tm_node.svg \ + $(IMAGES_DIR)/pktin_sched_cls.svg if HAVE_MSCGEN -IMAGES += $(top_srcdir)/doc/images/resource_management.svg +IMAGES += $(IMAGES_DIR)/resource_management.svg endif EXTRA_DIST = $(SRC) $(IMAGES)