| Message ID | 1409856475-13738-1-git-send-email-anders.roxell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 88c6e096bc0084c901082e7a863169674fbea035 |
| Headers | show |
On Thu, Sep 04, 2014 at 07:47:55PM +0100, Anders Roxell wrote: > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Reviewed-and-Tested-by: Stuart Haslam <stuart.haslam@arm.com> > --- > aminclude.am | 4 ++++ > doc/doxygen.cfg | 2 +- > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/aminclude.am b/aminclude.am > index 8e03174..a8ce032 100644 > --- a/aminclude.am > +++ b/aminclude.am > @@ -148,7 +148,11 @@ doxygen-doc: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) > > @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) > rm -rf @DX_DOCDIR@ > + @mkdir -p @DX_DOCDIR@/api_headers > + @cp ${srcdir}/platform/linux-generic/include/api/odp_*.h @DX_DOCDIR@/api_headers > + @cp ${srcdir}/platform/${with_platform}/include/api/odp_*.h @DX_DOCDIR@/api_headers > $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) > + @rm -rf @DX_DOCDIR@/api_headers > > DX_CLEANFILES = \ > @DX_DOCDIR@/@PACKAGE@.tag \ > diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg > index 5d1e191..a77ae1e 100644 > --- a/doc/doxygen.cfg > +++ b/doc/doxygen.cfg > @@ -9,7 +9,7 @@ TYPEDEF_HIDES_STRUCT = YES > EXTRACT_STATIC = YES > SORT_MEMBER_DOCS = NO > WARN_NO_PARAMDOC = YES > -INPUT = $(SRCDIR)/doc $(SRCDIR)/doc/users-guide $(SRCDIR)/doc/api $(SRCDIR)/platform/linux-generic/include/api $(SRCDIR)/helper/include $(SRCDIR)/example > +INPUT = $(SRCDIR)/doc $(SRCDIR)/doc/users-guide $(SRCDIR)/doc/api $(DOCDIR)/api_headers $(SRCDIR)/helper/include $(SRCDIR)/example > FILE_PATTERNS = odp*.h odp*.c *.dox > RECURSIVE = YES > SOURCE_BROWSER = YES > -- > 1.9.1 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
Applied, thanks! Maxim. On 09/05/2014 01:21 AM, Stuart Haslam wrote: > On Thu, Sep 04, 2014 at 07:47:55PM +0100, Anders Roxell wrote: >> Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > Reviewed-and-Tested-by: Stuart Haslam <stuart.haslam@arm.com> > >> --- >> aminclude.am | 4 ++++ >> doc/doxygen.cfg | 2 +- >> 2 files changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/aminclude.am b/aminclude.am >> index 8e03174..a8ce032 100644 >> --- a/aminclude.am >> +++ b/aminclude.am >> @@ -148,7 +148,11 @@ doxygen-doc: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) >> >> @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) >> rm -rf @DX_DOCDIR@ >> + @mkdir -p @DX_DOCDIR@/api_headers >> + @cp ${srcdir}/platform/linux-generic/include/api/odp_*.h @DX_DOCDIR@/api_headers >> + @cp ${srcdir}/platform/${with_platform}/include/api/odp_*.h @DX_DOCDIR@/api_headers >> $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) >> + @rm -rf @DX_DOCDIR@/api_headers >> >> DX_CLEANFILES = \ >> @DX_DOCDIR@/@PACKAGE@.tag \ >> diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg >> index 5d1e191..a77ae1e 100644 >> --- a/doc/doxygen.cfg >> +++ b/doc/doxygen.cfg >> @@ -9,7 +9,7 @@ TYPEDEF_HIDES_STRUCT = YES >> EXTRACT_STATIC = YES >> SORT_MEMBER_DOCS = NO >> WARN_NO_PARAMDOC = YES >> -INPUT = $(SRCDIR)/doc $(SRCDIR)/doc/users-guide $(SRCDIR)/doc/api $(SRCDIR)/platform/linux-generic/include/api $(SRCDIR)/helper/include $(SRCDIR)/example >> +INPUT = $(SRCDIR)/doc $(SRCDIR)/doc/users-guide $(SRCDIR)/doc/api $(DOCDIR)/api_headers $(SRCDIR)/helper/include $(SRCDIR)/example >> FILE_PATTERNS = odp*.h odp*.c *.dox >> RECURSIVE = YES >> SOURCE_BROWSER = YES >> -- >> 1.9.1 >> >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> http://lists.linaro.org/mailman/listinfo/lng-odp >>
diff --git a/aminclude.am b/aminclude.am index 8e03174..a8ce032 100644 --- a/aminclude.am +++ b/aminclude.am @@ -148,7 +148,11 @@ doxygen-doc: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) rm -rf @DX_DOCDIR@ + @mkdir -p @DX_DOCDIR@/api_headers + @cp ${srcdir}/platform/linux-generic/include/api/odp_*.h @DX_DOCDIR@/api_headers + @cp ${srcdir}/platform/${with_platform}/include/api/odp_*.h @DX_DOCDIR@/api_headers $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) + @rm -rf @DX_DOCDIR@/api_headers DX_CLEANFILES = \ @DX_DOCDIR@/@PACKAGE@.tag \ diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg index 5d1e191..a77ae1e 100644 --- a/doc/doxygen.cfg +++ b/doc/doxygen.cfg @@ -9,7 +9,7 @@ TYPEDEF_HIDES_STRUCT = YES EXTRACT_STATIC = YES SORT_MEMBER_DOCS = NO WARN_NO_PARAMDOC = YES -INPUT = $(SRCDIR)/doc $(SRCDIR)/doc/users-guide $(SRCDIR)/doc/api $(SRCDIR)/platform/linux-generic/include/api $(SRCDIR)/helper/include $(SRCDIR)/example +INPUT = $(SRCDIR)/doc $(SRCDIR)/doc/users-guide $(SRCDIR)/doc/api $(DOCDIR)/api_headers $(SRCDIR)/helper/include $(SRCDIR)/example FILE_PATTERNS = odp*.h odp*.c *.dox RECURSIVE = YES SOURCE_BROWSER = YES
Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- aminclude.am | 4 ++++ doc/doxygen.cfg | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)