From patchwork Thu Jun 29 11:00:06 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: 106635 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp4558837obb; Thu, 29 Jun 2017 04:04:12 -0700 (PDT) X-Received: by 10.55.103.9 with SMTP id b9mr19087348qkc.130.1498734252424; Thu, 29 Jun 2017 04:04:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498734252; cv=none; d=google.com; s=arc-20160816; b=rb01oKbYDf/djnMIEsvwplD/YHqn+jWqWE4U52rXkOMMuNlfESujCp4N1ZYC8w711T KGbObOl5hLHTdrE2F2vQv71a2wfHs0CcdffEmRO6yMdMt2QeK4CfNoVoxgt05i6A6BYB Q7hRhXrJCZl7xh9c+P5+S/a7f60WScaY0Z23WvdZ4xVQzRf0PsTf+DIQBrDp66s2NjEU uNaHuvDN55JeYI4vGCblrW0Oh+AUnZ3h4EjxMXw3WmxObnS3qMQti8qj1eAMpjXk6qqx s3Qf93rQEahN1mcLTCucxopMqAFSGTjWpiEW0Usc7lvILjABEAkSSPhNBX0T2xG4064K Dg2A== 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=RfLgcU9OOGPeuzR300AO7fWX8EFGuhy/Ov/DWdaLAUk=; b=dk90QZHgOUK4Fvfs6XR/swZPf+OlA3pr98jS4B0VsFznmp6M5qD872sbIh7gdnqaG8 W1wZ84W6E9dX4lsl2jENkg6yYBqOeZ8JlYVJQlwLybEjxIBvzs4MGu1hGrPMvXDN9DYE 2FU6xrNwH+A/uHqG9vwmNXBlhHjGVaYwdbI7o1h1nXeeBflwEOY4SSaxUmkThFpRoEDd 8M97YcLqd6UN6cNbBH/lE69VvlPLqkB+/rmja0As7uSPto7Wlj70DwvTy3xvmx0xKh4t FUrj7NAiQ7jJu6qgJD+6qwojyRq2VZz6OV2FRg/294wbvj/GGJrjxyiLYc9NmRUWxA03 HFuA== 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 k46si4575099qtk.173.2017.06.29.04.04.12; Thu, 29 Jun 2017 04:04:12 -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 1A25260D95; Thu, 29 Jun 2017 11:04:12 +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 818A361BC6; Thu, 29 Jun 2017 11:01:28 +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 43AB560C37; Thu, 29 Jun 2017 11:01:12 +0000 (UTC) Received: from forward5j.cmail.yandex.net (forward5j.cmail.yandex.net [5.255.227.23]) by lists.linaro.org (Postfix) with ESMTPS id 1057F60C42 for ; Thu, 29 Jun 2017 11:00:47 +0000 (UTC) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [37.140.190.28]) by forward5j.cmail.yandex.net (Yandex) with ESMTP id 12AF320F80 for ; Thu, 29 Jun 2017 14:00:45 +0300 (MSK) Received: from smtp3o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp3o.mail.yandex.net (Yandex) with ESMTP id 0D5202940EA6 for ; Thu, 29 Jun 2017 14:00:41 +0300 (MSK) Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id F0tMw2a6CH-0eLWF9Hm; Thu, 29 Jun 2017 14:00:40 +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:06 +0300 Message-Id: <1498734013-20982-2-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 1/8] 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: 9b78da8e2373ab0530cfbbd72b2229059b57ddf1 ** Merge commit sha: f6c89347fdd7243f9ed80e2c0356345f034696a9 **/ 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)