Sorry, hit send before finished, but you get the idea. The Images makefile is greatly simplified in this way.
On 7 December 2015 at 10:56, Mike Holmes <mike.hol...@linaro.org> wrote: > I played with this a little and picking up on a suggestion by Anders we > can generally clean up all the doc make files, the im > > the user guide one for instance can use the suffix rules > > .adoc.html: > asciidoc -a imagesdir=$(top_src_dir)/doc/images -b html5 -a icons -a toc2 > -a max-width=55em --out-file=$@ $< > > docdir = > dist_doc_DATA = users-guide.html > > EXTRA_DIST = users-guide.adoc > > clean-local: users-guide.adoc > > > On 7 December 2015 at 03:56, Nicolas Morey-Chaisemartin <nmo...@kalray.eu> > wrote: > >> You're right. I have a custom "make install" build above that that >> packages everything. >> >> I'll post an updated patch soon. >> >> Nicolas >> >> >> On 12/04/2015 03:11 PM, Mike Holmes wrote: >> >> git clean -xdf && ./bootstrap && mkdir doctest && cd doctest && >> ../configure --enable-user-guides && make -C doc >> >> If you do this the doc will not have the images linked correctly, open >> the html to see this >> odp/doctest/doc/output/users-guide.html >> >> Currently the images get generated and stay in the image directory with >> the html pointing at them with ../images/<image-name> >> >> What do you think about making the html and the images both get installed >> in the output directory ? >> >> >> On 2 December 2015 at 09:15, Nicolas Morey-Chaisemartin < >> <nmo...@kalray.eu>nmo...@kalray.eu> wrote: >> >>> Signed-off-by: Nicolas Morey-Chaisemartin <nmo...@kalray.eu> >> >> --- >>> doc/implementers-guide/Makefile.am | 4 ++-- >>> doc/users-guide/Makefile.am | 4 ++-- >>> 2 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/doc/implementers-guide/Makefile.am >>> b/doc/implementers-guide/Makefile.am >>> index d653968..591e9d6 100644 >>> --- a/doc/implementers-guide/Makefile.am >>> +++ b/doc/implementers-guide/Makefile.am >>> @@ -1,11 +1,11 @@ >>> -TARGET = $(top_srcdir)/doc/output/implementers-guide.html >>> +TARGET = $(top_builddir)/doc/output/implementers-guide.html >>> >>> EXTRA_DIST = implementers-guide.adoc >>> >>> all-local: $(TARGET) >>> >>> $(TARGET): implementers-guide.adoc >>> - @mkdir -p $(top_srcdir)/doc/output >>> + @mkdir -p $(top_builddir)/doc/output >>> asciidoc -b html5 -a icons -a toc2 -a max-width=55em >>> --out-file=$@ $< >>> >>> clean-local: >>> diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am >>> index 8e60312..700e03f 100644 >>> --- a/doc/users-guide/Makefile.am >>> +++ b/doc/users-guide/Makefile.am >>> @@ -1,11 +1,11 @@ >>> -TARGET = $(top_srcdir)/doc/output/users-guide.html >>> +TARGET = $(top_builddir)/doc/output/users-guide.html >>> >>> EXTRA_DIST = users-guide.adoc >>> >>> all-local: $(TARGET) >>> >>> $(TARGET): users-guide.adoc >>> - @mkdir -p $(top_srcdir)/doc/output >>> + @mkdir -p $(top_builddir)/doc/output >>> asciidoc -b html5 -a icons -a toc2 -a max-width=55em >>> --out-file=$@ $< >>> >>> clean-local: >>> -- >>> 2.6.3.372.gcb93895 >>> >>> >> >> >> -- >> Mike Holmes >> Technical Manager - Linaro Networking Group >> Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs >> >> >> > > > -- > Mike Holmes > Technical Manager - Linaro Networking Group > Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs > > > -- Mike Holmes Technical Manager - Linaro Networking Group Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs
_______________________________________________ lng-odp mailing list lng-odp@lists.linaro.org https://lists.linaro.org/mailman/listinfo/lng-odp
