Message ID | 1448311713-22940-1-git-send-email-anders.roxell@linaro.org |
---|---|
State | Accepted |
Commit | f35642551fb231f191ab62217fd9ecb4864a21ab |
Headers | show |
On 23 November 2015 at 15:48, Anders Roxell <anders.roxell@linaro.org> wrote: > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > Reviewed-by: Mike Holmes <mike.holmes@linaro.org> > --- > doc/Makefile.am | 3 +-- > doc/users-guide/Makefile.am | 2 ++ > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/doc/Makefile.am b/doc/Makefile.am > index a98c5ef..fd1c30e 100644 > --- a/doc/Makefile.am > +++ b/doc/Makefile.am > @@ -14,5 +14,4 @@ EXTRA_DIST = \ > examples.dox \ > images \ > odp.dox \ > - release.dox \ > - users-guide > + release.dox > diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am > index 3a804d1..8e60312 100644 > --- a/doc/users-guide/Makefile.am > +++ b/doc/users-guide/Makefile.am > @@ -1,5 +1,7 @@ > TARGET = $(top_srcdir)/doc/output/users-guide.html > > +EXTRA_DIST = users-guide.adoc > + > all-local: $(TARGET) > > $(TARGET): users-guide.adoc > -- > 2.1.4 > > -- Mike Holmes Technical Manager - Linaro Networking Group Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs
Merged, Maxim. On 11/23/2015 23:48, Anders Roxell wrote: > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > --- > doc/Makefile.am | 3 +-- > doc/users-guide/Makefile.am | 2 ++ > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/doc/Makefile.am b/doc/Makefile.am > index a98c5ef..fd1c30e 100644 > --- a/doc/Makefile.am > +++ b/doc/Makefile.am > @@ -14,5 +14,4 @@ EXTRA_DIST = \ > examples.dox \ > images \ > odp.dox \ > - release.dox \ > - users-guide > + release.dox > diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am > index 3a804d1..8e60312 100644 > --- a/doc/users-guide/Makefile.am > +++ b/doc/users-guide/Makefile.am > @@ -1,5 +1,7 @@ > TARGET = $(top_srcdir)/doc/output/users-guide.html > > +EXTRA_DIST = users-guide.adoc > + > all-local: $(TARGET) > > $(TARGET): users-guide.adoc
diff --git a/doc/Makefile.am b/doc/Makefile.am index a98c5ef..fd1c30e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -14,5 +14,4 @@ EXTRA_DIST = \ examples.dox \ images \ odp.dox \ - release.dox \ - users-guide + release.dox diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 3a804d1..8e60312 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -1,5 +1,7 @@ TARGET = $(top_srcdir)/doc/output/users-guide.html +EXTRA_DIST = users-guide.adoc + all-local: $(TARGET) $(TARGET): users-guide.adoc
Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- doc/Makefile.am | 3 +-- doc/users-guide/Makefile.am | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)