From 96fa4266d0a660df4d3daffbc148801b7982143d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 4 May 2017 13:30:02 +1000
Subject: [PATCH] doc: add build instructions for meson

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 doc/building.dox | 55 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/doc/building.dox b/doc/building.dox
index 94ea222c..4837d008 100644
--- a/doc/building.dox
+++ b/doc/building.dox
@@ -12,9 +12,38 @@ see @ref reverting_install to revert to the previous state.
 
 @section building Building libinput
 
-libinput uses automake, a build is usually the three-step process below.
-A successful build requires the @ref building_dependencies to be installed
-at configure time.
+libinput uses [meson](https://www.mesonbuild.com) and
+[ninja](https://www.ninja-build.org). A build is usually the three-step
+process below.  A successful build requires the @ref
+building_dependencies to be installed before running meson.
+
+@code
+$> git clone git://anongit.freedesktop.org/git/wayland/libinput
+$> cd libinput
+$> meson --prefix=/usr builddir/
+$> ninja -C builddir/
+$> sudo ninja -C builddir/ install
+$> sudo udevadm hwdb --update
+@endcode
+
+The ```prefix``` option or other options can be changed later with the
+```mesonconf``` command.
+
+@code
+$> mesonconf builddir/ -Dprefix=/some/other/prefix
+$> ninja -C builddir
+$> sudo ninja -C builddir/ install
+@endcode
+
+@note On Fedora, use ```ninja-build``` instead of ```ninja```. We recommend
+setting up a shell alias.
+
+@subsection building_autotools Building with automake
+
+libinput currently also provides the autotools build system, but this will
+be removed in future libinput versions. A build with automake is usually the
+three-step process below. A successful build requires the @ref
+building_dependencies to be installed at configure time.
 
 @code
 $> git clone git://anongit.freedesktop.org/git/wayland/libinput
@@ -52,6 +81,12 @@ files in the system (e.g. ```/usr/lib/libinput.la```) but these files are
 usually harmless. To definitely remove all files, run the following command
 from the libinput source directory:
 
+@code
+$> sudo ninja -C builddir/ uninstall
+@endcode
+
+or when using autotools:
+
 @code
 $> sudo make uninstall
 # WARNING: Do not restart the computer/X/the Wayland compositor after make
@@ -110,7 +145,13 @@ for instructions on how to fix it.
 libwacom is required by libinput's tablet code to gather additional
 information about tablets that is not available from the kernel device
 itself. libwacom is required by default but can be skipped when @ref
-building with the ``--disable-libwacom`` argument.
+building.
+
+@code
+$> meson --prefix=/usr -Dlibwacom=false builddir
+@endcode
+
+or when building with autotools:
 
 @code
 $> ./autogen.sh --disable-libwacom --prefix=/usr --libdir=/usr/lib64
@@ -132,6 +173,12 @@ to build. If these libraries are not available, the build will fail.
 If the tool is not required, use the ``--disable-event-gui`` argument
 when @ref building.
 
+@code
+$> meson --prefix=/usr -Devent-gui=false builddir
+@endcode
+
+or when building with autotools:
+
 @code
 $> ./autogen.sh --disable-event-gui --prefix=/usr --libdir=/usr/lib64
 @endcode