Updated build instructions for wayland-protocols and libwacom

The Mint instructions have been tested, I had to guess at the Ubuntu12
instructions as I no longer have that machine.

v2: Use MAKEFLAGS instead of switches
    Use & instead of &
    Some rewording of Ubuntu instructions to point out they are old

Signed-off-by: Bill Spitzak <spitzak@gmail.com>

1 files changed, 37 insertions, 21 deletions

diff --git a/mint17.html b/mint17.html
index ae1c5a8..a1f8341 100644
--- a/mint17.html
+++ b/mint17.html
@@ -12,7 +12,7 @@
 Building Weston on Linux Mint 17</h1>
 
 <p>The following sequence of commands successfully built Weston and
-XWayland on a Linux Mint 17 Cinnamon system, on October 28 2014. These
+XWayland on a Linux Mint 17.3 Cinnamon system, on March 2, 2016. These
 commands will probably work on any system based on Ubuntu 14.04.</p>
 
 <p>This is considerably easier than earlier systems as the distributed
@@ -29,26 +29,42 @@ export PATH=$WLD/bin:$PATH
 export ACLOCAL_PATH=$WLD/share/aclocal
 export ACLOCAL="aclocal -I $ACLOCAL_PATH"
 mkdir -p $ACLOCAL_PATH
+export MAKEFLAGS="j9" <span class="comment"># or use your own flags</span>
 
 <span class="comment"># libwayland:</span>
 
-apt install libffi-dev libexpat-dev
+apt install libffi-dev libexpat-dev libxml2-dev
 apt install doxygen xmlto <span class="comment"># or use --disable-documentation</span>
 
 git clone git://anongit.freedesktop.org/wayland/wayland
 cd wayland
 ./autogen.sh --prefix=$WLD
-make -j 9 && make install
+make &amp;&amp; make install
+cd ..
+
+<span class="comment"># wayland-protocols:</span>
+
+git clone git://anongit.freedesktop.org/wayland/wayland-protocols
+cd wayland-protocols
+./autogen.sh --prefix=$WLD
+make &amp;&amp; make install
 cd ..
 
 <span class="comment"># libinput:</span>
 
 apt install libmtdev-dev libudev-dev libevdev-dev
 
+<span class="comment"># newer version of libwacom is needed than in apt</span>
+apt install libgudev-1.0-dev
+git clone git://git.code.sf.net/p/linuxwacom/libwacom
+cd libwacom
+make &amp;&amp; make install
+cd ..
+
 git clone git://anongit.freedesktop.org/wayland/libinput
 cd libinput
 ./autogen.sh --prefix=$WLD
-make -j 9 && make install
+make &amp;&amp; make install
 cd ..
 
 <span class="comment"># weston:</span>
@@ -60,7 +76,7 @@ apt install libegl1-mesa-dev libgles2-mesa-dev libxcursor-dev libcairo2-dev \
 git clone git://anongit.freedesktop.org/wayland/weston
 cd weston
 ./autogen.sh --prefix=$WLD --disable-setuid-install
-make -j 9 && make install
+make &amp;&amp; make install
 cd ..
 
 <span class="comment"># X Server:</span>
@@ -71,91 +87,91 @@ apt install libgl1-mesa-dri-dev libgcrypt11-dev libxkbfile-dev libxfont-dev \
 git clone git://anongit.freedesktop.org/xorg/util/macros
 cd macros
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/xcmiscproto
 cd xcmiscproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/lib/libxtrans
 cd libxtrans
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/bigreqsproto
 cd bigreqsproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/xproto
 cd xproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/randrproto
 cd randrproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/fontsproto
 cd fontsproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/videoproto
 cd videoproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/compositeproto
 cd compositeproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/recordproto
 cd recordproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/scrnsaverproto
 cd scrnsaverproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/resourceproto
 cd resourceproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/xf86driproto
 cd xf86driproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/presentproto
 cd presentproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/proto/xineramaproto
 cd xineramaproto
 ./autogen.sh --prefix=$WLD
-make && make install
+make &amp;&amp; make install
 cd ..
 
 git clone git://anongit.freedesktop.org/xorg/xserver
@@ -163,7 +179,7 @@ cd xserver
 ./autogen.sh --prefix=$WLD --disable-docs --disable-devel-docs \
   --enable-xwayland --disable-xorg --disable-xvfb --disable-xnest \
   --disable-xquartz --disable-xwin
-make && make install
+make &amp;&amp; make install
 cd ..
 
 <span class="comment"># Links needed so XWayland works:</span>