diff mbox

doc: factor out asciidoc build rule

Message ID 1452199499-31065-1-git-send-email-mike.holmes@linaro.org
State Accepted
Commit ac67fc42fe4abe05adcd32245609fb83ab879e59
Headers show

Commit Message

Mike Holmes Jan. 7, 2016, 8:44 p.m. UTC 
Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
---
 doc/Makefile.inc                   | 4 ++++
 doc/implementers-guide/Makefile.am | 8 +++-----
 doc/process-guide/Makefile.am      | 8 +++-----
 doc/users-guide/Makefile.am        | 8 +++-----
 4 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 doc/Makefile.inc

Comments

Bill Fischofer Jan. 7, 2016, 9:31 p.m. UTC | #1 
On Thu, Jan 7, 2016 at 2:44 PM, Mike Holmes <mike.holmes@linaro.org> wrote:

> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>

>


Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>



> ---

>  doc/Makefile.inc                   | 4 ++++

>  doc/implementers-guide/Makefile.am | 8 +++-----

>  doc/process-guide/Makefile.am      | 8 +++-----

>  doc/users-guide/Makefile.am        | 8 +++-----

>  4 files changed, 13 insertions(+), 15 deletions(-)

>  create mode 100644 doc/Makefile.inc

>

> diff --git a/doc/Makefile.inc b/doc/Makefile.inc

> new file mode 100644

> index 0000000..8491b92

> --- /dev/null

> +++ b/doc/Makefile.inc

> @@ -0,0 +1,4 @@

> +.adoc.html:

> +       @mkdir -p $(top_srcdir)/doc/output

> +       asciidoc -a data-uri -b html5  -a icons -a toc2  -a max-width=55em

> --out-file=$@ $<

> +       mv $@ $(top_srcdir)/doc/output/$@

> diff --git a/doc/implementers-guide/Makefile.am

> b/doc/implementers-guide/Makefile.am

> index f0832f1..eb614e1 100644

> --- a/doc/implementers-guide/Makefile.am

> +++ b/doc/implementers-guide/Makefile.am

> @@ -1,12 +1,10 @@

> -TARGET = $(top_srcdir)/doc/output/implementers-guide.html

> +include ../Makefile.inc

> +

> +TARGET = implementers-guide.html

>

>  EXTRA_DIST = implementers-guide.adoc

>

>  all-local: $(TARGET)

>

> -$(TARGET): implementers-guide.adoc

> -       @mkdir -p $(top_srcdir)/doc/output

> -       asciidoc -a data-uri -b html5  -a icons -a toc2  -a max-width=55em

> --out-file=$@ $<

> -

>  clean-local:

>         rm -f $(TARGET)

> diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am

> index 54e2c1d..95915c0 100644

> --- a/doc/process-guide/Makefile.am

> +++ b/doc/process-guide/Makefile.am

> @@ -1,12 +1,10 @@

> -TARGET = $(top_srcdir)/doc/output/release-guide.html

> +include ../Makefile.inc

> +

> +TARGET = release-guide.html

>

>  EXTRA_DIST = release-guide.adoc

>

>  all-local: $(TARGET)

>

> -$(TARGET): release-guide.adoc

> -       @mkdir -p $(top_srcdir)/doc/output

> -       asciidoc -b html5  -a icons -a toc2  -a max-width=55em

> --out-file=$@ $<

> -

>  clean-local:

>         rm -f $(TARGET)

> diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am

> index 383894a..960a90f 100644

> --- a/doc/users-guide/Makefile.am

> +++ b/doc/users-guide/Makefile.am

> @@ -1,12 +1,10 @@

> -TARGET = $(top_srcdir)/doc/output/users-guide.html

> +include ../Makefile.inc

> +

> +TARGET = users-guide.html

>

>  EXTRA_DIST = users-guide.adoc

>

>  all-local: $(TARGET)

>

> -$(TARGET): users-guide.adoc

> -       @mkdir -p $(top_srcdir)/doc/output

> -       asciidoc -a data-uri -b html5  -a icons -a toc2  -a max-width=55em

> --out-file=$@ $<

> -

>  clean-local:

>         rm -f $(TARGET)

> --

> 2.5.0

>

> _______________________________________________

> lng-odp mailing list

> lng-odp@lists.linaro.org

> https://lists.linaro.org/mailman/listinfo/lng-odp

>
Maxim Uvarov Jan. 11, 2016, 7:30 a.m. UTC | #2 
Merged,
Maxim.

On 01/08/2016 00:31, Bill Fischofer wrote:
>
>
> On Thu, Jan 7, 2016 at 2:44 PM, Mike Holmes <mike.holmes@linaro.org 
> <mailto:mike.holmes@linaro.org>> wrote:
>
>     Signed-off-by: Mike Holmes <mike.holmes@linaro.org
>     <mailto:mike.holmes@linaro.org>>
>
>
> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org 
> <mailto:bill.fischofer@linaro.org>>
>
>     ---
>      doc/Makefile.inc                   | 4 ++++
>      doc/implementers-guide/Makefile.am | 8 +++-----
>      doc/process-guide/Makefile.am      | 8 +++-----
>      doc/users-guide/Makefile.am        | 8 +++-----
>      4 files changed, 13 insertions(+), 15 deletions(-)
>      create mode 100644 doc/Makefile.inc
>
>     diff --git a/doc/Makefile.inc b/doc/Makefile.inc
>     new file mode 100644
>     index 0000000..8491b92
>     --- /dev/null
>     +++ b/doc/Makefile.inc
>     @@ -0,0 +1,4 @@
>     +.adoc.html:
>     +       @mkdir -p $(top_srcdir)/doc/output
>     +       asciidoc -a data-uri -b html5  -a icons -a toc2 -a
>     max-width=55em --out-file=$@ $<
>     +       mv $@ $(top_srcdir)/doc/output/$@
>     diff --git a/doc/implementers-guide/Makefile.am
>     b/doc/implementers-guide/Makefile.am
>     index f0832f1..eb614e1 100644
>     --- a/doc/implementers-guide/Makefile.am
>     +++ b/doc/implementers-guide/Makefile.am
>     @@ -1,12 +1,10 @@
>     -TARGET = $(top_srcdir)/doc/output/implementers-guide.html
>     +include ../Makefile.inc
>     +
>     +TARGET = implementers-guide.html
>
>      EXTRA_DIST = implementers-guide.adoc
>
>      all-local: $(TARGET)
>
>     -$(TARGET): implementers-guide.adoc
>     -       @mkdir -p $(top_srcdir)/doc/output
>     -       asciidoc -a data-uri -b html5  -a icons -a toc2 -a
>     max-width=55em --out-file=$@ $<
>     -
>      clean-local:
>             rm -f $(TARGET)
>     diff --git a/doc/process-guide/Makefile.am
>     b/doc/process-guide/Makefile.am
>     index 54e2c1d..95915c0 100644
>     --- a/doc/process-guide/Makefile.am
>     +++ b/doc/process-guide/Makefile.am
>     @@ -1,12 +1,10 @@
>     -TARGET = $(top_srcdir)/doc/output/release-guide.html
>     +include ../Makefile.inc
>     +
>     +TARGET = release-guide.html
>
>      EXTRA_DIST = release-guide.adoc
>
>      all-local: $(TARGET)
>
>     -$(TARGET): release-guide.adoc
>     -       @mkdir -p $(top_srcdir)/doc/output
>     -       asciidoc -b html5  -a icons -a toc2  -a max-width=55em
>     --out-file=$@ $<
>     -
>      clean-local:
>             rm -f $(TARGET)
>     diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am
>     index 383894a..960a90f 100644
>     --- a/doc/users-guide/Makefile.am
>     +++ b/doc/users-guide/Makefile.am
>     @@ -1,12 +1,10 @@
>     -TARGET = $(top_srcdir)/doc/output/users-guide.html
>     +include ../Makefile.inc
>     +
>     +TARGET = users-guide.html
>
>      EXTRA_DIST = users-guide.adoc
>
>      all-local: $(TARGET)
>
>     -$(TARGET): users-guide.adoc
>     -       @mkdir -p $(top_srcdir)/doc/output
>     -       asciidoc -a data-uri -b html5  -a icons -a toc2 -a
>     max-width=55em --out-file=$@ $<
>     -
>      clean-local:
>             rm -f $(TARGET)
>     --
>     2.5.0
>
>     _______________________________________________
>     lng-odp mailing list
>     lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org>
>     https://lists.linaro.org/mailman/listinfo/lng-odp
>
>
>
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp
diff mbox

Patch

diff --git a/doc/Makefile.inc b/doc/Makefile.inc
new file mode 100644
index 0000000..8491b92
--- /dev/null
+++ b/doc/Makefile.inc
@@ -0,0 +1,4 @@ 
+.adoc.html:
+	@mkdir -p $(top_srcdir)/doc/output
+	asciidoc -a data-uri -b html5  -a icons -a toc2  -a max-width=55em --out-file=$@ $<
+	mv $@ $(top_srcdir)/doc/output/$@
diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am
index f0832f1..eb614e1 100644
--- a/doc/implementers-guide/Makefile.am
+++ b/doc/implementers-guide/Makefile.am
@@ -1,12 +1,10 @@ 
-TARGET = $(top_srcdir)/doc/output/implementers-guide.html
+include ../Makefile.inc
+
+TARGET = implementers-guide.html
 
 EXTRA_DIST = implementers-guide.adoc
 
 all-local: $(TARGET)
 
-$(TARGET): implementers-guide.adoc
-	@mkdir -p $(top_srcdir)/doc/output
-	asciidoc -a data-uri -b html5  -a icons -a toc2  -a max-width=55em --out-file=$@ $<
-
 clean-local:
 	rm -f $(TARGET)
diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am
index 54e2c1d..95915c0 100644
--- a/doc/process-guide/Makefile.am
+++ b/doc/process-guide/Makefile.am
@@ -1,12 +1,10 @@ 
-TARGET = $(top_srcdir)/doc/output/release-guide.html
+include ../Makefile.inc
+
+TARGET = release-guide.html
 
 EXTRA_DIST = release-guide.adoc
 
 all-local: $(TARGET)
 
-$(TARGET): release-guide.adoc
-	@mkdir -p $(top_srcdir)/doc/output
-	asciidoc -b html5  -a icons -a toc2  -a max-width=55em --out-file=$@ $<
-
 clean-local:
 	rm -f $(TARGET)
diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am
index 383894a..960a90f 100644
--- a/doc/users-guide/Makefile.am
+++ b/doc/users-guide/Makefile.am
@@ -1,12 +1,10 @@ 
-TARGET = $(top_srcdir)/doc/output/users-guide.html
+include ../Makefile.inc
+
+TARGET = users-guide.html
 
 EXTRA_DIST = users-guide.adoc
 
 all-local: $(TARGET)
 
-$(TARGET): users-guide.adoc
-	@mkdir -p $(top_srcdir)/doc/output
-	asciidoc -a data-uri -b html5  -a icons -a toc2  -a max-width=55em --out-file=$@ $<
-
 clean-local:
 	rm -f $(TARGET)