On Thu, Dec 18, 2014 at 10:49:59AM -0800, Jon A. Cruz wrote:
> Added option with fallback of 'auto' to control building of documentation.
>
> Signed-off-by: Jon A. Cruz <j...@osg.samsung.com>
> ---
> configure.ac | 72
> ++++++++++++++++++++++++++++++++++++++++++---------------
> doc/Makefile.am | 2 +-
> 2 files changed, 55 insertions(+), 19 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 329f224..ef26b21 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -38,6 +38,7 @@ AM_SILENT_RULES([yes])
> # Check for programs
> AC_PROG_CC_C99
> AC_PROG_CXX # Only used by build C++ test
> +AC_PROG_GREP
>
> # Initialize libtool
> LT_PREREQ([2.2])
> @@ -67,23 +68,58 @@ fi
> AC_SUBST(GCC_CFLAGS)
> AC_SUBST(GCC_CXXFLAGS)
[...]
> +
> + if test "x$DOXYGEN" != "x" -a "x$DOT" != "x"; then
> + AC_CONFIG_FILES([
> + doc/libinput.doxygen
> + ])
that's quite unusual. libinput.doxygen itself has no dependency on
dot or doxygen, so I don't think moving this here is helpful, it just hides
it away from a known location. ACK to the rest of the patch, I'll just move
this bit back to AC_CONFIG_FILES before pushing.
fwiw, if we had a dependency, I'd still prefer this to be through a variable
so that all AC_CONFIG_FILES are still in a single list:
AC_CONFIG_FILES([src/Makefile.am
$someconditionalthing
doc/Makefile.am])
Thanks for the patch. I'll get to improving the docs asap.
Cheers,
Peter
> + build_documentation="yes"
> + else
> + build_documentation="no"
> + fi
> fi
> -AM_CONDITIONAL([HAVE_DOT], [test "x$have_dot" = "xyes"])
>
> AC_ARG_ENABLE(event-gui,
> AS_HELP_STRING([--enable-event-gui], [Build the GUI event viewer
> (default=auto)]),
> @@ -120,10 +156,10 @@ fi
>
> AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"])
> AM_CONDITIONAL(BUILD_TESTS, [test "x$build_tests" = "xyes"])
> +AM_CONDITIONAL(BUILD_DOCS, [test "x$build_documentation" = "xyes"])
>
> AC_CONFIG_FILES([Makefile
> doc/Makefile
> - doc/libinput.doxygen
> src/Makefile
> src/libinput.pc
> src/libinput-version.h
> @@ -134,7 +170,7 @@ AC_OUTPUT
> AC_MSG_RESULT([
> Prefix ${prefix}
>
> - Build documentation ${have_doxygen}
> + Build documentation ${build_documentation}
> Build tests ${build_tests}
> Tests use valgrind ${VALGRIND}
> Build GUI event tool ${build_eventgui}
> diff --git a/doc/Makefile.am b/doc/Makefile.am
> index 624326b..30f6089 100644
> --- a/doc/Makefile.am
> +++ b/doc/Makefile.am
> @@ -1,6 +1,6 @@
> EXTRA_DIST = touchpad-tap-state-machine.svg
> touchpad-softbutton-state-machine.svg
>
> -if HAVE_DOXYGEN
> +if BUILD_DOCS
>
> noinst_DATA = html/index.html
>
> --
> 1.9.1
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
