meson: Add meson build system

This should be as complete as the autotools build system.

66 files changed, 4086 insertions, 0 deletions

diff --git a/meson.build b/meson.build
new file mode 100644
index 00000000..c3e4eec3
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,177 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+project(
+  'X Test Suite',
+  ['c'],
+  version : '0.99.1',
+  license : ['MIT', 'Artistic'],
+  meson_version : '>=0.49.1',  # Arbitrary
+  default_options : ['buildtype=debugoptimized', 'warning_level=0'],
+)
+
+
+# TODO: Does anyone even compile this code with these?
+
+# The C and ObjC compilers take the same set of arguments
+# cc = meson.get_compiler('c')
+# add_project_arguments(
+#   cc.get_supported_arguments(
+#     [
+#       '-Werror=unknown-warning-option',
+#       '-Werror=unused-command-line-argument',
+#       '-Wpointer-arith',
+#       '-Wmissing-declarations',
+#       '-Wformat2',
+#       '-Wstrict-prototypes',
+#       '-Wmissing-prototypes',
+#       '-Wnested-externs',
+#       '-Wbad-function-cast',
+#       '-Wold-style-definition',
+#       '-Wdeclaration-after-statement',
+#       '-Wunused',
+#       '-Wuninitialized',
+#       '-Wshadow',
+#       '-Wmissing-noreturn',
+#       '-Wmissing-format-attribute',
+#       '-Wredundant-decls',
+#       '-Wlogical-op',
+#       '-Werror=implicit',
+#       '-Werror=nonnull',
+#       '-Werror=init-self',
+#       '-Werror=main',
+#       '-Werror=missing-braces',
+#       '-Werror=sequence-point',
+#       '-Werror=return-type',
+#       '-Werror=trigraphs',
+#       '-Werror=array-bounds',
+#       '-Werror=write-strings',
+#       '-Werror=address',
+#       '-Werror=int-to-pointer-cast',
+#       '-Werror=attributes',
+#     ],
+#   ),
+#   language : ['c'],
+# )
+
+# This code is such a pile of shit that we just don't want any warnings, and
+# setting warn_level=0 at the meson level is not enough, we need to just set -w
+# or /w to make it shut up.
+cc = meson.get_compiler('c')
+add_project_arguments(cc.first_supported_argument(['-w', '/w']), language: ['c'])
+
+conf = configuration_data()
+conf.set_quoted('DEFAULT_TET_ROOT', get_option('datadir'))
+conf.set_quoted('DEFAULT_TET_EXEC_ROOT', get_option('libexecdir'))
+conf.set('TET_LITE', 1)
+conf.set('XT_X_RELEASE', 6)
+conf.set('XTESTEXTENSION', 1)
+conf.set('INPUTEXTENSION', 1)
+
+dep_x11 = dependency('x11')
+dep_xext = dependency('xext')
+dep_xi = dependency('xi')
+dep_xtst = dependency('xtst')
+dep_xau = dependency('xau')
+dep_xtrans = dependency('xtrans')
+dep_xmu = dependency('xmu')
+dep_xaw7 = dependency('xaw7')
+
+deps_xts = [dep_x11, dep_xext, dep_xi, dep_xtst, dep_xau]
+deps_xt = [dep_x11, dep_xext, dep_xi, dep_xtst, dep_xtrans]
+deps_xaw = [dep_x11, dep_xext, dep_xi, dep_xtst, dep_xmu, dep_xaw7]
+
+# Get just the compiler/preprocessor args and includes for each dependency
+# they well be written to a variable called deps_<foo>_args
+foreach t : ['xts', 'xt', 'xaw']
+  _f = []
+  foreach d : get_variable('deps_' + t)
+    _f += d.partial_dependency(compile_args : true, includes : true)
+  endforeach
+  set_variable('deps_@0@_args'.format(t), _f)
+endforeach
+
+_trans = []
+foreach t : get_option('transport-order')
+  _trans += '@0@_TRANS'.format(t.to_upper())
+endforeach
+conf.set('LOCAL_TRANSPORT_LIST', ','.join(_trans))
+conf.set('UNIXCONN', 1)
+conf.set('TCPCONN', 1)
+
+# Needed for generating fonts
+prog_bdftopcf = find_program('bdftopcf')
+prog_mkfontdir = find_program('mkfontdir')
+
+# Needed for generating tetexec.cfg with xts-config
+prog_sed = find_program('sed')
+prog_perl = find_program('perl')
+prog_xset = find_program('xset')
+prog_xdpyinfo = find_program('xdpyinfo')
+
+# For generating man pages
+prog_asciidoc = find_program('asciidoc', required : get_option('manpages'))
+prog_xmlto = find_program('xmlto', required : get_option('manpages'))
+
+# TODO: putting config.h in the root is kinda a bad idea
+config_h = configure_file(
+  configuration : conf,
+  output : 'config.h',
+)
+add_project_arguments('-DHAVE_CONFIG_H', language : ['c'])
+
+inc_include = include_directories('include', '.') # Add . for config.h
+
+subdir('src/tet3')
+subdir('xts5')
+
+if prog_asciidoc.found() and prog_xmlto.found()
+  # XXX: Meson dones't currently support sunos/solaris, so free pass!
+  man_suffix = host_machine.system() == 'sunos' ? '5' : '7'
+
+  xts_txt_xml = custom_target(
+    'xts.txt.xml',
+    command : [
+      prog_asciidoc, '-b', 'docbook', '-d', 'manpage', '-o', '@OUTPUT@', '@INPUT@'
+    ],
+    input : files('README'),
+    output : 'xts.txt.xml',
+  )
+
+  xts_xml_man = custom_target(
+    'XTS.miscmansuffix',
+    command : [prog_xmlto, 'man', '-o', '@OUTDIR@', '@INPUT@'],
+    input : [xts_txt_xml],
+    output : 'XTS.miscmansuffix',
+  )
+
+  xts_man = custom_target(
+    'XTS.@0@'.format(man_suffix),
+    command : [
+      'sed', '-e', 's|miscmansuffix|@0@|'.format(man_suffix), '@INPUT@'
+    ],
+    input : [xts_xml_man],
+    output : 'XTS.@0@'.format(man_suffix),
+    install : true,
+    install_dir : get_option('prefix') / get_option('mandir') / man_suffix,
+    capture : true,
+  )
+endif
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 00000000..57115ae8
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,33 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+option(
+  'transport-order',
+  type : 'array',
+  choices : ['local', 'unix', 'tcp'],
+  value : ['unix', 'tcp'],
+  description : 'Order and types of transport to use.'
+)
+option(
+  'manpages',
+  type : 'feature',
+  description : 'Generate manpages'
+)
diff --git a/src/tet3/apilib/meson.build b/src/tet3/apilib/meson.build
new file mode 100644
index 00000000..7f802ca1
--- /dev/null
+++ b/src/tet3/apilib/meson.build
@@ -0,0 +1,65 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+files_libapi_s = files(
+  'dcancel.c',
+  'dconfig.c',
+  'dresfile.c',
+  'errno.c',
+  'exit.c',
+  'getlist.c',
+  'getsys.c',
+  'getsysid.c',
+  'libvers.c',
+  'remexec.c',
+  'remkill.c',
+  'remtime.c',
+  'remwait.c',
+  'rtab.c',
+  'sync.c',
+  'tdiscon.c',
+  'tet_exec.c',
+  'tet_fork.c',
+  'tet_spawn.c',
+)
+_install_dir = join_paths(get_option('libexecdir'), 'xts5')
+
+libapi_s = library(
+  'api_s',
+  files_libapi_s,
+  include_directories : [inc_include, inc_tet3],
+  # XXX: this seems like it's going to break badly
+  c_args : ['-DTET_DEFAULT_CONFIG="@0@"'.format(join_paths(meson.build_root(), 'xts5', 'tetexec.cfg'))],
+  link_whole : [libtcm_s, libdtet2],
+  override_options : ['b_lundef=false'],
+  install_dir : _install_dir,
+  install : get_option('default_library') == 'shared',
+)
+
+libapi = static_library(
+  'api',
+  ['tciface.c'],
+  include_directories : [inc_include, inc_tet3],
+  link_whole : [libtcm],
+)
+
+idep_tcmmain = declare_dependency(link_with : [libtcmmain, libapi])
+idep_tcmchild = declare_dependency(link_with : [libtcmchild, libapi])
diff --git a/src/tet3/dtet2lib/meson.build b/src/tet3/dtet2lib/meson.build
new file mode 100644
index 00000000..781dc0cb
--- /dev/null
+++ b/src/tet3/dtet2lib/meson.build
@@ -0,0 +1,106 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+files_libdtet2 = files(
+  'addarg.c',
+  'alarm.c',
+  'amsg.c',
+  'avmsg.c',
+  'basename.c',
+  'btmsg.c',
+  'bufchk.c',
+  'buftrace.c',
+  'dtmsg.c',
+  'dtsize.c',
+  'eaccess.c',
+  'equindex.c',
+  'errmap.c',
+  'errname.c',
+  'fappend.c',
+  'fcopy.c',
+  'fgetargs.c',
+  'fioclex.c',
+  'fork.c',
+  'ftoa.c',
+  'generror.c',
+  'genfatal.c',
+  'getargs.c',
+  'getcwd.c',
+  'getopt.c',
+  'globals.c',
+  'hexdump.c',
+  'iswin.c',
+  'ldst.c',
+  'llist.c',
+  'ltoa.c',
+  'ltoo.c',
+  'ltox.c',
+  'madir.c',
+  'maperr.c',
+  'mapsig.c',
+  'mapstat.c',
+  'mkdir.c',
+  'notty.c',
+  'optarg.c',
+  'prerror.c',
+  'ptflags.c',
+  'ptspid.c',
+  'ptstate.c',
+  'ptstype.c',
+  'pttype.c',
+  'ptype.c',
+  'putenv.c',
+  'remvar.c',
+  'repcode.c',
+  'reqcode.c',
+  'rescode.c',
+  'rtoa.c',
+  'sigmap.c',
+  'sigsafe.c',
+  'strstore.c',
+  'svote.c',
+  'sysbyid.c',
+  'sysent.c',
+  'systate.c',
+  'targs.c',
+  'tdump.c',
+  'tetdir.c',
+  'tetfcntl.c',
+  'tetsleep.c',
+  'tetspawn.c',
+  'tetstat.c',
+  'tetterm.c',
+  'tetunlnk.c',
+  'tfname.c',
+  'trace.c',
+  'unmaperr.c',
+  'unmapsig.c',
+  'valmsg.c',
+  'w32err.c',
+  'wait3.c',
+  'wsaerr.c',
+)
+
+libdtet2 = static_library(
+  'dtet2',
+  files_libdtet2,
+  include_directories : [inc_include, inc_tet3],
+)
diff --git a/src/tet3/meson.build b/src/tet3/meson.build
new file mode 100644
index 00000000..8e1f545b
--- /dev/null
+++ b/src/tet3/meson.build
@@ -0,0 +1,28 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+inc_tet3 = include_directories('inc')
+
+subdir('dtet2lib')
+subdir('tcm')
+subdir('apilib')
+subdir('tcclib')
+subdir('tcc')
diff --git a/src/tet3/tcc/meson.build b/src/tet3/tcc/meson.build
new file mode 100644
index 00000000..f7332bfb
--- /dev/null
+++ b/src/tet3/tcc/meson.build
@@ -0,0 +1,64 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+exe_tcc = executable(
+  'tcc',
+  [
+    'cleanup.c',
+    'config.c',
+    'copysave.c',
+    'dirtab.c',
+    'dtcc.c',
+    'environ.c',
+    'error.c',
+    'exec.c',
+    'fake.c',
+    'global.c',
+    'jnlproc.c',
+    'journal.c',
+    'keys.c',
+    'lock.c',
+    'procdir.c',
+    'proctab.c',
+    'proctc.c',
+    'proctcd.c',
+    'rescode.c',
+    'resdir.c',
+    'rrproc.c',
+    'scen1.c',
+    'scen2.c',
+    'scen3.c',
+    'scenario.c',
+    'scentab.c',
+    'service.c',
+    'sigtrap.c',
+    'syscall.c',
+    'systab.c',
+    'tcc.c',
+    'tcname.c',
+    'tool.c',
+    'utils.c',
+    'ynstr.c',
+  ],
+  include_directories : [inc_tet3, inc_include],
+  link_with : [libtcc],
+  install : true,
+)
diff --git a/src/tet3/tcclib/meson.build b/src/tet3/tcclib/meson.build
new file mode 100644
index 00000000..906dbb3a
--- /dev/null
+++ b/src/tet3/tcclib/meson.build
@@ -0,0 +1,27 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+libtcc = static_library(
+  'libtcc',
+  files('lockfile.c', 'lsdir.c', 'mktmpdir.c', 'procdir.c', 'rmrf.c', 'sharlock.c', 'tcfexec.c', 'w32wait.c'),
+  include_directories : [inc_tet3, inc_include],
+  link_with : [libapi, libapi_s],
+)
diff --git a/src/tet3/tcm/meson.build b/src/tet3/tcm/meson.build
new file mode 100644
index 00000000..8e28d86e
--- /dev/null
+++ b/src/tet3/tcm/meson.build
@@ -0,0 +1,47 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+libtcm_s = static_library(
+  'tcm_s',
+  ['ictp.c'],
+  include_directories : [inc_include, inc_tet3],
+)
+
+libtcm = static_library(
+  'tcm',
+  ['child.c', 'ckversion.c', 'dynlink.c', 'tcmfuncs.c'],
+  include_directories : [inc_include, inc_tet3],
+)
+
+# Don't link either of these directly, as you also need libapi. Instad
+# use the idep versions that already do that for you:
+# idep_tccmain and idep_tcmchild
+libtcmmain = static_library(
+  'tcmmain',
+  ['tcm.c', 'dtcm.c'],
+  include_directories : [inc_include, inc_tet3],
+)
+
+libtcmchild = static_library(
+  'tcmchild',
+  ['tcmchild.c'],
+  include_directories : [inc_include, inc_tet3],
+)
diff --git a/xts5/Makefile.am b/xts5/Makefile.am
index 920364fd..744d28cc 100644
--- a/xts5/Makefile.am
+++ b/xts5/Makefile.am
@@ -36,3 +36,4 @@ XTS_CONFIG = TET_ROOT='$(top_srcdir)' XSET='$(XSET)' XDPYINFO='$(XDPYINFO)' \
 	$(PERL) -p $(builddir)/bin/xts-config
 tetexec.cfg: tetexec.cfg.in $(builddir)/bin/xts-config
 	$(AM_V_GEN)$(XTS_CONFIG) < $< > $@.tmp && mv -f $@.tmp $@ || rm -f $@.tmp
+
diff --git a/xts5/SHAPE/meson.build b/xts5/SHAPE/meson.build
new file mode 100644
index 00000000..47551384
--- /dev/null
+++ b/xts5/SHAPE/meson.build
@@ -0,0 +1,50 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'SHAPE')
+
+_test_progs = [
+  'XShapeCombineMask',
+  'XShapeCombineRectangles',
+  'XShapeCombineRegion',
+  'XShapeCombineShape',
+  'XShapeGetRectangles',
+  'XShapeInputSelected',
+  'XShapeOffsetShape',
+  'XShapeQueryExtension',
+  'XShapeQueryExtents',
+  'XShapeQueryVersion',
+  'XShapeSelectInput',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
diff --git a/xts5/XI/meson.build b/xts5/XI/meson.build
new file mode 100644
index 00000000..8ddb86b9
--- /dev/null
+++ b/xts5/XI/meson.build
@@ -0,0 +1,75 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'XI')
+
+_test_progs = [
+  'AllowDeviceEvents',
+  'ChangeDeviceControl',
+  'ChangeFeedbackControl',
+  'ChangeKeyboardDevice',
+  'XChangeDeviceDontPropagateList',
+  'ChangePointerDevice',
+  'ChangeDeviceKeyMapping',
+  'CloseDevice',
+  'DeviceBell',
+  'XGetDeviceControl',
+  'GetFeedbackControl',
+  'XGetDeviceFocus',
+  'XGetDeviceDontPropagateList',
+  'GetExtensionVersion',
+  'GrabDevice',
+  'GrabDeviceButton',
+  'GrabDeviceKey',
+  'GetDeviceButtonMapping',
+  'XGetDeviceKeyMapping',
+  'XGetDeviceModifierMapping',
+  'GetDeviceMotionEvents',
+  'XGetSelectedExtensionEvents',
+  'ListInputDevices',
+  'Miscellaneous',
+  'OpenDevice',
+  'XQueryDeviceState',
+  'SetDeviceValuators',
+  'SetDeviceButtonMapping',
+  'XSetDeviceFocus',
+  'SetDeviceModifierMapping',
+  'SetDeviceMode',
+  'XSelectExtensionEvent',
+  'SendExtensionEvent',
+  'XUngrabDevice',
+  'UngrabDeviceButton',
+  'UngrabDeviceKey',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
diff --git a/xts5/XIproto/meson.build b/xts5/XIproto/meson.build
new file mode 100644
index 00000000..806b0a02
--- /dev/null
+++ b/xts5/XIproto/meson.build
@@ -0,0 +1,75 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'XIproto')
+
+_test_progs = [
+  'AllowDeviceEvents',
+  'ChangeDeviceControl',
+  'ChangeDeviceDontPropagateList',
+  'ChangeFeedbackControl',
+  'ChangeKeyboardDevice',
+  'ChangePointerDevice',
+  'ChangeDeviceKeyMapping',
+  'CloseDevice',
+  'DeviceBell',
+  'GetDeviceModifierMapping',
+  'GetFeedbackControl',
+  'GetExtensionVersion',
+  'GrabDevice',
+  'GrabDeviceButton',
+  'GrabDeviceKey',
+  'GetDeviceButtonMapping',
+  'GetDeviceControl',
+  'GetDeviceFocus',
+  'GetDeviceMotionEvents',
+  'GetDeviceDontPropagateList',
+  'GetDeviceKeyMapping',
+  'GetSelectedExtensionEvents',
+  'ListInputDevices',
+  'Miscellaneous',
+  'OpenDevice',
+  'QueryDeviceState',
+  'SetDeviceValuators',
+  'SetDeviceButtonMapping',
+  'SetDeviceFocus',
+  'SetDeviceModifierMapping',
+  'SetDeviceMode',
+  'SelectExtensionEvent',
+  'SendExtensionEvent',
+  'UngrabDevice',
+  'UngrabDeviceButton',
+  'UngrabDeviceKey',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxts5proto],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
diff --git a/xts5/Xlib10/meson.build b/xts5/Xlib10/meson.build
new file mode 100644
index 00000000..3555cf21
--- /dev/null
+++ b/xts5/Xlib10/meson.build
@@ -0,0 +1,62 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib10')
+
+_test_progs = [
+  'XActivateScreenSaver',
+  'XAddHost',
+  'XAddHosts',
+  'XAddToSaveSet',
+  'XChangeSaveSet',
+  'XDisableAccessControl',
+  'XEnableAccessControl',
+  'XForceScreenSaver',
+  'XGrabServer',
+  'XGetScreenSaver',
+  'XInstallColormap',
+  'XKillClient',
+  'XListHosts',
+  'XListInstalledColormaps',
+  'XRemoveFromSaveSet',
+  'XRemoveHost',
+  'XRemoveHosts',
+  'XReparentWindow',
+  'XResetScreenSaver',
+  'XSetAccessControl',
+  'XSetScreenSaver',
+  'XUngrabServer',
+  'XUninstallColormap',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxr5],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
diff --git a/xts5/Xlib11/meson.build b/xts5/Xlib11/meson.build
new file mode 100644
index 00000000..c3031299
--- /dev/null
+++ b/xts5/Xlib11/meson.build
@@ -0,0 +1,72 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib11')
+
+_test_progs = [
+  'ButtonPress',
+  'ButtonRelease',
+  'ClientMessage',
+  'ColormapNotify',
+  'ConfigureNotify',
+  'ConfigureRequest',
+  'CirculateNotify',
+  'CirculateRequest',
+  'CreateNotify',
+  'DestroyNotify',
+  'EnterNotify',
+  'Expose',
+  'FocusIn',
+  'FocusOut',
+  'GraphicsExpose',
+  'GravityNotify',
+  'KeymapNotify',
+  'KeyPress',
+  'KeyRelease',
+  'LeaveNotify',
+  'MapNotify',
+  'MappingNotify',
+  'MapRequest',
+  'MotionNotify',
+  'NoExpose',
+  'PropertyNotify',
+  'ReparentNotify',
+  'ResizeRequest',
+  'SelectionClear',
+  'SelectionNotify',
+  'SelectionRequest',
+  'UnmapNotify',
+  'VisibilityNotify',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxr5],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
diff --git a/xts5/Xlib12/XDisplayName/meson.build b/xts5/Xlib12/XDisplayName/meson.build
new file mode 100644
index 00000000..b520efe4
--- /dev/null
+++ b/xts5/Xlib12/XDisplayName/meson.build
@@ -0,0 +1,45 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib12', 'XDisplayName')
+
+executable(
+  'XDisplayName',
+  [gen_mc.process('XDisplayName.m')],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  link_with : [libxts5, libapi_s, libximtest, libfont, libxtest],
+  dependencies : [deps_xts, idep_tcmmain],
+  install_rpath : '../..',
+  install_dir : _install_dir,
+  install : true,
+)
+
+_e = executable(
+  'XDisplayName_Test1',
+  ['Test1.c'],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  link_with : [libxts5, libapi_s, libximtest, libxtest, libfont],
+  dependencies : [deps_xts, idep_tcmchild],
+  install_rpath : '../..',
+  install_dir : _install_dir,
+  install : true,
+)
+meson.add_install_script(fix_install_script, _install_dir, _e.full_path())
diff --git a/xts5/Xlib12/meson.build b/xts5/Xlib12/meson.build
new file mode 100644
index 00000000..9422e0b4
--- /dev/null
+++ b/xts5/Xlib12/meson.build
@@ -0,0 +1,66 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib12')
+
+_test_progs = [
+  'XCheckIfEvent',
+  'XCheckMaskEvent',
+  'XCheckTypedEvent',
+  'XCheckTypedWindowEvent',
+  'XCheckWindowEvent',
+  'XDisplayMotionBufferSize',
+  'XEventsQueued',
+  'XFlush',
+  'XGetErrorDatabaseText',
+  'XGetErrorText',
+  'XGetMotionEvents',
+  'XIfEvent',
+  'XMaskEvent',
+  'XNextEvent',
+  'XPeekEvent',
+  'XPeekIfEvent',
+  'XPending',
+  'XPutBackEvent',
+  'XSelectInput',
+  'XSendEvent',
+  'XSetAfterFunction',
+  'XSetErrorHandler',
+  'XSetIOErrorHandler',
+  'XSync',
+  'XSynchronize',
+  'XWindowEvent',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxr5],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
+subdir('XDisplayName')
diff --git a/xts5/Xlib13/meson.build b/xts5/Xlib13/meson.build
new file mode 100644
index 00000000..a235de4f
--- /dev/null
+++ b/xts5/Xlib13/meson.build
@@ -0,0 +1,71 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib13')
+
+_test_progs = [
+  'XAllowEvents',
+  'XAutoRepeatOff',
+  'XAutoRepeatOn',
+  'XBell',
+  'XChangeActivePointerGrab',
+  'XChangeKeyboardControl',
+  'XChangeKeyboardMapping',
+  'XChangePointerControl',
+  'XDeleteModifiermapEntry',
+  'XDisplayKeycodes',
+  'XFreeModifiermap',
+  'XGrabButton',
+  'XGrabKey',
+  'XGrabKeyboard',
+  'XGrabPointer',
+  'XGetInputFocus',
+  'XGetKeyboardControl',
+  'XGetKeyboardMapping',
+  'XGetModifierMapping',
+  'XGetPointerControl',
+  'XGetPointerMapping',
+  'XInsertModifiermapEntry',
+  'XNewModifiermap',
+  'XQueryKeymap',
+  'XSetInputFocus',
+  'XSetModifierMapping',
+  'XSetPointerMapping',
+  'XUngrabButton',
+  'XUngrabKey',
+  'XUngrabKeyboard',
+  'XUngrabPointer',
+  'XWarpPointer',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxr5],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
diff --git a/xts5/Xlib14/meson.build b/xts5/Xlib14/meson.build
new file mode 100644
index 00000000..edeebc04
--- /dev/null
+++ b/xts5/Xlib14/meson.build
@@ -0,0 +1,100 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib14')
+
+# tuple in the form [name, in_subdir]
+_test_progs = [
+  ['XBaseFontNameListOfFontSet', false],
+  ['XCloseIM', false],
+  ['XContextDependentDrawing', false],
+  ['XCreateFontSet', false],
+  ['XCreateIC', false],
+  ['XDestroyIC', false],
+  ['XDisplayOfIM', false],
+  ['XExtentsOfFontSet', false],
+  ['XFilterEvent', false],
+  ['XFontsOfFontSet', false],
+  ['XFreeFontSet', false],
+  ['XGetICValues', false],
+  ['XGetIMValues', false],
+  ['XIMOfIC', false],
+  ['XLocaleOfFontSet', false],
+  ['XLocaleOfIM', false],
+  ['XmbDrawImageString', true],
+  ['XmbDrawString', true],
+  ['XmbDrawText', true],
+  ['XmbLookupString', false],
+  ['XmbResetIC', false],
+  ['XmbSetWMProperties', false],
+  ['XmbTextEscapement', false],
+  ['XmbTextExtents', false],
+  ['XmbTextListToTextProperty', false],
+  ['XmbTextPerCharExtents', false],
+  ['XmbTextPropertyToTextList', false],
+  ['XOpenIM', false],
+  ['XSetICFocus', false],
+  ['XSetICValues', false],
+  ['XSupportsLocale', false],
+  ['XSetLocaleModifiers', false],
+  ['XUnsetICFocus', false],
+  ['XVaCreateNestedList', false],
+  ['XwcDrawImageString', true],
+  ['XwcDrawString', true],
+  ['XwcDrawText', true],
+  ['XwcFreeStringList', false],
+  ['XwcLookupString', false],
+  ['XwcResetIC', false],
+  ['XwcTextEscapement', false],
+  ['XwcTextListToTextProperty', false],
+  ['XwcTextPerCharExtents', false],
+  ['XwcTextPropertyToTextList', false],
+  ['XwcTextExtents', false],
+]
+
+foreach t : _test_progs
+  if t[1]
+    _source = join_paths(t[0], t[0])
+    _install = join_paths(_install_dir, t[0])
+  else
+    _source = t[0]
+    _install = _install_dir
+  endif
+  executable(
+    t[0],
+    [gen_mc.process(_source + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxr5],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : join_paths(get_option('prefix'), get_option('libexecdir'), 'xts5'),
+    install_dir : _install,
+    install : true,
+  )
+endforeach
+
+foreach d : ['XmbDrawImageString', 'XmbDrawString', 'XmbDrawText', 'XwcDrawImageString', 'XwcDrawString', 'XwcDrawText']
+  install_data(
+    join_paths(d, 'a1.C.dat'),
+    join_paths(d, 'a1.ko.dat'),
+    install_mode : ['r--r--r--'],
+    install_dir : join_paths(_install_dir, d),
+  )
+endforeach
diff --git a/xts5/Xlib15/XSetWMProperties/meson.build b/xts5/Xlib15/XSetWMProperties/meson.build
new file mode 100644
index 00000000..7597b928
--- /dev/null
+++ b/xts5/Xlib15/XSetWMProperties/meson.build
@@ -0,0 +1,47 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib15', 'XSetWMProperties')
+
+executable(
+  'XSetWMProperties',
+  [gen_mc.process('XSetWMProperties.m')],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  link_with : [libxts5, libapi_s, libxr5],
+  dependencies : [deps_xts, idep_tcmmain],
+  install_rpath : '../..',
+  install_dir : _install_dir,
+  install : true,
+)
+
+foreach t : ['Test1', 'Test2']
+  _e = executable(
+    'XDisplayName_' + t,
+    [t + '.c'],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libximtest, libxtest, libfont],
+    dependencies : [deps_xts, idep_tcmchild],
+    install_rpath : '../..',
+    install_dir : _install_dir,
+    install : true,
+  )
+  meson.add_install_script(fix_install_script, _install_dir, _e.full_path())
+endforeach
diff --git a/xts5/Xlib15/meson.build b/xts5/Xlib15/meson.build
new file mode 100644
index 00000000..64656243
--- /dev/null
+++ b/xts5/Xlib15/meson.build
@@ -0,0 +1,85 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib15')
+
+# tuple in the form [filename, in_subdir]
+_test_progs = [
+  'XAllocClassHint',
+  'XAllocIconSize',
+  'XAllocStandardColormap',
+  'XAllocSizeHints',
+  'XAllocWMHints',
+  'XDefaultString',
+  'XFreeStringList',
+  'XFetchName',
+  'XGetClassHint',
+  'XGetCommand',
+  'XGetIconName',
+  'XGetIconSizes',
+  'XGetRGBColormaps',
+  'XGetTransientForHint',
+  'XGetTextProperty',
+  'XGetWMClientMachine',
+  'XGetWMColormapWindows',
+  'XGetWMHints',
+  'XGetWMIconName',
+  'XGetWMName',
+  'XGetWMNormalHints',
+  'XGetWMProtocols',
+  'XGetWMSizeHints',
+  'XIconifyWindow',
+  'XReconfigureWMWindow',
+  'XSetClassHint',
+  'XSetCommand',
+  'XSetIconName',
+  'XSetIconSizes',
+  'XSetRGBColormaps',
+  'XStringListToTextProperty',
+  'XStoreName',
+  'XSetTransientForHint',
+  'XSetTextProperty',
+  'XSetWMClientMachine',
+  'XSetWMColormapWindows',
+  'XSetWMHints',
+  'XSetWMIconName',
+  'XSetWMName',
+  'XSetWMNormalHints',
+  'XSetWMProtocols',
+  'XSetWMSizeHints',
+  'XTextPropertyToStringList',
+  'XWithdrawWindow',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxr5],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
+subdir('XSetWMProperties')
diff --git a/xts5/Xlib16/meson.build b/xts5/Xlib16/meson.build
new file mode 100644
index 00000000..1b14285c
--- /dev/null
+++ b/xts5/Xlib16/meson.build
@@ -0,0 +1,68 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib16')
+
+_test_progs = [
+  'XrmCombineDatabase',
+  'XrmCombineFileDatabase',
+  'XrmDestroyDatabase',
+  'XrmEnumerateDatabase',
+  'XrmGetDatabase',
+  'XrmGetFileDatabase',
+  'XrmGetResource',
+  'XrmGetStringDatabase',
+  'XrmInitialize',
+  'XrmLocaleOfDatabase',
+  'XrmMergeDatabases',
+  'XrmParseCommand',
+  'XrmPermStringToQuark',
+  'XrmPutFileDatabase',
+  'XrmPutLineResource',
+  'XrmPutResource',
+  'XrmPutStringResource',
+  'XrmQGetResource',
+  'XrmQGetSearchList',
+  'XrmQGetSearchResource',
+  'XrmQPutResource',
+  'XrmQPutStringResource',
+  'XrmQuarkToString',
+  'XrmSetDatabase',
+  'XrmStringToBindingQuarkList',
+  'XrmStringToQuark',
+  'XrmStringToQuarkList',
+  'XrmUniqueQuark',
+  'XResourceManagerString',
+  'XScreenResourceString',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxr5],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xlib17/XGetDefault/meson.build b/xts5/Xlib17/XGetDefault/meson.build
new file mode 100644
index 00000000..f4e412c5
--- /dev/null
+++ b/xts5/Xlib17/XGetDefault/meson.build
@@ -0,0 +1,52 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib17', 'XGetDefault')
+
+executable(
+  'XGetDefault',
+  [gen_mc.process('XGetDefault.m')],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  link_with : [libxts5, libapi_s, libxr5],
+  dependencies : [deps_xts, idep_tcmmain],
+  install_rpath : '../..',
+  install_dir : _install_dir,
+  install : true,
+)
+
+foreach t: ['3', '4', '5']
+  _e = executable(
+    'XDisplayName_Test' + t,
+    ['Test@0@.c'.format(t)],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libximtest, libxtest, libfont],
+    dependencies : [deps_xts, idep_tcmchild],
+    install_rpath : '../..',
+    install_dir : _install_dir,
+    install : true,
+  )
+  meson.add_install_script(fix_install_script, _install_dir, _e.full_path())
+endforeach
+
+install_subdir(
+  'EnvXdefaults',
+  install_dir : _install_dir,
+)
diff --git a/xts5/Xlib17/meson.build b/xts5/Xlib17/meson.build
new file mode 100644
index 00000000..32463952
--- /dev/null
+++ b/xts5/Xlib17/meson.build
@@ -0,0 +1,94 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib17')
+
+_test_progs = [
+  'XAddPixel',
+  'XClipBox',
+  'XCreateBitmapFromData',
+  'XCreateImage',
+  'XCreatePixmapFromBitmapData',
+  'XCreateRegion',
+  'XDeleteContext',
+  'XDestroyImage',
+  'XDestroyRegion',
+  'XEmptyRegion',
+  'XEqualRegion',
+  'XFindContext',
+  'XFetchBuffer',
+  'XFetchBytes',
+  'XGetPixel',
+  'XGetVisualInfo',
+  'XIntersectRegion',
+  'IsCursorKey',
+  'IsFunctionKey',
+  'IsKeypadKey',
+  'IsModifierKey',
+  'IsMiscFunctionKey',
+  'IsPFKey',
+  'XKeycodeToKeysym',
+  'XKeysymToKeycode',
+  'XKeysymToString',
+  'XLookupKeysym',
+  'XLookupString',
+  'XMatchVisualInfo',
+  'XOffsetRegion',
+  'XPolygonRegion',
+  'XPointInRegion',
+  'Xpermalloc',
+  'XParseGeometry',
+  'XPutPixel',
+  'XRebindKeysym',
+  'XRectInRegion',
+  'XReadBitmapFile',
+  'XRefreshKeyboardMapping',
+  'XRotateBuffers',
+  'XSubImage',
+  'XSubtractRegion',
+  'XShrinkRegion',
+  'XStoreBuffer',
+  'XStoreBytes',
+  'XSetRegion',
+  'XStringToKeysym',
+  'XSaveContext',
+  'XUnionRectWithRegion',
+  'XUnionRegion',
+  'XUniqueContext',
+  'XWMGeometry',
+  'XWriteBitmapFile',
+  'XXorRegion',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxr5],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
+subdir('XGetDefault')
diff --git a/xts5/Xlib3/XDisplayString/meson.build b/xts5/Xlib3/XDisplayString/meson.build
new file mode 100644
index 00000000..24165e98
--- /dev/null
+++ b/xts5/Xlib3/XDisplayString/meson.build
@@ -0,0 +1,49 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib3', 'XDisplayString')
+
+foreach t : [['XDisplayString', [gen_mc.process('XDisplayString.m')]],
+             ['XDisplayString_m', [gen_mc.process('XDisplayString.m', extra_args : ['-m'])]]]
+  executable(
+    t[0],
+    t[1],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libximtest, libfont, libxtest],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '../..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
+_e = executable(
+  'XDisplayString_Test1',
+  ['Test1.c'],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  link_with : [libxts5, libapi_s, libximtest, libxtest, libfont],
+  dependencies : [deps_xts, idep_tcmchild],
+  install_rpath : '../..',
+  install_dir : _install_dir,
+  install : true,
+)
+
+meson.add_install_script(fix_install_script, _install_dir, _e.full_path())
diff --git a/xts5/Xlib3/XOpenDisplay/meson.build b/xts5/Xlib3/XOpenDisplay/meson.build
new file mode 100644
index 00000000..389659bf
--- /dev/null
+++ b/xts5/Xlib3/XOpenDisplay/meson.build
@@ -0,0 +1,46 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib3', 'XOpenDisplay')
+
+executable(
+  'XOpenDisplay',
+  [gen_mc.process('XOpenDisplay.m')],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  link_with : [libxts5, libapi_s],
+  dependencies : [deps_xts, idep_tcmmain],
+  install_rpath : '../..',
+  install_dir : _install_dir,
+  install : true,
+)
+
+_e = executable(
+  'XOpenDisplay_Test1',
+  ['Test1.c'],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  link_with : [libxts5, libapi_s, libximtest, libxtest, libfont],
+  dependencies : [deps_xts, idep_tcmchild],
+  install_rpath : '../..',
+  install_dir : _install_dir,
+  install : true,
+)
+
+meson.add_install_script(fix_install_script, _install_dir, _e.full_path())
diff --git a/xts5/Xlib3/meson.build b/xts5/Xlib3/meson.build
new file mode 100644
index 00000000..49f754e6
--- /dev/null
+++ b/xts5/Xlib3/meson.build
@@ -0,0 +1,107 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib3')
+
+# List of tuples in the form (name, _m variant)
+_test_progs = [
+  ['XAllPlanes', false],
+  ['XBitmapBitOrder', true],
+  ['XBitmapPad', true],
+  ['XBitmapUnit', true],
+  ['XBlackPixel', true],
+  ['XBlackPixelOfScreen', true],
+  ['XCellsOfScreen', true],
+  ['XCloseDisplay', false],
+  ['XConnectionNumber', true],
+  ['XDefaultColormap', true],
+  ['XDefaultColormapOfScreen', true],
+  ['XDefaultDepth', true],
+  ['XDefaultDepthOfScreen', true],
+  ['XDefaultGC', true],
+  ['XDefaultGCOfScreen', true],
+  ['XDefaultRootWindow', true],
+  ['XDefaultScreen', true],
+  ['XDefaultScreenOfDisplay', true],
+  ['XDefaultVisual', true],
+  ['XDefaultVisualOfScreen', true],
+  ['XDisplayCells', true],
+  ['XDisplayHeight', true],
+  ['XDisplayHeightMM', true],
+  ['XDisplayOfScreen', true],
+  ['XDisplayPlanes', true],
+  ['XDisplayWidth', true],
+  ['XDisplayWidthMM', true],
+  ['XDoesBackingStore', true],
+  ['XDoesSaveUnders', true],
+  ['XEventMaskOfScreen', true],
+  ['XFree', false],
+  ['XHeightMMOfScreen', true],
+  ['XHeightOfScreen', true],
+  ['XImageByteOrder', true],
+  ['XLastKnownRequestProcessed', true],
+  ['XListDepths', false],
+  ['XListPixmapFormats', false],
+  ['XMaxCmapsOfScreen', true],
+  ['XMinCmapsOfScreen', true],
+  ['XNextRequest', true],
+  ['XNoOp', false],
+  ['XPlanesOfScreen', true],
+  ['XProtocolRevision', true],
+  ['XProtocolVersion', true],
+  ['XQLength', true],
+  ['XRootWindow', true],
+  ['XRootWindowOfScreen', true],
+  ['XScreenCount', true],
+  ['XScreenNumberOfScreen', false],
+  ['XScreenOfDisplay', true],
+  ['XServerVendor', true],
+  ['XSetCloseDownMode', false],
+  ['XVendorRelease', true],
+  ['XWhitePixel', true],
+  ['XWhitePixelOfScreen', true],
+  ['XWidthMMOfScreen', true],
+  ['XWidthOfScreen', true],
+]
+
+foreach t : _test_progs
+  args = [[[], t[0]]]
+  if t[1]
+    args += [['-m', t[0] + '_m']]
+  endif
+  foreach p : args
+    _extra = p[0]
+    _name = p[1]
+    executable(
+      _name,
+      [gen_mc.process(t[0] + '.m', extra_args : _extra)],
+      include_directories : [inc_include, inc_tet3, inc_xts5],
+      link_with : [libxts5, libapi_s],
+      dependencies : [deps_xts, idep_tcmmain],
+      install_rpath : '..',
+      install_dir : _install_dir,
+      install : true,
+    )
+  endforeach
+endforeach
+
+subdir('XDisplayString')
+subdir('XOpenDisplay')
diff --git a/xts5/Xlib4/meson.build b/xts5/Xlib4/meson.build
new file mode 100644
index 00000000..bedf961b
--- /dev/null
+++ b/xts5/Xlib4/meson.build
@@ -0,0 +1,104 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib4')
+
+# tuples in the form [name, in_subdir]
+_test_progs = [
+  ['XChangeWindowAttributes', true],
+  ['XConfigureWindow', true],
+  ['XCirculateSubwindows', true],
+  ['XCirculateSubwindowsDown', true],
+  ['XCirculateSubwindowsUp', true],
+  ['XCreateSimpleWindow', true],
+  ['XCreateWindow', true],
+  ['XDefineCursor', false],
+  ['XDestroySubwindows', false],
+  ['XDestroyWindow', false],
+  ['XLowerWindow', true],
+  ['XMapRaised', true],
+  ['XMapSubwindows', true],
+  ['XMapWindow', true],
+  ['XMoveResizeWindow', true],
+  ['XMoveWindow', false],
+  ['XRestackWindows', true],
+  ['XRaiseWindow', true],
+  ['XResizeWindow', true],
+  ['XSetWindowBackground', false],
+  ['XSetWindowBackgroundPixmap', false],
+  ['XSetWindowBorder', false],
+  ['XSetWindowBorderPixmap', true],
+  ['XSetWindowBorderWidth', true],
+  ['XSetWindowColormap', false],
+  ['XUndefineCursor', false],
+  ['XUnmapSubwindows', false],
+  ['XUnmapWindow', false],
+  ['XVisualIDFromVisual', false],
+]
+
+foreach t : _test_progs
+  if t[1]
+    _source = join_paths(t[0], t[0])
+    _install = join_paths(_install_dir, t[0])
+  else
+    _source = t[0]
+    _install = _install_dir
+  endif
+  executable(
+    t[0],
+    [gen_mc.process(_source + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install,
+    install : true,
+  )
+endforeach
+
+foreach x : [['XChangeWindowAttributes', ['a2.dat', 'a3.dat', 'a13.dat', 'a17.dat']],
+             ['XCirculateSubwindows', ['a1.dat', 'a2.dat']],
+             ['XCirculateSubwindowsDown', ['a1.dat']],
+             ['XCirculateSubwindowsUp', ['a1.dat']],
+             ['XConfigureWindow', ['a3.dat', 'a6.dat', 'a7.dat', 'a8.dat', 'a9.dat', 'a10.dat', 'a11.dat', 'a12.dat', 'a13.dat', 'a14.dat', 'a15.dat', 'a16.dat', 'a17.dat', 'a18.dat', 'a19.dat']],
+             ['XCreateSimpleWindow', ['a4.dat']],
+             ['XCreateWindow', ['a11.dat', 'a15.dat']],
+             ['XLowerWindow', ['a1.dat']],
+             ['XMapRaised', ['a1.dat', 'a4.dat']],
+             ['XMapSubwindows', ['a1.dat']],
+             ['XMapWindow', ['a4.dat']],
+             ['XMoveResizeWindow', ['a2.dat']],
+             ['XRaiseWindow', ['a1.dat']],
+             ['XResizeWindow', ['a2.dat']],
+             ['XRestackWindows', ['a1.dat', 'a2.dat', 'a3.dat']],
+             ['XSetWindowBorderPixmap', ['a1.dat', 'a2.dat', 'a3.dat']],
+             ['XSetWindowBorderWidth', ['a1.dat']]]
+  d = x[0]
+  files = []
+  foreach f : x[1]
+    file = join_paths(d, f)
+    install_data(
+      file,
+      install_mode : ['r--r--r--'],
+      install_dir : join_paths(_install_dir, d),
+    )
+  endforeach
+endforeach
diff --git a/xts5/Xlib5/meson.build b/xts5/Xlib5/meson.build
new file mode 100644
index 00000000..db0540df
--- /dev/null
+++ b/xts5/Xlib5/meson.build
@@ -0,0 +1,53 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib5')
+
+_test_progs = [
+  'XChangeProperty',
+  'XConvertSelection',
+  'XDeleteProperty',
+  'XGetAtomName',
+  'XGetGeometry',
+  'XGetSelectionOwner',
+  'XGetWindowAttributes',
+  'XGetWindowProperty',
+  'XInternAtom',
+  'XListProperties',
+  'XQueryPointer',
+  'XQueryTree',
+  'XRotateWindowProperties',
+  'XSetSelectionOwner',
+  'XTranslateCoordinates',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xlib6/meson.build b/xts5/Xlib6/meson.build
new file mode 100644
index 00000000..717bcd92
--- /dev/null
+++ b/xts5/Xlib6/meson.build
@@ -0,0 +1,46 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib6')
+
+_test_progs = [
+  'XCreateFontCursor',
+  'XCreateGlyphCursor',
+  'XCreatePixmap',
+  'XCreatePixmapCursor',
+  'XFreeCursor',
+  'XFreePixmap',
+  'XQueryBestCursor',
+  'XRecolorCursor',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xlib7/meson.build b/xts5/Xlib7/meson.build
new file mode 100644
index 00000000..a238e87b
--- /dev/null
+++ b/xts5/Xlib7/meson.build
@@ -0,0 +1,96 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib7')
+
+_test_progs = [
+  'XAllocColor',
+  'XAllocColorCells',
+  'XAllocColorPlanes',
+  'XAllocNamedColor',
+  'XcmsAllocColor',
+  'XcmsAddColorSpace',
+  'XcmsAddFunctionSet',
+  'XcmsAllocNamedColor',
+  'XcmsCCCOfColormap',
+  'XcmsConvertColors',
+  'XcmsCIELabQueryMaxLC',
+  'XcmsCIELabQueryMaxC',
+  'XcmsCIELabQueryMaxL',
+  'XcmsConversionProc',
+  'XcmsConversionProc2',
+  'XcmsCreateCCC',
+  'XcmsDefaultCCC',
+  'XcmsDisplayOfCCC',
+  'XcmsFreeCCC',
+  'XcmsFormatOfPrefix',
+  'XcmsLookupColor',
+  'XcmsCIELabQueryMinL',
+  'XcmsPrefixOfFormat',
+  'XcmsQueryBlack',
+  'XcmsQueryBlue',
+  'XcmsQueryColor',
+  'XcmsQueryColors',
+  'XcmsQueryGreen',
+  'XcmsCIELuvQueryMaxC',
+  'XcmsCIELuvQueryMinL',
+  'XcmsCIELuvQueryMaxL',
+  'XcmsCIELuvQueryMaxLC',
+  'XcmsQueryRed',
+  'XcmsQueryWhite',
+  'XcmsScreenNumberOfCCC',
+  'XcmsStoreColor',
+  'XcmsStoreColors',
+  'XcmsTekHVCQueryMaxC',
+  'XcmsTekHVCQueryMinV',
+  'XcmsTekHVCQueryMaxV',
+  'XcmsTekHVCQueryMaxVC',
+  'XcmsTekHVCQueryMaxVSamples',
+  'XcmsVisualOfCCC',
+  'XcmsSetWhiteAdjustProc',
+  'XcmsScreenWhitePointOfCCC',
+  'XcmsClientWhitePointOfCCC',
+  'XcmsSetWhitePoint',
+  'XCopyColormapAndFree',
+  'XCreateColormap',
+  'XFreeColormap',
+  'XFreeColors',
+  'XLookupColor',
+  'XParseColor',
+  'XQueryColor',
+  'XQueryColors',
+  'XStoreColor',
+  'XStoreColors',
+  'XStoreNamedColor',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxr5],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xlib8/meson.build b/xts5/Xlib8/meson.build
new file mode 100644
index 00000000..48009f1e
--- /dev/null
+++ b/xts5/Xlib8/meson.build
@@ -0,0 +1,67 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib8')
+
+_test_progs = [
+  'XChangeGC', 
+  'XCopyGC', 
+  'XCreateGC', 
+  'XFlushGC', 
+  'XFreeGC', 
+  'XGContextFromGC', 
+  'XGetGCValues', 
+  'XQueryBestStipple', 
+  'XQueryBestSize', 
+  'XQueryBestTile', 
+  'XSetArcMode', 
+  'XSetBackground', 
+  'XSetClipMask', 
+  'XSetClipOrigin', 
+  'XSetClipRectangles', 
+  'XSetDashes', 
+  'XSetFillRule', 
+  'XSetFillStyle', 
+  'XSetFunction', 
+  'XSetFont', 
+  'XSetForeground', 
+  'XSetGraphicsExposures', 
+  'XSetLineAttributes', 
+  'XSetPlaneMask', 
+  'XSetSubwindowMode', 
+  'XSetStipple', 
+  'XSetState', 
+  'XSetTile', 
+  'XSetTSOrigin',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxr5],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xlib9/meson.build b/xts5/Xlib9/meson.build
new file mode 100644
index 00000000..aafc4ad6
--- /dev/null
+++ b/xts5/Xlib9/meson.build
@@ -0,0 +1,128 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xlib9')
+
+# tuple in the form [name, in_subdir]
+_test_progs = [
+  ['XClearArea', false],
+  ['XClearWindow', false],
+  ['XCopyArea', true],
+  ['XCopyPlane', true],
+  ['XDrawArc', true],
+  ['XDrawArcs', true],
+  ['XDrawImageString16', true],
+  ['XDrawImageString', true],
+  ['XDrawLine', true],
+  ['XDrawLines', true],
+  ['XDrawPoint', true],
+  ['XDrawPoints', true],
+  ['XDrawRectangle', true],
+  ['XDrawRectangles', true],
+  ['XDrawSegments', true],
+  ['XDrawString', true],
+  ['XDrawString16', true],
+  ['XDrawText', true],
+  ['XDrawText16', true],
+  ['XFillArc', true],
+  ['XFillArcs', true],
+  ['XFillPolygon', true],
+  ['XFillRectangle', true],
+  ['XFillRectangles', true],
+  ['XFreeFont', false],
+  ['XFreeFontInfo', false],
+  ['XFreeFontNames', false],
+  ['XFreeFontPath', false],
+  ['XGetFontProperty', false],
+  ['XGetFontPath', false],
+  ['XGetImage', false],
+  ['XGetSubImage', false],
+  ['XLoadFont', true],
+  ['XLoadQueryFont', true],
+  ['XListFonts', false],
+  ['XListFontsWithInfo', false],
+  ['XPutImage', true],
+  ['XQueryFont', false],
+  ['XQueryTextExtents16', false],
+  ['XQueryTextExtents', false],
+  ['XSetFontPath', false],
+  ['XTextExtents16', false],
+  ['XTextExtents', false],
+  ['XTextWidth', false],
+  ['XTextWidth16', false],
+  ['XUnloadFont', false],
+]
+
+foreach t : _test_progs
+  if t[1]
+    _source = join_paths(t[0], t[0])
+    _install = join_paths(_install_dir, t[0])
+  else
+    _source = t[0]
+    _install = _install_dir
+  endif
+  executable(
+    t[0],
+    [gen_mc.process(_source + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install,
+    install : true,
+  )
+endforeach
+
+foreach x : [['XCopyArea', ['a27.dat', 'a30.dat']],
+             ['XDrawArc', ['a1.dat', 'a5.dat', 'a6.dat', 'a34.dat', 'a42.dat', 'a49.dat', 'a50.dat', 'a51.dat', 'a52.dat', 'a53.dat', 'a54.dat', 'a55.dat', 'a64.dat', 'a66.dat', 'a68.dat', 'a73.dat', 'a76.dat', 'a77.dat', 'a78.dat', 'a79.dat', 'a83.dat', 'a86.dat', 'a88.dat', 'a90.dat', 'a92.dat', 'a93.dat', 'a94.dat', 'a95.dat']],
+             ['XDrawArcs', ['a1.dat', 'a5.dat', 'a6.dat', 'a7.dat', 'a12.dat','a37.dat', 'a45.dat', 'a52.dat', 'a53.dat', 'a54.dat', 'a55.dat', 'a56.dat', 'a57.dat', 'a58.dat','a67.dat', 'a69.dat', 'a71.dat', 'a76.dat', 'a79.dat', 'a80.dat', 'a81.dat', 'a82.dat', 'a86.dat', 'a87.dat', 'a88.dat', 'a89.dat', 'a93.dat', 'a96.dat', 'a98.dat', 'a100.dat', 'a102.dat', 'a103.dat', 'a104.dat', 'a105.dat']],
+             ['XDrawImageString', ['a1.dat', 'a3.dat', 'a11.dat', 'a14.dat', 'a16.dat', 'a18.dat']],
+             ['XDrawImageString16', ['a1.dat', 'a3.dat', 'a11.dat', 'a14.dat', 'a16.dat', 'a18.dat']],
+             ['XDrawLine', ['a1.dat', 'a2.dat', 'a3.dat', 'a4.dat', 'a23.dat', 'a31.dat', 'a38.dat', 'a39.dat', 'a40.dat', 'a41.dat', 'a42.dat', 'a43.dat', 'a44.dat', 'a53.dat', 'a55.dat', 'a57.dat', 'a62.dat', 'a65.dat', 'a66.dat', 'a67.dat', 'a68.dat', 'a72.dat', 'a75.dat', 'a77.dat', 'a79.dat', 'a81.dat', 'a82.dat', 'a83.dat', 'a84.dat']],
+             ['XDrawLines', ['a1.dat', 'a3.dat', 'a4.dat', 'a5.dat', 'a7.dat', 'a9.dat', 'a28.dat', 'a36.dat', 'a43.dat', 'a44.dat', 'a45.dat', 'a46.dat', 'a47.dat', 'a48.dat', 'a49.dat', 'a58.dat', 'a60.dat', 'a62.dat', 'a67.dat', 'a70.dat', 'a71.dat', 'a72.dat', 'a73.dat', 'a77.dat', 'a78.dat', 'a79.dat', 'a80.dat', 'a81.dat', 'a87.dat', 'a89.dat', 'a91.dat', 'a93.dat', 'a94.dat', 'a95.dat', 'a96.dat']],
+             ['XDrawPoint', ['a20.dat', 'a25.dat', 'a28.dat']],
+             ['XDrawPoints', ['a1.dat', 'a3.dat', 'a23.dat', 'a28.dat', 'a31.dat']],
+             ['XDrawRectangle', ['a1.dat', 'a4.dat', 'a23.dat', 'a31.dat', 'a38.dat', 'a39.dat', 'a40.dat', 'a41.dat', 'a42.dat', 'a43.dat', 'a44.dat', 'a50.dat', 'a51.dat', 'a52.dat', 'a53.dat', 'a54.dat', 'a57.dat', 'a58.dat', 'a59.dat', 'a60.dat', 'a64.dat', 'a67.dat', 'a69.dat', 'a71.dat', 'a73.dat', 'a74.dat', 'a75.dat', 'a76.dat']],
+             ['XDrawRectangles', ['a1.dat', 'a5.dat', 'a6.dat', 'a25.dat', 'a33.dat', 'a40.dat', 'a41.dat', 'a42.dat', 'a43.dat', 'a44.dat', 'a45.dat', 'a46.dat', 'a52.dat', 'a53.dat', 'a54.dat', 'a55.dat', 'a56.dat', 'a59.dat', 'a60.dat', 'a61.dat', 'a62.dat', 'a66.dat', 'a69.dat', 'a71.dat', 'a73.dat', 'a75.dat', 'a76.dat', 'a77.dat', 'a78.dat']],
+             ['XDrawSegments', ['a1.dat', 'a3.dat', 'a4.dat', 'a5.dat', 'a24.dat', 'a32.dat', 'a39.dat', 'a40.dat', 'a41.dat', 'a42.dat', 'a43.dat', 'a44.dat', 'a45.dat', 'a54.dat', 'a56.dat', 'a58.dat', 'a63.dat', 'a66.dat', 'a67.dat', 'a68.dat', 'a69.dat', 'a73.dat', 'a76.dat', 'a78.dat', 'a80.dat', 'a82.dat', 'a83.dat', 'a84.dat', 'a85.dat']],
+             ['XDrawString', ['a1.dat', 'a3.dat', 'a23.dat', 'a24.dat', 'a25.dat', 'a26.dat', 'a30.dat', 'a33.dat', 'a35.dat', 'a37.dat', 'a39.dat']],
+             ['XDrawString16', ['a1.dat', 'a3.dat', 'a23.dat', 'a24.dat', 'a25.dat', 'a26.dat', 'a30.dat', 'a33.dat', 'a35.dat', 'a37.dat', 'a39.dat']],
+             ['XDrawText', ['a1.dat', 'a3.dat', 'a5.dat', 'a27.dat', 'a28.dat', 'a29.dat', 'a30.dat', 'a34.dat', 'a37.dat', 'a39.dat', 'a41.dat', 'a43.dat']],
+             ['XDrawText16', ['a1.dat', 'a3.dat', 'a4.dat', 'a27.dat', 'a28.dat', 'a29.dat', 'a30.dat', 'a34.dat', 'a37.dat', 'a39.dat', 'a41.dat', 'a43.dat']],
+             ['XFillArc', ['a1.dat', 'a2.dat', 'a3.dat', 'a23.dat', 'a24.dat', 'a25.dat', 'a26.dat', 'a30.dat', 'a33.dat', 'a35.dat', 'a37.dat', 'a39.dat']],
+             ['XFillArcs', ['a1.dat', 'a2.dat', 'a3.dat', 'a6.dat', 'a25.dat', 'a26.dat', 'a27.dat', 'a28.dat', 'a32.dat', 'a35.dat', 'a37.dat', 'a39.dat', 'a41.dat']],
+             ['XFillPolygon', ['a1.dat', 'a8.dat', 'a9.dat', 'a28.dat', 'a29.dat', 'a30.dat', 'a31.dat', 'a35.dat', 'a38.dat', 'a40.dat', 'a42.dat', 'a44.dat', 'a45.dat', 'a46.dat']],
+             ['XFillRectangle', ['a22.dat', 'a24.dat', 'a25.dat', 'a29.dat', 'a32.dat', 'a34.dat', 'a36.dat', 'a38.dat']],
+             ['XFillRectangles', ['a1.dat', 'a23.dat', 'a24.dat', 'a25.dat', 'a26.dat', 'a30.dat', 'a33.dat', 'a35.dat', 'a37.dat', 'a39.dat']],
+             ['XLoadFont', ['a2.dat']],
+             ['XLoadQueryFont', ['a2.dat']],
+             ['XPutImage', ['a24.dat', 'a27.dat', 'a29.dat', 'a31.dat']]]
+  d = x[0]
+  files = []
+  foreach f : x[1]
+    file = join_paths(d, f)
+    install_data(
+      file,
+      install_mode : ['r--r--r--'],
+      install_dir : join_paths(_install_dir, d),
+    )
+  endforeach
+endforeach
diff --git a/xts5/Xopen/meson.build b/xts5/Xopen/meson.build
new file mode 100644
index 00000000..e974e8d0
--- /dev/null
+++ b/xts5/Xopen/meson.build
@@ -0,0 +1,115 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_test_progs = [
+   'XAllocNamedColor',
+   'cursorfont',
+   'XCreateFontCursor',
+   'XLookupColor',
+]
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xopen')
+
+# Just handle the files that need to be processed from .m here
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
+_test_progs = [
+    ['keysym', [
+        gen_mc.process('keysym/keysym.m'), 'keysym/Test0.c',
+        'keysym/Test1.c', 'keysym/Test2.c', 'keysym/Test3.c',
+        'keysym/Test4.c', 'keysym/TestG.c', 'keysym/TestM.c',
+    ]],
+    ['keysymdef', [
+        gen_mc.process('keysymdef/keysymdef.m'),
+        'keysymdef/Test0.c',
+        'keysymdef/Test1.c',
+        'keysymdef/Test2.c',
+        'keysymdef/Test3.c',
+        'keysymdef/Test4.c',
+        'keysymdef/TestA.c',
+        'keysymdef/TestC.c',
+        'keysymdef/TestG.c',
+        'keysymdef/TestH.c',
+        'keysymdef/TestK.c',
+        'keysymdef/TestL.c',
+        'keysymdef/TestM.c',
+        'keysymdef/TestP.c',
+        'keysymdef/TestS.c',
+        'keysymdef/TestT.c',
+    ]],
+    ['XKeysymToKeycode', [
+        gen_mc.process('XKeysymToKeycode/XKeysymToKeycode.m'),
+        'XKeysymToKeycode/Test1.c',
+        'XKeysymToKeycode/Test2.c',
+        'XKeysymToKeycode/Test3.c',
+        'XKeysymToKeycode/Test4.c',
+        'XKeysymToKeycode/TestA.c',
+        'XKeysymToKeycode/TestC.c',
+        'XKeysymToKeycode/TestG.c',
+        'XKeysymToKeycode/TestH.c',
+        'XKeysymToKeycode/TestK.c',
+        'XKeysymToKeycode/TestL.c',
+        'XKeysymToKeycode/TestM.c',
+        'XKeysymToKeycode/TestP.c',
+        'XKeysymToKeycode/TestS.c',
+        'XKeysymToKeycode/TestT.c',
+    ]],
+    ['XStringToKeysym', [
+        gen_mc.process('XStringToKeysym/XStringToKeysym.m'),
+        'XStringToKeysym/Test1.c',
+        'XStringToKeysym/Test2.c',
+        'XStringToKeysym/Test3.c',
+        'XStringToKeysym/Test4.c',
+        'XStringToKeysym/TestA.c',
+        'XStringToKeysym/TestC.c',
+        'XStringToKeysym/TestG.c',
+        'XStringToKeysym/TestH.c',
+        'XStringToKeysym/TestK.c',
+        'XStringToKeysym/TestL.c',
+        'XStringToKeysym/TestM.c',
+        'XStringToKeysym/TestP.c',
+        'XStringToKeysym/TestS.c',
+        'XStringToKeysym/TestT.c',
+    ]],
+]
+
+foreach t : _test_progs
+  executable(
+    t[0],
+    t[1],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : join_paths(_install_dir, t[0]),
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xproto/meson.build b/xts5/Xproto/meson.build
new file mode 100644
index 00000000..4b00eb7a
--- /dev/null
+++ b/xts5/Xproto/meson.build
@@ -0,0 +1,158 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_test_progs = [
+  'pAllocColor',
+  'pAllocColorCells',
+  'pAllocColorPlanes',
+  'pAllocNamedColor',
+  'pAllowEvents',
+  'pBadRequest',
+  'pBell',
+  'pChangeActivePointerGrab',
+  'pChangeGC',
+  'pChangeHosts',
+  'pChangeKeyboardControl',
+  'pChangeKeyboardMapping',
+  'pChangePointerControl',
+  'pChangeProperty',
+  'pChangeSaveSet',
+  'pChangeWindowAttributes',
+  'pClearArea',
+  'pCloseFont',
+  'pConfigureWindow',
+  'pConvertSelection',
+  'pCopyArea',
+  'pCopyColormapAndFree',
+  'pCopyGC',
+  'pCopyPlane',
+  'pCirculateWindow',
+  'pCreateColormap',
+  'pCreateCursor',
+  'pCreateGC',
+  'pCreateGlyphCursor',
+  'pCreatePixmap',
+  'pCreateWindow',
+  'pDeleteProperty',
+  'pDestroySubwindows',
+  'pDestroyWindow',
+  'pFillPoly',
+  'pFreeColormap',
+  'pFreeColors',
+  'pFreeCursor',
+  'pForceScreenSaver',
+  'pFreeGC',
+  'pFreePixmap',
+  'pGrabButton',
+  'pGrabKey',
+  'pGrabKeyboard',
+  'pGrabPointer',
+  'pGrabServer',
+  'pGetAtomName',
+  'pGetFontPath',
+  'pGetGeometry',
+  'pGetImage',
+  'pGetInputFocus',
+  'pGetKeyboardControl',
+  'pGetKeyboardMapping',
+  'pGetModifierMapping',
+  'pGetMotionEvents',
+  'pGetPointerControl',
+  'pGetPointerMapping',
+  'pGetProperty',
+  'pGetScreenSaver',
+  'pGetSelectionOwner',
+  'pGetWindowAttributes',
+  'pImageText16',
+  'pImageText8',
+  'pInstallColormap',
+  'pInternAtom',
+  'pKillClient',
+  'pLookupColor',
+  'pListExtensions',
+  'pListFonts',
+  'pListFontsWithInfo',
+  'pListHosts',
+  'pListInstalledColormaps',
+  'pListProperties',
+  'pMapSubwindows',
+  'pMapWindow',
+  'pNoOperation',
+  'pOpenDisplay',
+  'pOpenFont',
+  'pPolyArc',
+  'pPolyFillArc',
+  'pPolyFillRectangle',
+  'pPolyLine',
+  'pPolyPoint',
+  'pPolyRectangle',
+  'pPolySegment',
+  'pPolyText16',
+  'pPolyText8',
+  'pPutImage',
+  'pQueryBestSize',
+  'pQueryColors',
+  'pQueryExtension',
+  'pQueryFont',
+  'pQueryKeymap',
+  'pQueryPointer',
+  'pQueryTree',
+  'pQueryTextExtents',
+  'pRecolorCursor',
+  'pReparentWindow',
+  'pRotateProperties',
+  'pSendEvent',
+  'pSetAccessControl',
+  'pSetClipRectangles',
+  'pSetCloseDownMode',
+  'pSetDashes',
+  'pSetFontPath',
+  'pSetInputFocus',
+  'pSetModifierMapping',
+  'pSetPointerMapping',
+  'pStoreColors',
+  'pStoreNamedColor',
+  'pSetScreenSaver',
+  'pSetSelectionOwner',
+  'pTranslateCoords',
+  'pUngrabButton',
+  'pUngrabKey',
+  'pUngrabKeyboard',
+  'pUngrabPointer',
+  'pUngrabServer',
+  'pUnmapSubwindows',
+  'pUnmapWindow',
+  'pUninstallColormap',
+  'pWarpPointer',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5proto, libxts5, libapi_s],
+    dependencies : [deps_xts, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : join_paths(get_option('libexecdir'), 'xts5', 'Xproto'),
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xt10/meson.build b/xts5/Xt10/meson.build
new file mode 100644
index 00000000..b52d06a9
--- /dev/null
+++ b/xts5/Xt10/meson.build
@@ -0,0 +1,46 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt10')
+
+_test_progs = [
+  'XtAddCallback',
+  'XtAddCallbacks',
+  'XtCallCallbackList',
+  'XtCallCallbacks',
+  'XtHasCallbacks',
+  'XtRemoveAllCallbacks',
+  'XtRemoveCallback',
+  'XtRemoveCallbacks',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xt11/meson.build b/xts5/Xt11/meson.build
new file mode 100644
index 00000000..a6ffd0cb
--- /dev/null
+++ b/xts5/Xt11/meson.build
@@ -0,0 +1,96 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt11')
+
+_test_progs = [
+  'XtAppReleaseCacheRefs',
+  'XtAppSetTypeConverter',
+  'XtCallbackReleaseCacheRefList',
+  'XtCallbackReleaseCacheRef',
+  'XtCallConverter',
+  'XtConvertAndStore',
+  'XtCvtColorToPixel',
+  'XtCvtIntToBoolean',
+  'XtCvtIntToBool',
+  'XtCvtIntToColor',
+  'XtCvtIntToDimension',
+  'XtCvtIntToFloat',
+  'XtCvtIntToFont',
+  'XtCvtIntToPixel',
+  'XtCvtIntToPixmap',
+  'XtCvtIntToPosition',
+  'XtCvtIntToShort',
+  'XtCvtIntToUnsignedChar',
+  'XtCvtPixelToColor',
+  'XtCvtStringToAcceleratorTable',
+  'XtCvtStringToAtom',
+  'XtCvtStringToBoolean',
+  'XtCvtStringToBool',
+  'XtCvtStringToCursor',
+  'XtCvtStringToDimension',
+  'XtCvtStringToDisplay',
+  'XtCvtStringToFile',
+  'XtCvtStringToFloat',
+  'XtCvtStringToFont',
+  'XtCvtStringToFontSet',
+  'XtCvtStringToFontStruct',
+  'XtCvtStringToInitialState',
+  'XtCvtStringToInt',
+  'XtCvtStringToPixel',
+  'XtCvtStringToPosition',
+  'XtCvtStringToShort',
+  'XtCvtStringToTranslationTable',
+  'XtCvtStringToUnsignedChar',
+  'XtCvtStringToVisual',
+  'XtDisplayStringConversionWarning',
+  'XtDisplayToApplicationContext',
+  'XtGetApplicationResources',
+  'XtGetConstraintResourceList',
+  'XtGetResourceList',
+  'XtGetSubresources',
+  'XtGetSubvalues',
+  'XtGetValues',
+  'XtOffset',
+  'XtOffsetOf',
+  'XtSetSubvalues',
+  'XtSetTypeConverter',
+  'XtSetValues',
+  'XtVaGetApplicationResources',
+  'XtVaGetSubresources',
+  'XtVaGetSubvalues',
+  'XtVaGetValues',
+  'XtVaSetSubvalues',
+  'XtVaSetValues',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xt12/meson.build b/xts5/Xt12/meson.build
new file mode 100644
index 00000000..951fee5b
--- /dev/null
+++ b/xts5/Xt12/meson.build
@@ -0,0 +1,60 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt12')
+
+_test_progs = [
+  'XtAppAddActionHook',
+  'XtAppAddActions',
+  'XtAugmentTranslations',
+  'XtCallActionProc',
+  'XtConvertCase',
+  'XtGetActionKeysym',
+  'XtGetActionList',
+  'XtGetKeysymTable',
+  'XtGetMultiClickTime',
+  'XtInstallAccelerators',
+  'XtInstallAllAccelerators',
+  'XtKeysymToKeycodeList',
+  'XtOverrideTranslations',
+  'XtParseAcceleratorTable',
+  'XtParseTranslationTable',
+  'XtRegisterCaseConverter',
+  'XtRegisterGrabAction',
+  'XtRemoveActionHook',
+  'XtSetKeyTranslator',
+  'XtSetMultiClickTime',
+  'XtTranslateKeycode',
+  'XtUninstallTranslations',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xt13/meson.build b/xts5/Xt13/meson.build
new file mode 100644
index 00000000..40bf91e7
--- /dev/null
+++ b/xts5/Xt13/meson.build
@@ -0,0 +1,94 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt13')
+
+# tuple in the form [name, in_subdir]
+_test_progs = [
+  ['XtAddExposureToRegion', false],
+  ['XtAllocateGC', false],
+  ['XtAppError', false],
+  ['XtAppErrorMsg', false],
+  ['XtAppGetErrorDatabase', false],
+  ['XtAppGetErrorDatabaseText', false],
+  ['XtAppGetSelectionTimeout', false],
+  ['XtAppSetErrorHandler', false],
+  ['XtAppSetErrorMsgHandler', false],
+  ['XtAppSetSelectionTimeout', false],
+  ['XtAppSetWarningHandler', false],
+  ['XtAppSetWarningMsgHandler', false],
+  ['XtAppWarning', false],
+  ['XtAppWarningMsg', false],
+  ['XtCalloc', false],
+  ['XtDisownSelection', false],
+  ['XtFindFile', true],
+  ['XtFree', false],
+  ['XtGetApplicationNameAndClass', false],
+  ['XtGetGC', false],
+  ['XtGetSelectionRequest', false],
+  ['XtGetSelectionValueIncremental', false],
+  ['XtGetSelectionValue', false],
+  ['XtGetSelectionValuesIncremental', false],
+  ['XtGetSelectionValues', false],
+  ['XtLastTimestampProcessed', false],
+  ['XtMalloc', false],
+  ['XtNameToWidget', false],
+  ['XtNew', false],
+  ['XtNewString', false],
+  ['XtNumber', false],
+  ['XtOwnSelectionIncremental', false],
+  ['XtOwnSelection', false],
+  ['XtRealloc', false],
+  ['XtReleaseGC', false],
+  ['XtResolvePathname', true],
+  ['XtSetWMColormapWindows', false],
+  ['XtTranslateCoords', false],
+  ['XtWindowToWidget', false],
+]
+
+foreach t : _test_progs
+  if t[1]
+    _source = join_paths(t[0], t[0])
+    _install = join_paths(_install_dir, t[0])
+  else
+    _source = t[0]
+    _install = _install_dir
+  endif
+  executable(
+    t[0],
+    [gen_mc.process(_source + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install,
+    install : true,
+  )
+endforeach
+
+install_data(
+  'XtFindFile/data1',
+  install_dir : join_paths(_install_dir, 'XtFindFile'),
+)
+install_data(
+  'XtResolvePathname/data1',
+  install_dir : join_paths(_install_dir, 'XtResolvePathname'),
+)
diff --git a/xts5/Xt14/meson.build b/xts5/Xt14/meson.build
new file mode 100644
index 00000000..63592e5e
--- /dev/null
+++ b/xts5/Xt14/meson.build
@@ -0,0 +1,40 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt14')
+
+_test_progs = [
+	'ObjectObject',
+	'RectangleObject',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xt15/meson.build b/xts5/Xt15/meson.build
new file mode 100644
index 00000000..4035f43d
--- /dev/null
+++ b/xts5/Xt15/meson.build
@@ -0,0 +1,39 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt15')
+
+_test_progs = [
+	'XtSpecificationRelease',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xt3/XtCheckSubclass/meson.build b/xts5/Xt3/XtCheckSubclass/meson.build
new file mode 100644
index 00000000..444c880d
--- /dev/null
+++ b/xts5/Xt3/XtCheckSubclass/meson.build
@@ -0,0 +1,33 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt3', 'XtCheckSubclass')
+
+executable(
+  'XtCheckSubclass',
+  [gen_mc.process('XtCheckSubclass.m'), 'Test3.c', 'Test12.c'],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  link_with : [libxts5, libapi_s, libxttest, libxtaw],
+  dependencies : [deps_xaw, idep_tcmmain],
+  install_rpath : '../..',
+  install_dir : _install_dir,
+  install : true,
+)
diff --git a/xts5/Xt3/meson.build b/xts5/Xt3/meson.build
new file mode 100644
index 00000000..3029eb7d
--- /dev/null
+++ b/xts5/Xt3/meson.build
@@ -0,0 +1,60 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt3')
+
+_test_progs = [
+  'CompositeWidget',
+  'ConstraintWidget',
+  'CoreWidget',
+  'DataTypes',
+  'XtClass',
+  'XtInitializeWidgetClass',
+  'XtIsApplicationShell',
+  'XtIsComposite',
+  'XtIsConstraint',
+  'XtIsObject',
+  'XtIsOverrideShell',
+  'XtIsRectObject',
+  'XtIsShell',
+  'XtIsSubclass',
+  'XtIsTopLevelShell',
+  'XtIsTransientShell',
+  'XtIsVendorShell',
+  'XtIsWidget',
+  'XtIsWMShell',
+  'XtSuperClass',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
+subdir('XtCheckSubclass')
diff --git a/xts5/Xt4/meson.build b/xts5/Xt4/meson.build
new file mode 100644
index 00000000..cae3099a
--- /dev/null
+++ b/xts5/Xt4/meson.build
@@ -0,0 +1,71 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt4')
+
+_test_progs = [
+  'XtAppCreateShell',
+  'XtAppInitialize',
+  'XtAppSetFallbackResources',
+  'XtCloseDisplay',
+  'XtCreateApplicationContext',
+  'XtCreateVarArgsList',
+  'XtCreateWidget',
+  'XtCreateWindow',
+  'XtDatabase',
+  'XtDestroyApplicationContext',
+  'XtDestroyWidget',
+  'XtDisplayInitialize',
+  'XtDisplay',
+  'XtDisplayOfObject',
+  'XtIsRealized',
+  'XtMergeArgLists',
+  'XtName',
+  'XtOpenDisplay',
+  'XtParent',
+  'XtRealizeWidget',
+  'XtScreenDatabase',
+  'XtScreen',
+  'XtScreenOfObject',
+  'XtSetArg',
+  'XtSetLanguageProc',
+  'XtToolkitInitialize',
+  'XtUnrealizeWidget',
+  'XtVaAppCreateShell',
+  'XtVaAppInitialize',
+  'XtVaCreateWidget',
+  'XtWidgetToApplicationContext',
+  'XtWindow',
+  'XtWindowOfObject',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xt5/meson.build b/xts5/Xt5/meson.build
new file mode 100644
index 00000000..4ad5d7fb
--- /dev/null
+++ b/xts5/Xt5/meson.build
@@ -0,0 +1,49 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt5')
+
+_test_progs = [
+  'XtCreateManagedWidget',
+  'XtIsManaged',
+  'XtManageChild',
+  'XtManageChildren',
+  'XtMapWidget',
+  'XtSetMappedWhenManaged',
+  'XtUnmanageChild',
+  'XtUnmanageChildren',
+  'XtUnmapWidget',
+  'XtVaCreateManagedWidget',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
diff --git a/xts5/Xt6/meson.build b/xts5/Xt6/meson.build
new file mode 100644
index 00000000..1dd893f1
--- /dev/null
+++ b/xts5/Xt6/meson.build
@@ -0,0 +1,45 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt6')
+
+_test_progs = [
+  'ApplicationShellWidget',
+  'OverrideShellWidget',
+  'ShellWidget',
+  'TopLevelShellWidget',
+  'TransientShellWidget',
+  'VendorShellWidget',
+  'WMShellWidget',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xt7/meson.build b/xts5/Xt7/meson.build
new file mode 100644
index 00000000..8728cdfe
--- /dev/null
+++ b/xts5/Xt7/meson.build
@@ -0,0 +1,49 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt7')
+
+_test_progs = [
+  'XtCallbackExclusive',
+  'XtCallbackNone',
+  'XtCallbackNonexclusive',
+  'XtCallbackPopdown',
+  'XtCreatePopupShell',
+  'XtMenuPopdown',
+  'XtMenuPopup',
+  'XtPopdown',
+  'XtPopup',
+  'XtPopupSpringLoaded',
+  'XtVaCreatePopupShell',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/Xt8/meson.build b/xts5/Xt8/meson.build
new file mode 100644
index 00000000..c2093a9e
--- /dev/null
+++ b/xts5/Xt8/meson.build
@@ -0,0 +1,55 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt8')
+
+_test_progs = [
+  'XtConfigureWidget',
+  'XtMakeGeometryRequest',
+  'XtMakeResizeRequest',
+  'XtMoveWidget',
+  'XtResizeWidget',
+  'XtResizeWindow',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
+
+executable(
+  'XtQueryGeometry',
+  [gen_mc.process('XtQueryGeometry/XtQueryGeometry.m'), 'XtQueryGeometry/tqrygomty.c'],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  link_with : [libxts5, libapi_s, libxttest, libxtaw],
+  dependencies : [deps_xaw, idep_tcmmain],
+  install_rpath : '..',
+  install_dir : join_paths(_install_dir, 'XtQueryGeometry'),
+  install : true,
+)
diff --git a/xts5/Xt9/meson.build b/xts5/Xt9/meson.build
new file mode 100644
index 00000000..40132429
--- /dev/null
+++ b/xts5/Xt9/meson.build
@@ -0,0 +1,89 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'Xt9')
+
+# tuple in the form [name, in_subdir, extra_sources]
+_test_progs = [
+  ['XtAddEventHandler', false, []],
+  ['XtAddGrab', false, []],
+  ['XtAddRawEventHandler', false, []],
+  ['XtAppAddInput', false, []],
+  ['XtAppAddTimeOut', false, []],
+  ['XtAppAddWorkProc', false, []],
+  ['XtAppMainLoop', false, []],
+  ['XtAppNextEvent', false, []],
+  ['XtAppPeekEvent', false, []],
+  ['XtAppPending', false, []],
+  ['XtAppProcessEvent', false, []],
+  ['XtBuildEventMask', false, []],
+  ['XtCallAcceptFocus', true, ['tcalafocs2.c']],
+  ['XtDispatchEvent', false, []],
+  ['XtGrabButton', false, []],
+  ['XtGrabKeyboard', false, []],
+  ['XtGrabKey', false, []],
+  ['XtGrabPointer', false, []],
+  ['XtInsertEventHandler', false, []],
+  ['XtInsertRawEventHandler', false, []],
+  ['XtIsSensitive', false, []],
+  ['XtRemoveEventHandler', false, []],
+  ['XtRemoveGrab', false, []],
+  ['XtRemoveInput', true, []],
+  ['XtRemoveRawEventHandler', false, []],
+  ['XtRemoveTimeOut', false, []],
+  ['XtRemoveWorkProc', false, []],
+  ['XtSetKeyboardFocus', false, []],
+  ['XtSetSensitive', false, []],
+  ['XtUngrabButton', false, []],
+  ['XtUngrabKeyboard', false, []],
+  ['XtUngrabKey', false, []],
+  ['XtUngrabPointer', false, []],
+]
+
+foreach t : _test_progs
+  if t[1]
+    _source = join_paths(t[0], t[0])
+    _install = join_paths(_install_dir, t[0])
+    _extra_src = []
+    foreach s : t[2]
+      _extra_src += join_paths(t[0], s)
+    endforeach
+  else
+    _source = t[0]
+    _install = _install_dir
+    _extra_src = t[2]
+  endif
+  executable(
+    t[0],
+    [gen_mc.process(_source + '.m'), _extra_src],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install,
+    install : true,
+  )
+endforeach
+
+install_data(
+  'XtRemoveInput/trminput.dat',
+  install_dir : join_paths(_install_dir, 'XtRemoveInput'),
+)
diff --git a/xts5/XtC/meson.build b/xts5/XtC/meson.build
new file mode 100644
index 00000000..2dd4a38c
--- /dev/null
+++ b/xts5/XtC/meson.build
@@ -0,0 +1,67 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'XtC')
+
+_test_progs = [
+  'XtAddActions',
+  'XtAddConverter',
+  'XtAddInput',
+  'XtAddTimeOut',
+  'XtAddWorkProc',
+  'XtAppAddConverter',
+  'XtConvert',
+  'XtCreateApplicationShell',
+  'XtDestroyGC',
+  'XtDirectConvert',
+  'XtError',
+  'XtErrorMsg',
+  'XtGetErrorDatabase',
+  'XtGetErrorDatabaseText',
+  'XtGetSelectionTimeout',
+  'XtInitialize',
+  'XtMainLoop',
+  'XtNextEvent',
+  'XtPeekEvent',
+  'XtPending',
+  'XtProcessEvent',
+  'XtSetErrorHandler',
+  'XtSetErrorMsgHandler',
+  'XtSetSelectionTimeout',
+  'XtSetWarningHandler',
+  'XtSetWarningMsgHandler',
+  'XtStringConversionWarning',
+  'XtWarning',
+  'XtWarningMsg',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/XtE/meson.build b/xts5/XtE/meson.build
new file mode 100644
index 00000000..0641d4fb
--- /dev/null
+++ b/xts5/XtE/meson.build
@@ -0,0 +1,39 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5', 'XtE')
+
+_test_progs = [
+  'StringDefs',
+]
+
+foreach t : _test_progs
+  executable(
+    t,
+    [gen_mc.process(t + '.m')],
+    include_directories : [inc_include, inc_tet3, inc_xts5],
+    link_with : [libxts5, libapi_s, libxttest, libxtaw],
+    dependencies : [deps_xaw, idep_tcmmain],
+    install_rpath : '..',
+    install_dir : _install_dir,
+    install : true,
+  )
+endforeach
diff --git a/xts5/fix_test_install.py b/xts5/fix_test_install.py
new file mode 100644
index 00000000..6b46c29a
--- /dev/null
+++ b/xts5/fix_test_install.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+"""Fix the name of install test binaries.
+
+XTS expects to have many test files called TestN (where N is a number),
+however meson has a limitation that a no two targets may have the same name,
+even if they will not conflict at install time. This script fixes that in the
+install directory by removing the prefix and reducing the test from
+${name}_TestN to TestN.
+"""
+
+import argparse
+import os
+import shutil
+
+PREFIX = os.environ['MESON_INSTALL_DESTDIR_PREFIX']
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('install_dir')
+    parser.add_argument('filenames', nargs='*')
+    args = parser.parse_args()
+
+    for f in args.filenames:
+        filename = os.path.basename(f)
+        new_filename = filename.split('_')[1]
+        shutil.move(os.path.join(PREFIX, args.install_dir, filename),
+                    os.path.join(PREFIX, args.install_dir, new_filename))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/xts5/fonts/meson.build b/xts5/fonts/meson.build
new file mode 100644
index 00000000..d097e354
--- /dev/null
+++ b/xts5/fonts/meson.build
@@ -0,0 +1,48 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+libfont = static_library(
+  'libfont',
+  files('xtfont0.c', 'xtfont1.c', 'xtfont2.c', 'xtfont3.c', 'xtfont4.c', 'xtfont5.c', 'xtfont6.c'),
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  dependencies : [deps_xts_args],
+)
+
+_fontdir = join_paths(get_option('datadir'), 'xts5', 'fonts')
+_fonts = []
+foreach n : ['0', '1', '2', '3', '4', '5', '6', '7', '8']
+  _input = 'xtfont@0@.bdf'.format(n)
+  _output = 'xtfont@0@.pcf'.format(n)
+  _fonts += custom_target(
+    _output,
+    command : [prog_bdftopcf, '-t', '-o', '@OUTPUT@', '@INPUT@'],
+    input : _input,
+    output: _output,
+    install: true,
+    install_dir : _fontdir,
+  )
+endforeach
+
+# Because meson makes no guarantees about the layout of the source directory we
+# cannot generate the fonts.dir file until install time, when files are layed
+# out as we expect them. Scripts are guaranteed to run after all normal install
+# targets.
+meson.add_install_script('mkfontdir.sh', _fontdir)
diff --git a/xts5/fonts/mkfontdir.sh b/xts5/fonts/mkfontdir.sh
new file mode 100644
index 00000000..9878acf3
--- /dev/null
+++ b/xts5/fonts/mkfontdir.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+pushd $MESON_INSTALL_DESTDIR_PREFIX/$1
+mkfontdir -x .bdf
+popd
diff --git a/xts5/meson.build b/xts5/meson.build
new file mode 100644
index 00000000..c3fe458e
--- /dev/null
+++ b/xts5/meson.build
@@ -0,0 +1,99 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+fix_install_script = join_paths(meson.current_source_dir(), 'fix_test_install.py')
+
+foreach s : ['xts-config', 'xts-run']
+  _e = custom_target(
+    s,
+    command : [
+      prog_sed,
+      '-e', 's,%bindir%,@0@,g'.format(get_option('bindir')),
+      '-e', 's,%libexecdir%,@0@,g'.format(get_option('libexecdir')),
+      '-e', 's,%DEFAULT_TET_ROOT%,@0@,g'.format(conf.get_unquoted('DEFAULT_TET_ROOT')),
+      '-e', 's,%PACKAGE_VERSION%,@0@,g'.format(meson.project_version()),
+      '@INPUT@',
+    ],
+    capture : true,
+    input : [join_paths('bin', s + '.in')],
+    output : [s],
+    build_by_default : true,
+    install : true,
+    install_dir : get_option('bindir'),
+  )
+  set_variable('script_' + s.underscorify(), _e)
+endforeach
+
+prog_sh = find_program('sh')
+
+custom_target(
+  'tetexec.cfg',
+  command : [prog_sh, files('xts-config.sh'), prog_perl, script_xts_config, '@INPUT@', '@OUTPUT@'],
+  input : ['tetexec.cfg.in'],
+  output : ['tetexec.cfg'],
+  build_by_default : true,
+)
+
+inc_xts5 = include_directories('include')
+
+install_subdir(
+  'scenarios',
+  install_dir : join_paths(get_option('datadir'), 'xts5'),
+  exclude_files : ['Makefile.am', 'Makefile.in'],
+)
+
+subdir('fonts')
+subdir('src')
+subdir('Xproto')
+subdir('Xopen')
+subdir('Xlib3')
+subdir('Xlib4')
+subdir('Xlib5')
+subdir('Xlib6')
+subdir('Xlib7')
+subdir('Xlib8')
+subdir('Xlib9')
+subdir('Xlib10')
+subdir('Xlib11')
+subdir('Xlib12')
+subdir('Xlib13')
+subdir('Xlib14')
+subdir('Xlib15')
+subdir('Xlib16')
+subdir('Xlib17')
+subdir('SHAPE')
+subdir('XIproto')
+subdir('XI')
+subdir('Xt3')
+subdir('Xt4')
+subdir('Xt5')
+subdir('Xt6')
+subdir('Xt7')
+subdir('Xt8')
+subdir('Xt9')
+subdir('Xt10')
+subdir('Xt11')
+subdir('Xt12')
+subdir('Xt13')
+subdir('Xt14')
+subdir('Xt15')
+subdir('XtC')
+subdir('XtE')
diff --git a/xts5/src/bin/blowup/meson.build b/xts5/src/bin/blowup/meson.build
new file mode 100644
index 00000000..8d3d0c26
--- /dev/null
+++ b/xts5/src/bin/blowup/meson.build
@@ -0,0 +1,29 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+exe_blowup = executable(
+  'xts-blowup',
+  ['ajax.c', 'vblowup_c.c'],
+  include_directories : [inc_include, inc_xts5],
+  dependencies : [deps_xts],
+  install : true,
+)
+  
\ No newline at end of file
diff --git a/xts5/src/bin/mc/meson.build b/xts5/src/bin/mc/meson.build
new file mode 100644
index 00000000..6a4c4cb1
--- /dev/null
+++ b/xts5/src/bin/mc/meson.build
@@ -0,0 +1,39 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+exe_mc = executable(
+  'mc',
+  [
+    'main.c', 'sections.c', 'files.c', 'shortname.c', 'error.c',
+    'gccomps.c', 'set.c', 'expand.c', 'code.c', 'make.c', 'ma.c',
+    'cond.c', 'mas.c',
+  ],
+  # Not safe to be used as a subproject because of source_root()
+  c_args : ['-DBUILD_TET_ROOT="@0@"'.format(meson.source_root())],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  native : true,
+)
+
+gen_mc = generator(
+  exe_mc,
+  output : '@PLAINNAME@.c',
+  arguments : ['@EXTRA_ARGS@', '-o', '@OUTPUT@', '@INPUT@'],
+)
diff --git a/xts5/src/bin/meson.build b/xts5/src/bin/meson.build
new file mode 100644
index 00000000..9992f8d2
--- /dev/null
+++ b/xts5/src/bin/meson.build
@@ -0,0 +1,24 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+subdir('blowup')
+subdir('mc')
+subdir('reports')
diff --git a/xts5/src/bin/reports/meson.build b/xts5/src/bin/reports/meson.build
new file mode 100644
index 00000000..d9f9b42a
--- /dev/null
+++ b/xts5/src/bin/reports/meson.build
@@ -0,0 +1,28 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+executable(
+  'xts-report',
+  ['xts-report.c'],
+  include_directories : [inc_include, inc_xts5],
+  dependencies : [deps_xts],
+  install : true,
+)
diff --git a/xts5/src/lib/meson.build b/xts5/src/lib/meson.build
new file mode 100644
index 00000000..c0704e20
--- /dev/null
+++ b/xts5/src/lib/meson.build
@@ -0,0 +1,99 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+files_libxtest = files(
+  'badcmap.c',
+  'badfont.c',
+  'badgc.c',
+  'badpixm.c',
+  'badvis.c',
+  'badwin.c',
+  'bitcount.c',
+  'block.c',
+  'buildtree.c',
+  'checkarea.c',
+  'checkevent.c',
+  'checkfont.c',
+  'checkgc.c',
+  'checkimg.c',
+  'checkpixel.c',
+  'checktile.c',
+  'config.c',
+  'crechild.c',
+  'cursor.c',
+  'delete.c',
+  'devcntl.c',
+  'dset.c',
+  'dumpimage.c',
+  'environ.c',
+  'err.c',
+  'events.c',
+  'exposechk.c',
+  'ex_startup.c',
+  'extenavail.c',
+  'gcflush.c',
+  'gcinclude.c',
+  'getevent.c',
+  'getsize.c',
+  'gettime.c',
+  'iponlywin.c',
+  'issuppvis.c',
+  'lookupname.c',
+  'makecolmap.c',
+  'makecur.c',
+  'makegc.c',
+  'makeimg.c',
+  'makepixm.c',
+  'makeregion.c',
+  'makewin2.c',
+  'makewin.c',
+  'maxsize.c',
+  'nextvclass.c',
+  'nextvinf.c',
+  'nondpth1pix.c',
+  'notmember.c',
+  'opendisp.c',
+  'openfonts.c',
+  'outfile.c',
+  'pattern.c',
+  'pfcount.c',
+  'pointer.c',
+  'regid.c',
+  'report.c',
+  'rpt.c',
+  'savimage.c',
+  'setline.c',
+  'settimeout.c',
+  'stackorder.c',
+  'startcall.c',
+  'startup.c',
+  'tpstartup.c',
+  'verimage.c',
+  'winh.c',
+  'XInput.c',
+  'XTestExt.c',
+  'xthost.c',
+)
+
+libxtest = static_library(
+  'xtest',
+  files_libxtest,
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+)
diff --git a/xts5/src/libXR5/meson.build b/xts5/src/libXR5/meson.build
new file mode 100644
index 00000000..4398fabf
--- /dev/null
+++ b/xts5/src/libXR5/meson.build
@@ -0,0 +1,32 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+libxr5 = static_library(
+  'XR5',
+  [
+    'r5startup.c', 'message.c', 'dumpbuf.c', 'save.c', 'misc.c',
+    'blowup.c', 'item.c', 'signal.c', 'bufdisp.c', 'chek.c',
+    'event.c',
+  ],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  c_args : ['-DDEBUG'],
+  dependencies : [deps_xts_args],
+)
diff --git a/xts5/src/libXtTest/meson.build b/xts5/src/libXtTest/meson.build
new file mode 100644
index 00000000..6fc48bd5
--- /dev/null
+++ b/xts5/src/libXtTest/meson.build
@@ -0,0 +1,34 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+libxttest = static_library(
+  'XtTest',
+  [
+    'avs_def.c', 'avs_func.c', 'avs_hier.c', 'avs_hierd.c', 'avs_init.c',
+    'avs_tree.c', 'avs_widget.c', 'avs_xext.c', 'AvsComp.c', 'AvsComp2.c',
+    'AvsForm.c', 'AvsForm2.c', 'AvsForm3.c', 'AvsRectObj.c', 'AvsWid.c',
+    'AvsObj.c', 'check.c', 'eventname.c', 'sendevent.c', 'sendmask.c',
+    'xhandler.c', 'xthandler.c', 'xunexperr.c', 'errlook.c', 'event.c',
+    'misc.c', 'pshpop.c', 'signals.c', 'waitfor.c',
+  ],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  dependencies : [deps_xt_args],
+)
diff --git a/xts5/src/libXtaw/meson.build b/xts5/src/libXtaw/meson.build
new file mode 100644
index 00000000..046c8e5b
--- /dev/null
+++ b/xts5/src/libXtaw/meson.build
@@ -0,0 +1,31 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+libxtaw = static_library(
+  'Xtaw',
+  [
+    'AllWidgets.c', 'Box.c', 'Command.c', 'Form.c', 'Label.c',
+    'Paned.c', 'Tree.c', 'Viewport.c', 'Scrollbar.c', 'Grip.c',
+    'Sme.c', 'Simple.c', 'SmeBSB.c', 'SimpleMenu.c', 'XawInit.c',
+  ],
+  include_directories : [inc_include],
+  dependencies : [deps_xts_args],
+)
diff --git a/xts5/src/libproto/meson.build b/xts5/src/libproto/meson.build
new file mode 100644
index 00000000..6109edbf
--- /dev/null
+++ b/xts5/src/libproto/meson.build
@@ -0,0 +1,70 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+files_libxst = files(
+  'ShowReq.c',
+  'ShowExtReq.c',
+  'SendReq.c',
+  'SendXIReq.c',
+  'SendEvt.c',
+  'ShowRep.c',
+  'ShowExtRep.c',
+  'MakeReq.c',
+  'MakeXIReq.c',
+  'RcvRep.c',
+  'RcvExtRep.c',
+  'RcvEvt.c',
+  'RcvExtEvt.c',
+  'RcvErr.c',
+  'RcvExtErr.c',
+  'ShowEvt.c',
+  'ShowExtEvt.c',
+  'ShowErr.c',
+  'ShowExtErr.c',
+  'DfltVals.c',
+  'ResMng.c',
+  'Log.c',
+  'ClientMng.c',
+  'ConnDis.c',
+  'x11_trans.c',
+  'Expect.c',
+  'XlibXtst.c',  # autotools has a variable for this, but if you have that old of an XServer...
+  'ValListMng.c',
+  'Timer.c',
+  'XstIO.c',
+  'DataMove.c',
+  'TestMng.c',
+  'Utils.c',
+  'SendSup.c',
+  'ShowSup.c',
+  'TestSup.c',
+  'Validate.c',
+  'tpstartup.c',
+  'startup.c',
+  'delete.c',
+)
+
+libxst = static_library(
+  'Xst',
+  files_libxst,
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  dependencies : [deps_xts_args, deps_xt_args],
+)
diff --git a/xts5/src/meson.build b/xts5/src/meson.build
new file mode 100644
index 00000000..c78de94c
--- /dev/null
+++ b/xts5/src/meson.build
@@ -0,0 +1,50 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+subdir('lib')
+subdir('libproto')
+subdir('libXR5')
+subdir('libXtaw')
+subdir('libXtTest')
+subdir('xim')
+subdir('bin')
+
+_install_dir = join_paths(get_option('libexecdir'), 'xts5')
+
+# Niether of these work with lundef of course, like everything else in XTS, the
+# code quiality is poop
+libxts5 = library(
+  'xts5',
+  link_whole : [libxtest, libfont, libximtest],
+  dependencies : [deps_xt],
+  override_options : ['b_lundef=false'],
+  install_dir : _install_dir,
+  install : get_option('default_library') == 'shared',
+)
+
+libxts5proto = library(
+  'xts5proto',
+  link_with : [libxts5],
+  link_whole : [libxst],
+  override_options : ['b_lundef=false'],
+  install_dir : _install_dir,
+  install : get_option('default_library') == 'shared',
+)
diff --git a/xts5/src/xim/meson.build b/xts5/src/xim/meson.build
new file mode 100644
index 00000000..b969ffc5
--- /dev/null
+++ b/xts5/src/xim/meson.build
@@ -0,0 +1,31 @@
+# Copyright © 2019 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+libximtest = static_library(
+  'ximtest',
+  [
+    'linklocale.c', 'clnlocale.c', 'ic.c', 'nextlocale.c',
+    'nextlclmod.c', 'nxtfontset.c', 'parse.c', 'xim_cb.c',
+    'xim_comp.c', 'response.c', 'xim_save.c', 'stimulus.c',
+  ],
+  include_directories : [inc_include, inc_tet3, inc_xts5],
+  dependencies : [deps_xts_args],
+)
diff --git a/xts5/xts-config.sh b/xts5/xts-config.sh
new file mode 100644
index 00000000..615b3e9d
--- /dev/null
+++ b/xts5/xts-config.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+exec $1 -p $2 < $3 > $4