On Sat, Feb 19, 2011 at 9:02 AM, Gaetan Nadon <[email protected]> wrote:
> The release number in the main page will always be in sync.
> This will allow archiving the API documentation for each release,
> enabling multiple versions to coexist on the web.
>
> Signed-off-by: Gaetan Nadon <[email protected]>
>
Reviewed-by: Ping Cheng <[email protected]> for the series.
Looks sensible to me. Thanks.
Ping
---
> configure.ac | 1 +
> doc/.gitignore | 1 +
> doc/Makefile.am | 4 ++--
> doc/{doxygen.conf => doxygen.conf.in} | 2 +-
> 4 files changed, 5 insertions(+), 3 deletions(-)
> rename doc/{doxygen.conf => doxygen.conf.in} (99%)
>
> diff --git a/configure.ac b/configure.ac
> index ad2d6c7..7fa65de 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -157,6 +157,7 @@ AM_CONDITIONAL(UNITTESTS, [test "x$UNITTESTS" = xyes])
> AC_CONFIG_FILES([Makefile
> conf/Makefile
> doc/Makefile
> + doc/doxygen.conf
> src/Makefile
> man/Makefile
> include/Makefile
> diff --git a/doc/.gitignore b/doc/.gitignore
> index 5ccff1a..550262f 100644
> --- a/doc/.gitignore
> +++ b/doc/.gitignore
> @@ -1 +1,2 @@
> html/
> +doxygen.conf
> diff --git a/doc/Makefile.am b/doc/Makefile.am
> index c40c25c..089fc69 100644
> --- a/doc/Makefile.am
> +++ b/doc/Makefile.am
> @@ -3,10 +3,10 @@ if HAVE_DOXYGEN
>
> # Developers documentation is not installed
> noinst_DATA = html/index.html
> -dist_noinst_DATA = doxygen.conf
> +dist_noinst_DATA = doxygen.conf.in
>
> html/index.html:
> - $(AM_V_GEN)$(DOXYGEN) $(srcdir)/doxygen.conf
> + $(AM_V_GEN)$(DOXYGEN) doxygen.conf
>
> clean-local:
> $(AM_V_at)rm -fr html/
> diff --git a/doc/doxygen.conf b/doc/doxygen.conf.in
> similarity index 99%
> rename from doc/doxygen.conf
> rename to doc/doxygen.conf.in
> index 3b9820a..b3fde8d 100644
> --- a/doc/doxygen.conf
> +++ b/doc/doxygen.conf.in
> @@ -31,7 +31,7 @@ PROJECT_NAME = "X.Org Wacom Input Driver"
> # This could be handy for archiving the generated documentation or
> # if some version control system is used.
>
> -PROJECT_NUMBER = "0.10.11 and later"
> +PROJECT_NUMBER = "@PACKAGE_VERSION@"
>
> # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
> # base path where the generated documentation will be put.
> --
> 1.6.0.4
>
>
>
> ------------------------------------------------------------------------------
> The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
> Pinpoint memory and threading errors before they happen.
> Find and fix more than 250 security defects in the development cycle.
> Locate bottlenecks in serial and parallel code that limit performance.
> http://p.sf.net/sfu/intel-dev2devfeb
> _______________________________________________
> Linuxwacom-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
>
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
