Signed-off-by: Adam Jackson
---
hw/dmx/meson.build | 25 +-
hw/kdrive/ephyr/meson.build| 7 +
hw/vfb/meson.build | 6 +
hw/xfree86/drivers/modesetting/meson.build | 6 +
hw/xfree86/exa/meson.build | 6 +
hw/xfree86/fbdevhw/meson.build | 6 +
hw/xfree86/meson.build | 42 ++
hw/xnest/meson.build | 6 +
hw/xwin/meson.build| 7 +
meson.build| 37 ++
10 files changed, 147 insertions(+), 1 deletion(-)
diff --git a/hw/dmx/meson.build b/hw/dmx/meson.build
index f2da0c27b2..877466eafe 100644
--- a/hw/dmx/meson.build
+++ b/hw/dmx/meson.build
@@ -28,7 +28,30 @@ subdir('input')
subdir('examples')
# XXX: subdir('doc')
# XXX: subdir('doxygen')
-# XXX: subdir('man')
+
+install_man(configure_file(
+input: 'man/Xdmx.man',
+output: 'Xdmx.1',
+configuration: manpage_config,
+))
+
+install_man(configure_file(
+input: 'config/man/dmxtodmx.man',
+output: 'dmxtodmx.1',
+configuration: manpage_config,
+))
+
+install_man(configure_file(
+input: 'config/man/vdltodmx.man',
+output: 'vdltodmx.1',
+configuration: manpage_config,
+))
+
+install_man(configure_file(
+input: 'config/man/xdmxconfig.man',
+output: 'xdmxconfig.1',
+configuration: manpage_config,
+))
dmx_dep = [
common_dep,
diff --git a/hw/kdrive/ephyr/meson.build b/hw/kdrive/ephyr/meson.build
index b48afd612e..f8135e914b 100644
--- a/hw/kdrive/ephyr/meson.build
+++ b/hw/kdrive/ephyr/meson.build
@@ -61,3 +61,10 @@ executable(
],
install: true,
)
+
+xephyr_man = configure_file(
+input: 'man/Xephyr.man',
+output: 'Xephyr.1',
+configuration: manpage_config,
+)
+install_man(xephyr_man)
diff --git a/hw/vfb/meson.build b/hw/vfb/meson.build
index a0771c3a69..537e96a72d 100644
--- a/hw/vfb/meson.build
+++ b/hw/vfb/meson.build
@@ -20,3 +20,9 @@ xvfb_server = executable(
],
install: true,
)
+
+install_man(configure_file(
+input: 'man/Xvfb.man',
+output: 'Xvfb.1',
+configuration: manpage_config,
+))
diff --git a/hw/xfree86/drivers/modesetting/meson.build
b/hw/xfree86/drivers/modesetting/meson.build
index c1546f62d7..37fd8939fe 100644
--- a/hw/xfree86/drivers/modesetting/meson.build
+++ b/hw/xfree86/drivers/modesetting/meson.build
@@ -36,6 +36,12 @@ if gbm_dep.found()
endif
symbol_test_args += join_paths(xorg_build_root, 'drivers', 'modesetting',
'modesetting_drv.so')
+install_man(configure_file(
+input: 'modesetting.man',
+output: 'modesetting.4',
+configuration: manpage_config,
+))
+
test('modesetting symbol test',
xorg_symbol_test,
args: symbol_test_args,
diff --git a/hw/xfree86/exa/meson.build b/hw/xfree86/exa/meson.build
index 5f5cf08a7e..75a5d429e0 100644
--- a/hw/xfree86/exa/meson.build
+++ b/hw/xfree86/exa/meson.build
@@ -7,3 +7,9 @@ xorg_exa = shared_module('exa',
install: true,
install_dir: module_dir,
)
+
+install_man(configure_file(
+input: 'man/exa.man',
+output: 'exa.4',
+configuration: manpage_config,
+))
diff --git a/hw/xfree86/fbdevhw/meson.build b/hw/xfree86/fbdevhw/meson.build
index 35d66ef2c1..f3146f3c95 100644
--- a/hw/xfree86/fbdevhw/meson.build
+++ b/hw/xfree86/fbdevhw/meson.build
@@ -15,3 +15,9 @@ shared_module('fbdevhw',
)
install_data('fbdevhw.h', install_dir: xorgsdkdir)
+
+install_man(configure_file(
+input: 'man/fbdevhw.man',
+output: 'fbdevhw.4',
+configuration: manpage_config,
+))
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index c2a26d6a78..4c03aab848 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -166,3 +166,45 @@ xorgserver_lib = shared_library(
)
xorgserver_dep = declare_dependency(link_with: xorgserver_lib)
+
+install_man(configure_file(
+input: 'man/Xorg.man',
+output: 'Xorg.1',
+configuration: manpage_config,
+))
+
+install_man(configure_file(
+input: 'man/Xorg.wrap.man',
+output: 'Xorg.wrap.1',
+configuration: manpage_config,
+))
+
+install_man(configure_file(
+input: 'man/Xwrapper.config.man',
+output: 'Xwrapper.config.5',
+configuration: manpage_config,
+))
+
+install_man(configure_file(
+input: 'man/xorg.conf.man',
+output: 'xorg.conf.5',
+configuration: manpage_config,
+))
+
+install_man(configure_file(
+input: 'man/xorg.conf.d.man',
+output: 'xorg.conf.d.5',
+configuration: manpage_config,
+))
+
+install_man(configure_file(
+input: 'utils/man/cvt.man',
+output: 'cvt.1',
+configuration: manpage_config,
+))
+
+install_man(configure_file(
+input: 'utils/man/gtf.man',
+output: 'gtf.1',
+configuration: manpage_config,
+))
diff --git a/hw/xnest/meson.build b/hw/xnest/meson.build
index adcf5e59c8..f143aff713 100644
--- a/hw/xnest/meson.build
+++ b/hw/xnest/meson.build
