| Message ID | 1409690498-30626-1-git-send-email-anders.roxell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 73edccdacaf96ae045bd2ca59de6a2e78231a58c |
| Headers | show |
Merged, thanks! Maxim. On 09/03/2014 12:41 AM, Anders Roxell wrote: > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > --- > README | 2 +- > aminclude.am | 8 ++++---- > m4/ax_prog_doxygen.m4 | 10 +++++----- > 3 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/README b/README > index 8c559a0..a0eb2f3 100644 > --- a/README > +++ b/README > @@ -18,7 +18,7 @@ Main git repository: > In general you can build: > ./bootstrap > ./configure > - Use 'make' to build ODP library and samples and 'make doxygen-run' to build > + Use 'make' to build ODP library and samples and 'make doxygen-html' to build > ODP API documentation. 'make install' will copy all required headers and > binary files to the install directory. > > diff --git a/aminclude.am b/aminclude.am > index fc9665a..8e03174 100644 > --- a/aminclude.am > +++ b/aminclude.am > @@ -138,13 +138,13 @@ DX_CLEAN_LATEX = @DX_DOCDIR@/latex > > endif DX_COND_latex > > -.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) > +.PHONY: doxygen-html doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) > > -.INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) > +.INTERMEDIATE: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) > > -doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag > +doxygen-html: @DX_DOCDIR@/@PACKAGE@.tag > > -doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) > +doxygen-doc: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) > > @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) > rm -rf @DX_DOCDIR@ > diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 > index 44b22b0..aa4acc2 100644 > --- a/m4/ax_prog_doxygen.m4 > +++ b/m4/ax_prog_doxygen.m4 > @@ -58,7 +58,7 @@ > # > # doxygen-doc: Generate all doxygen documentation. > # > -# doxygen-run: Run doxygen, which will generate some of the > +# doxygen-html: Run doxygen, which will generate some of the > # documentation (HTML, CHM, CHI, MAN, RTF, XML) > # but will not do the post processing required > # for the rest of it (PS, PDF, and some MAN). > @@ -216,13 +216,13 @@ > # > # endif DX_COND_latex > # > -# .PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) > +# .PHONY: doxygen-html doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) > # > -# .INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) > +# .INTERMEDIATE: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) > # > -# doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag > +# doxygen-html: @DX_DOCDIR@/@PACKAGE@.tag > # > -# doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) > +# doxygen-doc: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) > # > # @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) > # rm -rf @DX_DOCDIR@
diff --git a/README b/README index 8c559a0..a0eb2f3 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ Main git repository: In general you can build: ./bootstrap ./configure - Use 'make' to build ODP library and samples and 'make doxygen-run' to build + Use 'make' to build ODP library and samples and 'make doxygen-html' to build ODP API documentation. 'make install' will copy all required headers and binary files to the install directory. diff --git a/aminclude.am b/aminclude.am index fc9665a..8e03174 100644 --- a/aminclude.am +++ b/aminclude.am @@ -138,13 +138,13 @@ DX_CLEAN_LATEX = @DX_DOCDIR@/latex endif DX_COND_latex -.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) +.PHONY: doxygen-html doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) -.INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) +.INTERMEDIATE: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) -doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag +doxygen-html: @DX_DOCDIR@/@PACKAGE@.tag -doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) +doxygen-doc: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) rm -rf @DX_DOCDIR@ diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 index 44b22b0..aa4acc2 100644 --- a/m4/ax_prog_doxygen.m4 +++ b/m4/ax_prog_doxygen.m4 @@ -58,7 +58,7 @@ # # doxygen-doc: Generate all doxygen documentation. # -# doxygen-run: Run doxygen, which will generate some of the +# doxygen-html: Run doxygen, which will generate some of the # documentation (HTML, CHM, CHI, MAN, RTF, XML) # but will not do the post processing required # for the rest of it (PS, PDF, and some MAN). @@ -216,13 +216,13 @@ # # endif DX_COND_latex # -# .PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) +# .PHONY: doxygen-html doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) # -# .INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) +# .INTERMEDIATE: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) # -# doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag +# doxygen-html: @DX_DOCDIR@/@PACKAGE@.tag # -# doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) +# doxygen-doc: doxygen-html $(DX_PS_GOAL) $(DX_PDF_GOAL) # # @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) # rm -rf @DX_DOCDIR@
Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- README | 2 +- aminclude.am | 8 ++++---- m4/ax_prog_doxygen.m4 | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-)