diff options
| -rw-r--r-- | cmake/doc/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | doc/.gitignore | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 5 | ||||
| -rw-r--r-- | doc/dbus-cleanup-sockets.1.xml.in (renamed from doc/dbus-cleanup-sockets.1.xml) | 0 | ||||
| -rw-r--r-- | doc/dbus-launch.1.xml.in (renamed from doc/dbus-launch.1.xml) | 0 | ||||
| -rw-r--r-- | doc/dbus-monitor.1.xml.in (renamed from doc/dbus-monitor.1.xml) | 0 | ||||
| -rw-r--r-- | doc/dbus-send.1.xml.in (renamed from doc/dbus-send.1.xml) | 0 | ||||
| -rw-r--r-- | doc/dbus-uuidgen.1.xml.in (renamed from doc/dbus-uuidgen.1.xml) | 0 |
9 files changed, 16 insertions, 11 deletions
diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt index e79429eb..15c05401 100644 --- a/cmake/doc/CMakeLists.txt +++ b/cmake/doc/CMakeLists.txt @@ -108,13 +108,18 @@ DOCBOOK(${CMAKE_SOURCE_DIR}/../doc/dbus-test-plan.xml html-nochunks) DOCBOOK(${CMAKE_SOURCE_DIR}/../doc/dbus-tutorial.xml html-nochunks) DOCBOOK(${CMAKE_SOURCE_DIR}/../doc/dbus-specification.xml html-nochunks) DOCBOOK(${CMAKE_SOURCE_DIR}/../doc/dbus-faq.xml html-nochunks) +configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-cleanup-sockets.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-cleanup-sockets.1.xml) configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-daemon.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml) +configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-launch.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml) +configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-monitor.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml) +configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-send.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml) +configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-uuidgen.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml) +DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-cleanup-sockets.1.xml html-nochunks) DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml html-nochunks) -DOCBOOK(${CMAKE_SOURCE_DIR}/../doc/dbus-monitor.1.xml html-nochunks) -DOCBOOK(${CMAKE_SOURCE_DIR}/../doc/dbus-send.1.xml html-nochunks) -DOCBOOK(${CMAKE_SOURCE_DIR}/../doc/dbus-launch.1.xml html-nochunks) -DOCBOOK(${CMAKE_SOURCE_DIR}/../doc/dbus-uuidgen.1.xml html-nochunks) -DOCBOOK(${CMAKE_SOURCE_DIR}/../doc/dbus-cleanup-sockets.1.xml html-nochunks) +DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml html-nochunks) +DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml html-nochunks) +DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml html-nochunks) +DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml html-nochunks) if (UNIX) DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml man) DOCBOOK(${CMAKE_SOURCE_DIR}/../doc/dbus-monitor.1.xml man) diff --git a/configure.ac b/configure.ac index 37e33dc5..9b578ed4 100644 --- a/configure.ac +++ b/configure.ac @@ -1810,7 +1810,12 @@ tools/Makefile test/Makefile test/name-test/Makefile doc/Makefile +doc/dbus-cleanup-sockets.1.xml doc/dbus-daemon.1.xml +doc/dbus-launch.1.xml +doc/dbus-monitor.1.xml +doc/dbus-send.1.xml +doc/dbus-uuidgen.1.xml dbus-1.pc dbus-1-uninstalled.pc test/data/valid-config-files/debug-allow-all.conf diff --git a/doc/.gitignore b/doc/.gitignore index d7c1236c..708fe36f 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -3,6 +3,7 @@ Makefile Makefile.in *.1 +*.1.xml *.1.html *.lo *.la @@ -13,7 +14,6 @@ dbus-specification.html dbus-test-plan.html dbus-tutorial.html dbus-faq.html -dbus-daemon.1.xml dbus-docs dbus-docs.tar.gz doxygen.stamp diff --git a/doc/Makefile.am b/doc/Makefile.am index 4906724a..35725696 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,10 +1,6 @@ apidir = @htmldir@/api MAN_XML_FILES = \ - dbus-daemon.1.xml \ - $(NULL) - -DIST_MAN_XML_FILES = \ dbus-cleanup-sockets.1.xml \ dbus-daemon.1.xml \ dbus-launch.1.xml \ @@ -39,7 +35,6 @@ dist_doc_DATA = system-activation.txt # uploaded and distributed, but not installed STATIC_DOCS = \ - $(DIST_MAN_XML_FILES) \ dbus-faq.xml \ dbus-specification.xml \ dbus-test-plan.xml \ diff --git a/doc/dbus-cleanup-sockets.1.xml b/doc/dbus-cleanup-sockets.1.xml.in index a147ad88..a147ad88 100644 --- a/doc/dbus-cleanup-sockets.1.xml +++ b/doc/dbus-cleanup-sockets.1.xml.in diff --git a/doc/dbus-launch.1.xml b/doc/dbus-launch.1.xml.in index 6e6f4960..6e6f4960 100644 --- a/doc/dbus-launch.1.xml +++ b/doc/dbus-launch.1.xml.in diff --git a/doc/dbus-monitor.1.xml b/doc/dbus-monitor.1.xml.in index c3d1a972..c3d1a972 100644 --- a/doc/dbus-monitor.1.xml +++ b/doc/dbus-monitor.1.xml.in diff --git a/doc/dbus-send.1.xml b/doc/dbus-send.1.xml.in index 0988e19f..0988e19f 100644 --- a/doc/dbus-send.1.xml +++ b/doc/dbus-send.1.xml.in diff --git a/doc/dbus-uuidgen.1.xml b/doc/dbus-uuidgen.1.xml.in index ee622353..ee622353 100644 --- a/doc/dbus-uuidgen.1.xml +++ b/doc/dbus-uuidgen.1.xml.in |