From patchwork Mon Feb 22 20:03:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 62627 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1449388lbl; Mon, 22 Feb 2016 12:06:26 -0800 (PST) X-Received: by 10.107.160.141 with SMTP id j135mr36179604ioe.171.1456171586127; Mon, 22 Feb 2016 12:06:26 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 89si42821551iok.84.2016.02.22.12.06.25; Mon, 22 Feb 2016 12:06:26 -0800 (PST) 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 Received: by lists.linaro.org (Postfix, from userid 109) id 84EED61895; Mon, 22 Feb 2016 20:06:25 +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=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED 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 4298561944; Mon, 22 Feb 2016 20:03:52 +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 05B006188F; Mon, 22 Feb 2016 20:03:28 +0000 (UTC) Received: from mail-qg0-f49.google.com (mail-qg0-f49.google.com [209.85.192.49]) by lists.linaro.org (Postfix) with ESMTPS id 20F9761871 for ; Mon, 22 Feb 2016 20:03:21 +0000 (UTC) Received: by mail-qg0-f49.google.com with SMTP id b67so120323996qgb.1 for ; Mon, 22 Feb 2016 12:03:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tSZY51nXm9FyNs4j+fb9/S0AxxjoHG8p2Rz2VGkYUOE=; b=kRdA3ySX5ToIKouhIgI38u46Ml2aP7beB0nJuyiTXDoNmwF8tJ91eTIc71PvONIUsA lEtwfdJsz/fAfJ/DXfTm7b1Rp7i1W00/MTahnRzSBXlH3FTjukNeNolr9iYUUD0Ewzc1 tpOX+VUhn/aTg1UMf5hBZ8U2mKPfQD158SvTuUKL/BrHMMCyU/lv2i0zJCK43d593EVY bDXn1uZY58u/POdq6/UQkfp9U4RNUSmF88XDSTBnovBYrchZq0h8joxGLAcwEXBDnvtC N/cpl6RnI8yhL1eIvpqxFb3ItEk+cTHYNdapLHpU9L1xefMX2Wxybme6p5dXaqLyYVII d4pA== X-Gm-Message-State: AG10YOTlun1U3QxUJ0oSDzG2TAiMrnzCepEoOU/BQFS4T0yDdztIAe2fQUQGd8jJ2JUmHRSwdws= X-Received: by 10.140.95.117 with SMTP id h108mr36680722qge.65.1456171400812; Mon, 22 Feb 2016 12:03:20 -0800 (PST) Received: from localhost.localdomain (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by smtp.gmail.com with ESMTPSA id c191sm10854545qhc.12.2016.02.22.12.03.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Feb 2016 12:03:20 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 22 Feb 2016 15:03:14 -0500 Message-Id: <1456171394-16384-4-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456171394-16384-1-git-send-email-mike.holmes@linaro.org> References: <1456171394-16384-1-git-send-email-mike.holmes@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v2 4/4] doc: depend the docs on the 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: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Mike Holmes Reviewed-and-tested-by: Bill Fischofer --- configure.ac | 1 - doc/Makefile.am | 2 +- doc/Makefile.inc | 8 ++++++-- doc/images/Makefile.am | 16 ---------------- doc/implementers-guide/Makefile.am | 8 +++++--- doc/process-guide/Makefile.am | 21 ++++++++++++++------- doc/users-guide/Makefile.am | 22 +++++++++++++++++++--- 7 files changed, 45 insertions(+), 33 deletions(-) delete mode 100644 doc/images/Makefile.am diff --git a/configure.ac b/configure.ac index 8cfe3e3..b6c6b1e 100644 --- a/configure.ac +++ b/configure.ac @@ -323,7 +323,6 @@ AC_CONFIG_FILES([Makefile doc/implementers-guide/Makefile doc/users-guide/Makefile doc/process-guide/Makefile - doc/images/Makefile doc/application-api-guide/Makefile example/Makefile example/classifier/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index 6f4eac3..e966e95 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = application-api-guide if user_guide -SUBDIRS += images implementers-guide users-guide process-guide +SUBDIRS += implementers-guide users-guide process-guide endif diff --git a/doc/Makefile.inc b/doc/Makefile.inc index 3f31e9a..cab5286 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc @@ -1,2 +1,6 @@ -.adoc.html: - asciidoc -a data-uri -b html5 -a icons -a toc2 -a max-width=55em --out-file=$@ $< +VPATH=$(top_builddir)/doc/images + +.msc.svg: + mscgen -T svg -i $^ -o $@ + +ASCIIDOC_FLAGS =-a data-uri -b html5 -a icons -a toc2 -a max-width=55em diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am deleted file mode 100644 index 8fb8a99..0000000 --- a/doc/images/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -.msc.svg: - mscgen -T svg -i $^ -o $@ - -MSG_SRCS = resource_management.msc -MSG_TARGETS = $(MSG_SRCS:msc=svg) - -EXTRA_DIST = $(MSG_SRCS) - -if HAVE_MSCGEN -TARGETS = $(MSG_TARGETS) -endif - -all-local: $(TARGETS) - -clean-local: - rm -f $(MSG_TARGETS) diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index eb614e1..6a614ce 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -1,10 +1,12 @@ include ../Makefile.inc +SRC = $(top_srcdir)/doc/implementers-guide/implementers-guide.adoc TARGET = implementers-guide.html -EXTRA_DIST = implementers-guide.adoc +EXTRA_DIST = $(SRC) -all-local: $(TARGET) +all-local: $(SRC) + asciidoc $(ASCIIDOC_FLAGS) --out-file=$(TARGET) $(SRC) clean-local: - rm -f $(TARGET) + rm -f $(builddir)/$(TARGET) diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am index 9fc3b80..efef04d 100644 --- a/doc/process-guide/Makefile.am +++ b/doc/process-guide/Makefile.am @@ -1,12 +1,19 @@ include ../Makefile.inc -TARGET = bylaws-guide.html \ - release-guide.html +EXTRA_DIST = $(top_srcdir)/doc/process-guide/bylaws-guide.adoc \ + $(top_srcdir)/doc/process-guide/release-guide.adoc -EXTRA_DIST = bylaws-guide.adoc \ - release-guide.adoc - -all-local: $(TARGET) +all-local: bylaws-guide.html \ + release-guide.html clean-local: - rm -f $(TARGET) + rm -f $(builddir)/bylaws-guide.html + rm -f $(builddir)/release-guide.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 + asciidoc $(ASCIIDOC_FLAGS) --out-file=$@ $< + +bylaws-guide.html: $(top_srcdir)/doc/process-guide/bylaws-guide.adoc + asciidoc $(ASCIIDOC_FLAGS) --out-file=$@ $< diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 960a90f..4f5b1fe 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -1,10 +1,26 @@ include ../Makefile.inc +SRC = $(top_srcdir)/doc/users-guide/users-guide.adoc TARGET = users-guide.html +IMAGES = $(top_srcdir)/doc/images/overview.svg \ + $(top_srcdir)/doc/images/odp_components.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/parallel_queue.svg \ + $(top_srcdir)/doc/images/atomic_queue.svg \ + $(top_srcdir)/doc/images/ordered_queue.svg -EXTRA_DIST = users-guide.adoc +if HAVE_MSCGEN +IMAGES += $(top_srcdir)/doc/images/resource_management.svg +endif -all-local: $(TARGET) +EXTRA_DIST = $(SRC) $(IMAGES) + +all-local: $(SRC) + asciidoc $(ASCIIDOC_FLAGS) --out-file=$(TARGET) $(SRC) clean-local: - rm -f $(TARGET) + rm -f $(builddir)/$(TARGET) + +$(SRC): $(IMAGES)