From patchwork Mon Feb 29 21:19: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: 63260 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1474958lbc; Mon, 29 Feb 2016 13:20:51 -0800 (PST) X-Received: by 10.55.73.74 with SMTP id w71mr22327241qka.60.1456780851759; Mon, 29 Feb 2016 13:20:51 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id v65si15767387qka.89.2016.02.29.13.20.50; Mon, 29 Feb 2016 13:20:51 -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 C12AE61D6F; Mon, 29 Feb 2016 21:20:50 +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 2966361D1E; Mon, 29 Feb 2016 21:20:45 +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 DD0AB61D2B; Mon, 29 Feb 2016 21:20:42 +0000 (UTC) Received: from mail-qg0-f52.google.com (mail-qg0-f52.google.com [209.85.192.52]) by lists.linaro.org (Postfix) with ESMTPS id F0E3D61B55 for ; Mon, 29 Feb 2016 21:20:41 +0000 (UTC) Received: by mail-qg0-f52.google.com with SMTP id y89so126721535qge.2 for ; Mon, 29 Feb 2016 13:20:41 -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; bh=u3xvDHkzsoks++EJ3EdclkcLHAgqfJ3t+xv8EOqXHnk=; b=WqEH/dj/DAFlPf0IW6fvkHANlpqGHdg2zj/1ZXtKi/rDwY6O4+++2cdoenxfn86LJt J5ZPqEc5Sj+KbKdTVkfj9aCY3NQgneQmTP+UPXckqvkZ8qK94BEqZV44zSblbP6+4F3D KUDD40yecDFbW1pobXd4+QOjiB6hqdrC+XhxIyB1a30qM7HTAoSH8YJX+u51PGOFWmFU SkQdBSPlVIXn0iQo9l3NfU3gV7BPJ5lP5SlLYckZLxeYtQHmSMDrv0g2GlSq7VvXsTrS NYnrX4vtCBPrkmM+c+KNG6XlTKaOBABDXGT6hbYQTNXvMEzDqFOu5ouhyz1fKF/cmRXg ia1g== X-Gm-Message-State: AD7BkJI7RdhS1pWwEUO811qS4sLussuZeIB4gcWaoJi3CPwc+gy0rezaGUlf+UqmPZjg8BwfMa4= X-Received: by 10.140.91.109 with SMTP id y100mr21916773qgd.42.1456780841582; Mon, 29 Feb 2016 13:20:41 -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 c66sm11615578qha.27.2016.02.29.13.20.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Feb 2016 13:20:41 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Mon, 29 Feb 2016 16:19:14 -0500 Message-Id: <1456780755-10184-1-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.5.0 X-Topics: patch Subject: [lng-odp] [PATCH 1/2] doc: correctly install docs 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" Depend on the target not the src Suggested-by: Nicolas Morey-Chaisemartin Signed-off-by: Mike Holmes --- doc/Makefile.inc | 3 +++ doc/implementers-guide/Makefile.am | 4 ++-- doc/process-guide/Makefile.am | 15 +++++++++------ doc/users-guide/Makefile.am | 4 ++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/doc/Makefile.inc b/doc/Makefile.inc index cab5286..e80bf05 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc @@ -4,3 +4,6 @@ VPATH=$(top_builddir)/doc/images mscgen -T svg -i $^ -o $@ ASCIIDOC_FLAGS =-a data-uri -b html5 -a icons -a toc2 -a max-width=55em + +.adoc.html: + asciidoc $(ASCIIDOC_FLAGS) --out-file=$@ $< \ No newline at end of file diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 6a614ce..4bdb970 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -5,8 +5,8 @@ TARGET = implementers-guide.html EXTRA_DIST = $(SRC) -all-local: $(SRC) - asciidoc $(ASCIIDOC_FLAGS) --out-file=$(TARGET) $(SRC) +doc_DATA = $(TARGET) +$(TARGET): $(SRC) clean-local: rm -f $(builddir)/$(TARGET) diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am index efef04d..f3fefc9 100644 --- a/doc/process-guide/Makefile.am +++ b/doc/process-guide/Makefile.am @@ -1,10 +1,15 @@ include ../Makefile.inc -EXTRA_DIST = $(top_srcdir)/doc/process-guide/bylaws-guide.adoc \ - $(top_srcdir)/doc/process-guide/release-guide.adoc +SRC = $(top_srcdir)/doc/process-guide/bylaws-guide.adoc \ + $(top_srcdir)/doc/process-guide/release-guide.adoc -all-local: bylaws-guide.html \ - release-guide.html +TARGET = bylaws-guide.html \ + release-guide.html + +EXTRA_DIST = $(SRC) + +doc_DATA = $(TARGET) +$(TARGET): $(SRC) clean-local: rm -f $(builddir)/bylaws-guide.html @@ -13,7 +18,5 @@ clean-local: 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 4f5b1fe..4cfcf0f 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -17,8 +17,8 @@ endif EXTRA_DIST = $(SRC) $(IMAGES) -all-local: $(SRC) - asciidoc $(ASCIIDOC_FLAGS) --out-file=$(TARGET) $(SRC) +doc_DATA = $(TARGET) +$(TARGET): $(SRC) $(IMAGES) clean-local: rm -f $(builddir)/$(TARGET)