| Message ID | 1453315949-19608-1-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | Accepted |
| Commit | 5097b2dd7b542f397cfe6a8c2e39f2266c2421e5 |
| Headers | show |
On 20 January 2016 at 19:52, Mike Holmes <mike.holmes@linaro.org> wrote: > Currently docs will build the images regardless of the setting for > enable-user-docs at configure time. > The image generation should be dependent on actually building docs so > that systems without the image tools installed will not generate > warnings. > > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> Reviewed-by: Anders Roxell <anders.roxell@linaro.org> > --- > doc/Makefile.am | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/doc/Makefile.am b/doc/Makefile.am > index 41d804b..2a38106 100644 > --- a/doc/Makefile.am > +++ b/doc/Makefile.am > @@ -1,10 +1,6 @@ > -SUBDIRS = images > - > -if HAVE_DOXYGEN > +if user_guide > clean-local: > rm -rf output > -endif > > -if user_guide > -SUBDIRS += implementers-guide users-guide process-guide > +SUBDIRS = images implementers-guide users-guide process-guide > endif > -- > 2.5.0 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp
Merged, Maxim. On 01/26/2016 22:38, Anders Roxell wrote: > On 20 January 2016 at 19:52, Mike Holmes <mike.holmes@linaro.org> wrote: >> Currently docs will build the images regardless of the setting for >> enable-user-docs at configure time. >> The image generation should be dependent on actually building docs so >> that systems without the image tools installed will not generate >> warnings. >> >> Signed-off-by: Mike Holmes <mike.holmes@linaro.org> > Reviewed-by: Anders Roxell <anders.roxell@linaro.org> > >> --- >> doc/Makefile.am | 8 ++------ >> 1 file changed, 2 insertions(+), 6 deletions(-) >> >> diff --git a/doc/Makefile.am b/doc/Makefile.am >> index 41d804b..2a38106 100644 >> --- a/doc/Makefile.am >> +++ b/doc/Makefile.am >> @@ -1,10 +1,6 @@ >> -SUBDIRS = images >> - >> -if HAVE_DOXYGEN >> +if user_guide >> clean-local: >> rm -rf output >> -endif >> >> -if user_guide >> -SUBDIRS += implementers-guide users-guide process-guide >> +SUBDIRS = images implementers-guide users-guide process-guide >> endif >> -- >> 2.5.0 >> >> _______________________________________________ >> lng-odp mailing list >> 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 --git a/doc/Makefile.am b/doc/Makefile.am index 41d804b..2a38106 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,10 +1,6 @@ -SUBDIRS = images - -if HAVE_DOXYGEN +if user_guide clean-local: rm -rf output -endif -if user_guide -SUBDIRS += implementers-guide users-guide process-guide +SUBDIRS = images implementers-guide users-guide process-guide endif
Currently docs will build the images regardless of the setting for enable-user-docs at configure time. The image generation should be dependent on actually building docs so that systems without the image tools installed will not generate warnings. Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- doc/Makefile.am | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)