diff options
| author | Jonathon Jongsma <jjongsma@gnome.org> | 2006-03-31 04:00:02 +0000 |
|---|---|---|
| committer | Jonathon Jongsma <jjongsma@gnome.org> | 2006-03-31 04:00:02 +0000 |
| commit | 9646d122d8df1b5b9f58e6938f9c8f235a4e0955 (patch) | |
| tree | c54feb2a3c6377b2189d5532e7ae8873e80a4d7f | |
| parent | f3d006a60b967aa040d1576ee336d88e63e8d6d6 (diff) | |
2006-03-30 Danilo Piazzalunga <danilopiazza@gmail.com>
* configure.in: enable documentation even if doxygen and/or graphviz
are missing, so the docs will be installed when building a release.
* docs/reference/Makefile.am: don't remove html directory with `make clean`,
so that users of the tarball releases don't destroy the pre-built
documentation when running make clean. Change to maintainer-clean
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 25 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 2 |
3 files changed, 23 insertions, 12 deletions
@@ -1,3 +1,11 @@ +2006-03-30 Danilo Piazzalunga <danilopiazza@gmail.com> + + * configure.in: enable documentation even if doxygen and/or graphviz + are missing, so the docs will be installed when building a release. + * docs/reference/Makefile.am: don't remove html directory with `make clean`, + so that users of the tarball releases don't destroy the pre-built + documentation when running make clean. Change to maintainer-clean + 2006-03-29 Jonathon Jongsma <jonathon.jongsma@gmail.com> * configure.in: added tests for doxygen and graphviz which displays a diff --git a/configure.in b/configure.in index bba7bd7..bc8a3ae 100644 --- a/configure.in +++ b/configure.in @@ -103,19 +103,22 @@ AC_ARG_ENABLE(docs, [AC_HELP_STRING([--enable-docs], if test "x$enable_docs" = "xyes"; then dnl check if doxygen is installed AC_CHECK_PROGS(DOXYGEN, [doxygen], no) - dnl check if graphviz / dot is installed (used by doxygen) - AC_CHECK_PROGS(DOT, [dot], no) - - if test x$DOXYGEN = xno -o x$DOT = xno; then - AC_MSG_WARN([Doxygen not found, documentation will not be built]) + if test x$DOXYGEN = xno; then + AC_MSG_WARN([Doxygen not found, documentation will not be rebuilt]) else - DOCS_SUBDIR="docs" - AC_CONFIG_FILES( - docs/Makefile - docs/reference/Makefile - docs/reference/Doxyfile - ) + dnl check if graphviz / dot is installed (used by doxygen) + AC_CHECK_PROGS(DOT, [dot], no) + if test x$DOT = xno; then + AC_MSG_WARN([graphviz / dot not found, documentation graphs will not be rebuilt]) + fi fi + + DOCS_SUBDIR="docs" + AC_CONFIG_FILES( + docs/Makefile + docs/reference/Makefile + docs/reference/Doxyfile + ) fi AC_SUBST(DOCS_SUBDIR) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 937193f..1b41ddd 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -45,7 +45,7 @@ uninstall-local: uninstall-reference all-local: $(index_html) -clean-local: +maintainer-clean-local: -rm -rf html CLEANFILES = cairomm_doxygen_tags \ |