Message ID | 1459362889-31131-1-git-send-email-mike.holmes@linaro.org |
---|---|
State | Accepted |
Commit | 86d4a2709ce4dad1f5586650900e20b15ab8702e |
Headers | show |
On 2016-03-30 14:34, Mike Holmes wrote: > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> Reviewed-by: Christophe Milard <christophe.milard@linaro.org> > --- > doc/Makefile.inc | 3 +++ > doc/implementers-guide/Makefile.am | 3 +-- > doc/process-guide/Makefile.am | 2 -- > doc/users-guide/Makefile.am | 3 +-- > 4 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/doc/Makefile.inc b/doc/Makefile.inc > index 86b2427..c0b641e 100644 > --- a/doc/Makefile.inc > +++ b/doc/Makefile.inc > @@ -6,4 +6,7 @@ VPATH=$(top_builddir)/doc/images > .gv.svg: > dot -T svg $^ -o $@ > > +.adoc.html: > + asciidoc $(ASCIIDOC_FLAGS) --out-file=$@ $< > + > ASCIIDOC_FLAGS =-a data-uri -b html5 -a icons -a toc2 -a max-width=55em > diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am > index 6a614ce..ec9f924 100644 > --- a/doc/implementers-guide/Makefile.am > +++ b/doc/implementers-guide/Makefile.am > @@ -5,8 +5,7 @@ TARGET = implementers-guide.html > > EXTRA_DIST = $(SRC) > > -all-local: $(SRC) > - asciidoc $(ASCIIDOC_FLAGS) --out-file=$(TARGET) $(SRC) > +$(TARGET): $(SRC) > > clean-local: > rm -f $(builddir)/$(TARGET) > diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am > index efef04d..f9e12d2 100644 > --- a/doc/process-guide/Makefile.am > +++ b/doc/process-guide/Makefile.am > @@ -13,7 +13,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 3f8ce3d..4f9a364 100644 > --- a/doc/users-guide/Makefile.am > +++ b/doc/users-guide/Makefile.am > @@ -19,8 +19,7 @@ endif > > EXTRA_DIST = $(SRC) $(IMAGES) > > -all-local: $(SRC) > - asciidoc $(ASCIIDOC_FLAGS) --out-file=$(TARGET) $(SRC) > +$(TARGET): $(SRC) > > clean-local: > rm -f $(builddir)/$(TARGET) > -- > 2.5.0 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/doc/Makefile.inc b/doc/Makefile.inc index 86b2427..c0b641e 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc @@ -6,4 +6,7 @@ VPATH=$(top_builddir)/doc/images .gv.svg: dot -T svg $^ -o $@ +.adoc.html: + asciidoc $(ASCIIDOC_FLAGS) --out-file=$@ $< + ASCIIDOC_FLAGS =-a data-uri -b html5 -a icons -a toc2 -a max-width=55em diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 6a614ce..ec9f924 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -5,8 +5,7 @@ TARGET = implementers-guide.html EXTRA_DIST = $(SRC) -all-local: $(SRC) - asciidoc $(ASCIIDOC_FLAGS) --out-file=$(TARGET) $(SRC) +$(TARGET): $(SRC) clean-local: rm -f $(builddir)/$(TARGET) diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am index efef04d..f9e12d2 100644 --- a/doc/process-guide/Makefile.am +++ b/doc/process-guide/Makefile.am @@ -13,7 +13,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 3f8ce3d..4f9a364 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -19,8 +19,7 @@ endif EXTRA_DIST = $(SRC) $(IMAGES) -all-local: $(SRC) - asciidoc $(ASCIIDOC_FLAGS) --out-file=$(TARGET) $(SRC) +$(TARGET): $(SRC) clean-local: rm -f $(builddir)/$(TARGET)
Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- doc/Makefile.inc | 3 +++ doc/implementers-guide/Makefile.am | 3 +-- doc/process-guide/Makefile.am | 2 -- doc/users-guide/Makefile.am | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-)