diff options
| author | David Zeuthen <david@fubar.dk> | 2006-06-06 03:17:27 +0000 |
|---|---|---|
| committer | David Zeuthen <david@fubar.dk> | 2006-06-06 03:17:27 +0000 |
| commit | 4c7f5ffa116c3e74ae20d078dc1ca460a530e926 (patch) | |
| tree | d716f13bbb759f9b987b6f5ed1d309bac8ee70f7 | |
| parent | 2413a93af1992cca4ae8d158ae2938b25c97285a (diff) | |
Be explicit about DIST_SUBDIRS as otherwise 'make distcheck' breaks.
Disable building docbook by default as it currently breaks 'make
distcheck'.
Also dist other XML files
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | doc/api/tmpl/logging.sgml | 1 | ||||
| -rw-r--r-- | doc/api/tmpl/sysfs.sgml | 1 | ||||
| -rw-r--r-- | doc/spec/Makefile.am | 37 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
6 files changed, 33 insertions, 20 deletions
@@ -1,5 +1,15 @@ 2006-06-05 David Zeuthen <davidz@redhat.com> + * tools/Makefile.am: Be explicit about DIST_SUBDIRS as otherwise + 'make distcheck' breaks. + + * configure.in: Disable building docbook by default as it + currently breaks 'make distcheck'. + + * doc/spec/Makefile.am: Also dist other XML files + +2006-06-05 David Zeuthen <davidz@redhat.com> + * configure.in, tools/Makefile.am: Patch from Joe Marcus Clarke <marcus@freebsd.org> and Danny Kukawka <danny.kukawka@web.de> to only install the backend we're building for. diff --git a/configure.in b/configure.in index daf82ab6..8c94bd8a 100644 --- a/configure.in +++ b/configure.in @@ -75,7 +75,7 @@ AC_DEFINE_UNQUOTED(HAL_GROUP,"$HAL_GROUP", [Group for HAL]) # Taken from dbus AC_ARG_ENABLE(ansi, [ --enable-ansi enable -ansi -pedantic gcc flags],enable_ansi=$enableval,enable_ansi=no) AC_ARG_ENABLE(verbose-mode, [ --enable-verbose-mode support verbose debug mode],enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE) -AC_ARG_ENABLE(docbook-docs, [ --enable-docbook-docs build documentation (requires xmlto)],enable_docbook_docs=$enableval,enable_docbook_docs=auto) +AC_ARG_ENABLE(docbook-docs, [ --enable-docbook-docs build documentation (requires xmlto)],enable_docbook_docs=$enableval,enable_docbook_docs=no) GTK_DOC_CHECK([1.3]) diff --git a/doc/api/tmpl/logging.sgml b/doc/api/tmpl/logging.sgml index 2a59ac41..f6649bc4 100644 --- a/doc/api/tmpl/logging.sgml +++ b/doc/api/tmpl/logging.sgml @@ -33,6 +33,7 @@ logging @format: @arg...: +@arg...: @arg...: diff --git a/doc/api/tmpl/sysfs.sgml b/doc/api/tmpl/sysfs.sgml index 9c603233..892990b4 100644 --- a/doc/api/tmpl/sysfs.sgml +++ b/doc/api/tmpl/sysfs.sgml @@ -62,6 +62,7 @@ sysfs @format: @arg...: +@arg...: @arg...: diff --git a/doc/spec/Makefile.am b/doc/spec/Makefile.am index 2733ea69..4bd93fc7 100644 --- a/doc/spec/Makefile.am +++ b/doc/spec/Makefile.am @@ -1,25 +1,24 @@ -FIGURE_FILES = \ - hal-arch.png \ - hal-devices1.png \ - hal-fdi-example1.png \ - hal-fdi-example2.png \ - hal-fdi-example3.png \ +FIGURE_FILES = \ + hal-arch.png \ + hal-devices1.png \ + hal-fdi-example1.png \ + hal-fdi-example2.png \ + hal-fdi-example3.png \ hal-linux26.png -SPEC_XML_FILES = \ - hal-spec.xml \ - hal-spec-examples.xml \ - hal-spec-introduction.xml \ - hal-spec-fdi-files.xml \ - hal-spec-properties.xml +SPEC_XML_EXTRA_FILES = \ + hal-spec-examples.xml \ + hal-spec-introduction.xml \ + hal-spec-fdi-files.xml \ + hal-spec-properties.xml if DOCBOOK_DOCS_ENABLED htmldocdir = $(DOCDIR)/spec htmldoc_DATA = hal-spec.html $(FIGURE_FILES) -hal-spec.html : $(SPEC_XML_FILES) $(FIGURE_FILES) +hal-spec.html : hal-spec.xml $(SPEC_XML_EXTRA_FILES) $(FIGURE_FILES) $(XMLTO) html-nochunks hal-spec.xml clean-local: @@ -28,9 +27,11 @@ clean-local: endif # DOCBOOK_DOCS_ENABLED -EXTRA_DIST = hal-spec.html \ - hal-spec.xml.in \ - example-manager.py \ - hal-arch.dia \ - hal-linux26.dia \ +EXTRA_DIST = \ + hal-spec.html \ + hal-spec.xml.in \ + $(SPEC_XML_EXTRA_FILES) \ + example-manager.py \ + hal-arch.dia \ + hal-linux26.dia \ $(FIGURE_FILES) diff --git a/tools/Makefile.am b/tools/Makefile.am index 7af4b858..cff25dd8 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -10,7 +10,7 @@ if HALD_COMPILE_FREEBSD SUBDIRS += freebsd endif -DIST_SUBDIRS = $(SUBDIRS) freebsd linux +DIST_SUBDIRS = device-manager freebsd linux INCLUDES = \ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ |