diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 12 | ||||
| -rw-r--r-- | doc/connman-docs.xml | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 46f5c1f8..615045e0 100644 --- a/configure.ac +++ b/configure.ac @@ -24,10 +24,10 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) AC_DISABLE_STATIC AC_PROG_LIBTOOL -AC_PATH_PROG([XSLTPROC], [xsltproc]) - GTK_DOC_CHECK +AC_PATH_PROG([XSLTPROC], [xsltproc]) + AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [ if (test "${enableval}" = "yes" && diff --git a/doc/Makefile.am b/doc/Makefile.am index 0d0381f4..b9ade0fc 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -21,7 +21,7 @@ IGNORE_HFILES = connman connman.h rtnl.h dbus.h iface.h HTML_IMAGES = -content_files = connman-introduction.xml +content_files = connman-introduction.xml dbus/manager.xml INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/gdbus \ $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) @@ -34,15 +34,17 @@ MAINTAINERCLEANFILES = Makefile.in \ if ENABLE_GTK_DOC include $(top_srcdir)/doc/gtk-doc.make -all-local: xml/dbus-manager.xml - -xml/dbus-manager.xml : dbus-manager.xml dbus-introspection.xsl +dbus/manager.xml: dbus-manager.xml dbus-introspection.xsl + $(MKDIR_P) -p $(builddir)/dbus echo "<?xml version=\"1.0\"?>" > $@ echo "<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" >> $@ $(XSLTPROC) dbus-introspection.xsl $< | tail -n +2 >> $@ +clean-local: + rm -rf $(builddir)/dbus + else -EXTRA_DIST = $(DOC_MAIN_SGML_FILE) $(content_files) +EXTRA_DIST = $(DOC_MAIN_SGML_FILE) connman-introduction.xml endif EXTRA_DIST += dbus-introspection.dtd dbus-introspection.xsl \ diff --git a/doc/connman-docs.xml b/doc/connman-docs.xml index 66d895cf..f1601c43 100644 --- a/doc/connman-docs.xml +++ b/doc/connman-docs.xml @@ -65,7 +65,7 @@ Manager. </para> </partintro> - <xi:include href="xml/dbus-manager.xml"/> + <xi:include href="dbus/manager.xml"/> </reference> <reference id="manager"> |