Commit 4b391c15 authored by Rafaël Carré's avatar Rafaël Carré

Simplify doc build rules

parent 1f1d20c5
...@@ -18,13 +18,8 @@ unittest: ...@@ -18,13 +18,8 @@ unittest:
@echo " -- You need the cppunit devel package to compile the unitary tests." @echo " -- You need the cppunit devel package to compile the unitary tests."
endif endif
doc:
@(cd doc; make)
@echo ""
@echo "D-Bus API HTML documentation has been generated in doc/dbus-api/doc/spec"
@echo ""
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libs src ringtones man $(TESTS_DIR) SUBDIRS = libs src ringtones man $(TESTS_DIR) doc
EXTRA_DIST = m4/*.m4 images/* README.gentoo EXTRA_DIST = m4/*.m4 images/* README.gentoo
...@@ -324,36 +324,16 @@ AM_CONDITIONAL(USE_NETWORKMANAGER, test "x$with_networkmanager" = "xyes" ) ...@@ -324,36 +324,16 @@ AM_CONDITIONAL(USE_NETWORKMANAGER, test "x$with_networkmanager" = "xyes" )
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
AC_DEFUN([BB_ENABLE_DOXYGEN], AC_DEFUN([BB_ENABLE_DOXYGEN],
[ [
AC_ARG_ENABLE(doxygen, [ --enable-doxygen enable documentation generation with doxygen (auto)]) AC_ARG_ENABLE(doxygen, [ --enable-doxygen enable documentation generation with doxygen (disabled by default)])
AC_ARG_ENABLE(dot, [ --enable-dot use 'dot' to generate graphs in doxygen (auto)]) AC_ARG_ENABLE(dot, [ --enable-dot use 'dot' to generate graphs in doxygen (auto)])
AC_ARG_ENABLE(html-docs, [ --enable-html-docs enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes]) if test "x$enable_doxygen" = xyes; then
AC_ARG_ENABLE(latex-docs, [ --enable-latex-docs enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no])
if test "x$enable_doxygen" = xno; then
enable_doc=no
else
AC_PATH_PROG(DOXYGEN, doxygen, , $PATH) AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
if test x$DOXYGEN = x; then test x$DOXYGEN = x && AC_MSG_ERROR([could not find doxygen])
test "x$enable_doxygen" = xyes && AC_MSG_ERROR([could not find doxygen])
enable_doc=no
else
enable_doc=yes
AC_PATH_PROG(DOT, dot, , $PATH) AC_PATH_PROG(DOT, dot, , $PATH)
fi test x$DOT = x -a "x$enable_dot" = xyes && AC_MSG_ERROR([could not find dot])
fi fi
AM_CONDITIONAL(DOC, test x$enable_doc = xyes) AM_CONDITIONAL(ENABLE_DOXYGEN, test x$DOXYGEN = xyes)
if test x$DOT = x; then
test "x$enable_dot" = xyes && AC_MSG_ERROR([could not find dot])
enable_dot=no
else
enable_dot=yes
fi
AM_CONDITIONAL(ENABLE_DOXYGEN, test x$enable_doc = xtrue)
AC_SUBST(enable_dot)
AC_SUBST(enable_html_docs)
AC_SUBST(enable_latex_docs)
]) ])
# Acutally perform the doxygen check # Acutally perform the doxygen check
BB_ENABLE_DOXYGEN BB_ENABLE_DOXYGEN
......
SUBDIRS = dbus-api
SUBDIRS = doxygen dbus-api if ENABLE_DOXYGEN
SUBDIRS += doxygen
endif
.PHONY: doc .PHONY: doc
doc: doc:
......
...@@ -12,7 +12,7 @@ all: doxygen-trac ...@@ -12,7 +12,7 @@ all: doxygen-trac
doxygen-trac: clean core-doc-trac gtk-gui-doc-trac doxygen-trac: clean core-doc-trac gtk-gui-doc-trac
%-doc-trac : %-doc %-doc-trac : %-doc
ln -s ${html_parent_dir}/$< ${html_parent_dir}/$</html ln -sf ${html_parent_dir}/$< ${html_parent_dir}/$</html
doc: clean core-doc gtk-gui-doc doc: clean core-doc gtk-gui-doc
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment