5 files changed, 241 insertions, 0 deletions
diff --git a/hw/dmx/config/meson.build b/hw/dmx/config/meson.build
new file mode 100644
index 000000000..c77cd0b44
--- /dev/null
+++ b/hw/dmx/config/meson.build
@@ -0,0 +1,81 @@
+flex = find_program('flex')
+bison = find_program('bison')
+
+lgen = generator(
+    flex,
+    output : '@PLAINNAME@.yy.c',
+    arguments : ['-o', '@OUTPUT@', '@INPUT@']
+)
+lfiles = lgen.process('scanner.l')
+
+pgen = generator(
+    bison,
+    output : ['@BASENAME@.c', '@BASENAME@.h'],
+    arguments : ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@']
+)
+pfiles = pgen.process('parser.y')
+
+srcs_dmx_config = [
+    'dmxparse.c',
+    'dmxprint.c',
+    'dmxcompat.c',
+    'dmxconfig.c',
+    pfiles,
+    lfiles,
+]
+
+dmx_inc = [
+    inc,
+    include_directories('../')
+]
+
+dmx_c_args = [
+    '-DHAVE_DMX_CONFIG_H',
+    '-DDMX_LOG_STANDALONE',
+]
+
+dmx_config = static_library('dmx_config',
+    srcs_dmx_config,
+    include_directories: dmx_inc,
+    dependencies: common_dep,
+    c_args: dmx_c_args,
+)
+
+executable('xdmxconfig',
+    [
+        'xdmxconfig.c',
+        '../dmxlog.c',
+        'Canvas.c',
+    ],
+    include_directories: [
+        inc,
+        include_directories('../')
+    ],
+    dependencies: [
+        common_dep,
+        dependency('xaw7'),
+        dependency('xmu'),
+        dependency('xt'),
+        dependency('xpm'),
+        dependency('x11'),
+    ],
+    link_with: dmx_config,
+    c_args: dmx_c_args,
+    install: true,
+)
+
+executable('vdltodmx',
+    'vdltodmx.c',
+    include_directories: dmx_inc,
+    link_with: dmx_config,
+    c_args: dmx_c_args,
+    install: true,
+)
+
+executable('dmxtodmx',
+    'dmxtodmx.c',
+    include_directories: dmx_inc,
+    link_with: dmx_config,
+    c_args: dmx_c_args,
+    install: true,
+)
diff --git a/hw/dmx/examples/meson.build b/hw/dmx/examples/meson.build
new file mode 100644
index 000000000..6e160d0e0
--- /dev/null
+++ b/hw/dmx/examples/meson.build
@@ -0,0 +1,33 @@
+dmxexamples_dep = [
+    dependency('xext'),
+    dependency('x11'),
+]
+
+dmx_dep = dependency('dmx', version: '>= 1.0.99.1')
+
+dmx_examples = [
+    ['dmxinfo', [dmx_dep]],
+    ['dmxwininfo', [dmx_dep, dependency('xmu')]],
+    ['dmxreconfig', [dmx_dep]],
+    ['dmxresize', [dmx_dep]],
+    ['dmxaddscreen', [dmx_dep]],
+    ['dmxrmscreen', [dmx_dep]],
+    ['dmxaddinput', [dmx_dep]],
+    ['xinput', [dmx_dep, dependency('xi')]],
+    ['xtest', [dependency('xtst')]],
+    ['evi', []],
+    ['xled', []],
+    ['xbell', []],
+    ['res', [dependency('xres')]],
+]
+
+foreach ex: dmx_examples
+    bin = ex[0]
+    extra_dep = ex[1]
+
+    executable(bin, bin + '.c', dependencies: [dmxexamples_dep, extra_dep])
+endforeach
+
+if cc.has_header('linux/input.h')
+    executable('ev', 'ev.c')
+endif
diff --git a/hw/dmx/glxProxy/meson.build b/hw/dmx/glxProxy/meson.build
new file mode 100644
index 000000000..bbb93f40a
--- /dev/null
+++ b/hw/dmx/glxProxy/meson.build
@@ -0,0 +1,27 @@
+srcs_dmx_glx = [
+    'compsize.c',
+    'g_disptab.c',
+    'global.c',
+    'glxcmds.c',
+    'glxcmdsswap.c',
+    'glxext.c',
+    'glxfbconfig.c',
+    'glxscreens.c',
+    'glxsingle.c',
+    'glxswap.c',
+    'glxvendor.c',
+    'glxvisuals.c',
+    'g_renderswap.c',
+    'render2swap.c',
+    'renderpixswap.c',
+]
+
+dmx_glx = static_library('dmx_glx',
+    srcs_dmx_glx,
+    include_directories: [
+        inc,
+        include_directories('../')
+    ],
+    dependencies: common_dep,
+    c_args: ['-DHAVE_DMX_CONFIG_H', glx_align64],
+)
diff --git a/hw/dmx/input/meson.build b/hw/dmx/input/meson.build
new file mode 100644
index 000000000..cf058adfd
--- /dev/null
+++ b/hw/dmx/input/meson.build
@@ -0,0 +1,32 @@
+srcs_dmx_input = [
+    'dmxdummy.c',
+    'dmxbackend.c',
+    'dmxconsole.c',
+    'dmxcommon.c',
+    'dmxinputinit.c',
+    'dmxarg.c',
+    'dmxevents.c',
+    'dmxxinput.c',
+    'dmxmotion.c',
+    'dmxmap.c',
+    'ChkNotMaskEv.c',
+]
+
+if cc.has_header('linux/input.h')
+    srcs_dmx_input += [
+        'usb-keyboard.c',
+        'usb-mouse.c',
+        'usb-other.c',
+        'usb-common.c',
+    ]
+endif
+
+dmx_input = static_library('dmx_input',
+	srcs_dmx_input,
+	include_directories: [
+            inc,
+            include_directories('../')
+        ],
+	dependencies: common_dep,
+        c_args: '-DHAVE_DMX_CONFIG_H',
+)
diff --git a/hw/dmx/meson.build b/hw/dmx/meson.build
new file mode 100644
index 000000000..bc693c1c9
--- /dev/null
+++ b/hw/dmx/meson.build
@@ -0,0 +1,68 @@
+srcs = [
+    'dmx.c',
+    'dmxcb.c',
+    'dmxcmap.c',
+    'dmxcursor.c',
+    'dmxdpms.c',
+    'dmxextension.c',
+    'dmxfont.c',
+    'dmxgc.c',
+    'dmxgcops.c',
+    'dmxinit.c',
+    'dmxinput.c',
+    'dmxlog.c',
+    'dmxpict.c',
+    'dmxpixmap.c',
+    'dmxprop.c',
+    'dmxscrinit.c',
+    'dmxstat.c',
+    'dmxsync.c',
+    'dmxvisual.c',
+    'dmxwindow.c',
+    '../../mi/miinitext.c',
+    '../../Xext/panoramiX.c',
+]
+
+subdir('config')
+subdir('input')
+subdir('examples')
+# XXX: subdir('doc')
+# XXX: subdir('doxygen')
+# XXX: subdir('man')
+
+dmx_dep = [
+    common_dep,
+    dependency('dmxproto', version: '>= 2.2.99.1'),
+    dependency('xext', version: '>= 1.0.99.4'),
+    dependency('xau'),
+    dependency('xmuu'),
+    dependency('xfixes'),
+    dependency('xrender'),
+    dependency('xi', version: '>= 1.2.99.1'),
+    xdmcp_dep,
+    dl_dep,
+]
+
+dmx_glx = ''
+if build_glx
+    srcs += 'dmx_glxvisuals.c'
+    subdir('glxProxy')
+endif
+
+executable(
+    'Xdmx',
+    srcs,
+    include_directories: inc,
+    dependencies: dmx_dep,
+    link_with: [
+        libxserver_main,
+        libxserver_fb,
+        libxserver,
+        libxserver_xkb_stubs,
+        dmx_input,
+        dmx_config,
+        dmx_glx,
+    ],
+    c_args: '-DHAVE_DMX_CONFIG_H',
+    install: true,
+)