diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2013-02-05 01:20:46 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-02-14 13:27:22 +0000 |
| commit | 6676a7db9cb30dad9bdd477e5949ca12a3c15cf6 (patch) | |
| tree | 0c85567efc4d8cddd32f6e8bc8ab811782f53382 | |
| parent | b6769bc6a3514169abc8e3c2fa77e5727165e030 (diff) | |
| download | dbus-6676a7db9cb30dad9bdd477e5949ca12a3c15cf6.tar.gz | |
Moved docbook sources used by cmake into doc subdir and adapted cmake build system.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59805
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | cmake/doc/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | doc/dbus-daemon.1.xml.in (renamed from cmake/bus/dbus-daemon.xml) | 0 | ||||
| -rw-r--r-- | doc/dbus-launch.1.xml (renamed from cmake/tools/dbus-launch.xml) | 0 | ||||
| -rw-r--r-- | doc/dbus-monitor.1.xml (renamed from cmake/tools/dbus-monitor.xml) | 0 | ||||
| -rw-r--r-- | doc/dbus-send.1.xml (renamed from cmake/tools/dbus-send.xml) | 0 |
5 files changed, 10 insertions, 8 deletions
diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt index e1079182..3c6d9525 100644 --- a/cmake/doc/CMakeLists.txt +++ b/cmake/doc/CMakeLists.txt @@ -44,19 +44,20 @@ if (DBUS_ENABLE_XML_DOCS) macro (DOCBOOK _sources _options) get_filename_component(_infile ${_sources} ABSOLUTE) - get_filename_component(_basename ${_infile} NAME_WE) - set(_outfile ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.html) + get_filename_component(_name ${_infile} NAME) + string(REPLACE ".xml" ".html" _outname ${_name}) + set(_outfile ${CMAKE_CURRENT_BINARY_DIR}/${_outname}) if (EXISTS ${_sources}) if (MEINPROC4_EXECUTABLE) - ADD_CUSTOM_TARGET(${_basename}.html ALL + ADD_CUSTOM_TARGET(${_outname} ALL ${MEINPROC4_EXECUTABLE} --stylesheet ${STYLESHEET} -o ${_outfile} ${_infile} DEPENDS ${_infile} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) endif () if (XMLTO_EXECUTABLE) - ADD_CUSTOM_TARGET(${_basename}.html ALL + ADD_CUSTOM_TARGET(${_outname} ALL ${XMLTO_EXECUTABLE} -vv ${_options} ${_infile} DEPENDS ${_infile} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} @@ -96,10 +97,11 @@ 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) -DOCBOOK(${CMAKE_SOURCE_DIR}/bus/dbus-daemon.xml html-nochunks) -DOCBOOK(${CMAKE_SOURCE_DIR}/tools/dbus-monitor.xml html-nochunks) -DOCBOOK(${CMAKE_SOURCE_DIR}/tools/dbus-send.xml html-nochunks) -DOCBOOK(${CMAKE_SOURCE_DIR}/tools/dbus-launch.xml html-nochunks) +configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-daemon.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml) +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) # # handle html index file diff --git a/cmake/bus/dbus-daemon.xml b/doc/dbus-daemon.1.xml.in index f331699c..f331699c 100644 --- a/cmake/bus/dbus-daemon.xml +++ b/doc/dbus-daemon.1.xml.in diff --git a/cmake/tools/dbus-launch.xml b/doc/dbus-launch.1.xml index dc34898f..dc34898f 100644 --- a/cmake/tools/dbus-launch.xml +++ b/doc/dbus-launch.1.xml diff --git a/cmake/tools/dbus-monitor.xml b/doc/dbus-monitor.1.xml index b41cace2..b41cace2 100644 --- a/cmake/tools/dbus-monitor.xml +++ b/doc/dbus-monitor.1.xml diff --git a/cmake/tools/dbus-send.xml b/doc/dbus-send.1.xml index 7fefc03e..7fefc03e 100644 --- a/cmake/tools/dbus-send.xml +++ b/doc/dbus-send.1.xml |