puzzles: refactor and resync with upstream

This brings puzzles up-to-date with upstream revision
2d333750272c3967cfd5cd3677572cddeaad5932, though certain changes made
by me, including cursor-only Untangle and some compilation fixes
remain. Upstream code has been moved to its separate subdirectory and
future syncs can be done by simply copying over the new sources.

Change-Id: Ia6506ca5f78c3627165ea6791d38db414ace0804

329 files changed, 27352 insertions, 1045 deletions

diff --git a/apps/plugins/puzzles/README.rockbox b/apps/plugins/puzzles/README.rockbox
index e11025dbec..b0c54b287f 100644
--- a/apps/plugins/puzzles/README.rockbox
+++ b/apps/plugins/puzzles/README.rockbox
@@ -19,3 +19,10 @@ out how to do that with a wildcard or something.
 Kudos to Simon (duh), and Frank, for telling me about it.
 
 Franklin Wei (__builtin)
+
+April 2017: Changes made to move upstream sources to a separate
+subdirectory, where they are completely unmodified from the
+original. Updating the upstream version is now as simple as copying a
+fresh set of sources to src/. Several hacks were used to accomplish
+this: a global include specified on the command line, and a directory
+of dummy header files.
diff --git a/apps/plugins/puzzles/SOURCES b/apps/plugins/puzzles/SOURCES
index 9c41a00358..1d58ff5723 100644
--- a/apps/plugins/puzzles/SOURCES
+++ b/apps/plugins/puzzles/SOURCES
@@ -1,26 +1,26 @@
 rockbox.c
 rbwrappers.c
-
-combi.c
-divvy.c
-drawing.c
-dsf.c
-findloop.c
-grid.c
-latin.c
-laydomino.c
-loopgen.c
-malloc.c
-maxflow.c
-midend.c
-misc.c
-penrose.c
-printing.c
-random.c
-tdq.c
-tree234.c
-version.c
+rbmalloc.c
+src/combi.c
+src/divvy.c
+src/drawing.c
+src/dsf.c
+src/findloop.c
+src/grid.c
+src/latin.c
+src/laydomino.c
+src/loopgen.c
+/*src/malloc.c*/ /* we have our own */
+src/maxflow.c
+src/midend.c
+src/misc.c
+src/penrose.c
+src/printing.c
+src/random.c
+src/tdq.c
+src/tree234.c
+src/version.c
 
 #ifdef COMBINED
-list.c
+src/list.c
 #endif
diff --git a/apps/plugins/puzzles/SOURCES.games b/apps/plugins/puzzles/SOURCES.games
index c14d15b9a1..5f8c58b477 100644
--- a/apps/plugins/puzzles/SOURCES.games
+++ b/apps/plugins/puzzles/SOURCES.games
@@ -1,51 +1,51 @@
-blackbox.c
-bridges.c
-cube.c
-dominosa.c
-fifteen.c
-/*filling.c*/
-flip.c
-flood.c
-galaxies.c
-guess.c
-inertia.c
-/*keen.c*/
-lightup.c
-/*loopy.c*/
-magnets.c
-map.c
-/*mines.c*/
-net.c
-netslide.c
-/*palisade.c*/
-pattern.c
-pegs.c
-range.c
-rect.c
-samegame.c
-signpost.c
-singles.c
-sixteen.c
-slant.c
-/*solo.c*/
-tents.c
-/*towers.c*/
-tracks.c
-twiddle.c
-/*undead.c*/
-/*unequal.c*/
-unruly.c
-untangle.c
+src/blackbox.c
+src/bridges.c
+src/cube.c
+src/dominosa.c
+src/fifteen.c
+/*src/filling.c*/
+src/flip.c
+src/flood.c
+src/galaxies.c
+src/guess.c
+src/inertia.c
+/*src/keen.c*/
+src/lightup.c
+/*src/loopy.c*/
+src/magnets.c
+src/map.c
+/*src/mines.c*/
+src/net.c
+src/netslide.c
+/*src/palisade.c*/
+src/pattern.c
+src/pegs.c
+src/range.c
+src/rect.c
+src/samegame.c
+src/signpost.c
+src/singles.c
+src/sixteen.c
+src/slant.c
+/*src/solo.c*/
+src/tents.c
+/*src/towers.c*/
+src/tracks.c
+src/twiddle.c
+/*src/undead.c*/
+/*src/unequal.c*/
+src/unruly.c
+src/untangle.c
 
 /* disabled for now */
-/*unfinished/group.c*/
-/*unfinished/separate.c*/
-/*unfinished/slide.c*/
-/*unfinished/sokoban.c*/
+/*src/unfinished/group.c*/
+/*src/unfinished/separate.c*/
+/*src/unfinished/slide.c*/
+/*src/unfinished/sokoban.c*/
 
 /* no c200v2 */
 #if PLUGIN_BUFFER_SIZE > 0x14000
-pearl.c
-/*loopy.c*/
-/*solo.c*/
+src/pearl.c
+/*src/loopy.c*/
+/*src/solo.c*/
 #endif
diff --git a/apps/plugins/puzzles/dummy/assert.h b/apps/plugins/puzzles/dummy/assert.h
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/apps/plugins/puzzles/dummy/assert.h
@@ -0,0 +1 @@
+
diff --git a/apps/plugins/puzzles/dummy/math.h b/apps/plugins/puzzles/dummy/math.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/apps/plugins/puzzles/dummy/math.h
diff --git a/apps/plugins/puzzles/dummy/stdlib.h b/apps/plugins/puzzles/dummy/stdlib.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/apps/plugins/puzzles/dummy/stdlib.h
diff --git a/apps/plugins/puzzles/html/jspage.pl b/apps/plugins/puzzles/html/jspage.pl
deleted file mode 100755
index 19868bd948..0000000000
--- a/apps/plugins/puzzles/html/jspage.pl
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-open my $footerfile, "<", shift @ARGV or die "footer: open: $!\n";
-my $footer = "";
-$footer .= $_ while <$footerfile>;
-close $footerfile;
-
-for my $arg (@ARGV) {
-    $arg =~ /(.*\/)?([^\/]+)\.html$/ or die;
-    my $filename = $2;
-    open my $gamefile, "<", $arg or die "$arg: open: $!\n";
-    my $unfinished = 0;
-    my $docname = $filename;
-    chomp(my $puzzlename = <$gamefile>);
-    while ($puzzlename =~ s/^([^:=]+)(=([^:]+))?://) {
-        if ($1 eq "unfinished") {
-            $unfinished = 1;
-        } elsif ($1 eq "docname") {
-            $docname = $3;
-        } else {
-            die "$arg: unknown keyword '$1'\n";
-        }
-    }
-    my $instructions = "";
-    $instructions .= $_ while <$gamefile>;
-    close $gamefile;
-
-    open my $outpage, ">", "${filename}.html";
-
-    my $unfinishedtitlefragment = $unfinished ? "an unfinished puzzle " : "";
-    my $unfinishedheading = $unfinished ? "<h2 align=center>an unfinished puzzle</h2>\n" : "";
-    my $unfinishedpara;
-    my $links;
-    if ($unfinished) {
-        $unfinishedpara = <<EOF;
-<p>
-You have found your way to a page containing an <em>unfinished</em>
-puzzle in my collection, not linked from the <a href="../">main
-puzzles page</a>. Don't be surprised if things are hard to understand
-or don't work as you expect.
-EOF
-        $links = <<EOF;
-<p align="center">
-<a href="../">Back to main puzzles page</a> (which does not link to this)
-EOF
-    } else {
-        $unfinishedpara = "";
-        $links = <<EOF;
-<p align="center">
-<a href="../doc/${docname}.html#${docname}">Full instructions</a>
-|
-<a href="../">Back to main puzzles page</a>
-EOF
-    }
-
-    print $outpage <<EOF;
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
-<title>${puzzlename}, ${unfinishedtitlefragment}from Simon Tatham's Portable Puzzle Collection</title>
-<script type="text/javascript" src="${filename}.js"></script>
-</head>
-<body onLoad="initPuzzle();">
-<h1 align=center>${puzzlename}</h1>
-${unfinishedheading}
-<h2 align=center>from Simon Tatham's Portable Puzzle Collection</h2>
-
-${unfinishedpara}
-
-<hr>
-<div id="puzzle" style="display: none">
-<p align=center>
-  <input type="button" id="new" value="New game">
-  <input type="button" id="restart" value="Restart game">
-  <input type="button" id="undo" value="Undo move">
-  <input type="button" id="redo" value="Redo move">
-  <input type="button" id="solve" value="Solve game">
-  <input type="button" id="specific" value="Enter game ID">
-  <input type="button" id="random" value="Enter random seed">
-  <select id="gametype"></select>
-</p>
-<div align=center>
-  <div id="resizable" style="position:relative; left:0; top:0">
-  <canvas style="display: block" id="puzzlecanvas" width="1px" height="1px" tabindex="1">
-  </canvas>
-  <div id="statusbarholder" style="display: block">
-  </div>
-  </div>
-  <p>
-    Link to this puzzle:
-    <a id="permalink-desc">by game ID</a>
-    <a id="permalink-seed">by random seed</a>
-  </p>
-</div>
-</div>
-<div id="apology">
-Sorry, this Javascript puzzle doesn't seem to work in your web
-browser. Perhaps you have Javascript disabled, or perhaps your browser
-doesn't provide a feature that the puzzle code requires (such as
-<a href="https://developer.mozilla.org/en-US/docs/JavaScript/Typed_arrays">typed arrays</a>).
-These puzzles have been successfully run in Firefox 19, Chrome 26,
-Internet Explorer 10 and Safari 6.
-</div>
-<hr>
-
-${instructions}
-
-${links}
-
-${footer}
-</body>
-</html>
-EOF
-
-    close $outpage;
-}
diff --git a/apps/plugins/puzzles/keymaps.h b/apps/plugins/puzzles/keymaps.h
deleted file mode 100644
index 651ecca250..0000000000
--- a/apps/plugins/puzzles/keymaps.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2014 Franklin Wei, Benjamin Brown
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#ifndef _XWORLD_KEYMAPS_H
-#define _XWORLD_KEYMAPS_H
-
-/* Handle the "nice" targets that have directional buttons with normal names */
-#if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)  || \
-    (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD)  || \
-    (CONFIG_KEYPAD == PHILIPS_SA9200_PAD)   || \
-    (CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD) || \
-    (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) || \
-    (CONFIG_KEYPAD == SANSA_CONNECT_PAD)    || \
-    (CONFIG_KEYPAD == SANSA_C200_PAD)       || \
-    (CONFIG_KEYPAD == SANSA_CLIP_PAD)       || \
-    (CONFIG_KEYPAD == SANSA_E200_PAD)       || \
-    (CONFIG_KEYPAD == SANSA_FUZE_PAD)       || \
-    (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD)   || \
-    (CONFIG_KEYPAD == GIGABEAT_PAD)         || \
-    (CONFIG_KEYPAD == GIGABEAT_S_PAD)       || \
-    (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)    || \
-    (CONFIG_KEYPAD == SAMSUNG_YH820_PAD)    || \
-    (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)      || \
-    (CONFIG_KEYPAD == CREATIVE_ZEN_PAD)     || \
-    (CONFIG_KEYPAD == SONY_NWZ_PAD)         || \
-    (CONFIG_KEYPAD == CREATIVEZVM_PAD)      || \
-    (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD)     || \
-    (CONFIG_KEYPAD == IRIVER_H300_PAD)      || \
-    (CONFIG_KEYPAD == HM801_PAD)            || \
-    (CONFIG_KEYPAD == HM60X_PAD)
-#define BTN_UP         BUTTON_UP
-#define BTN_DOWN       BUTTON_DOWN
-#define BTN_LEFT       BUTTON_LEFT
-#define BTN_RIGHT      BUTTON_RIGHT
-
-#if (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD)
-#define BTN_UP_LEFT    BUTTON_BACK
-#define BTN_UP_RIGHT   BUTTON_PLAYPAUSE
-#define BTN_DOWN_LEFT  BUTTON_BOTTOMLEFT
-#define BTN_DOWN_RIGHT BUTTON_BOTTOMRIGHT
-#endif
-
-#if (CONFIG_KEYPAD == HM60X_PAD)
-#define BTN_FIRE       BUTTON_POWER
-#define BTN_PAUSE      BUTTON_SELECT
-#endif
-
-#if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)  || \
-    (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD)  || \
-    (CONFIG_KEYPAD == PHILIPS_SA9200_PAD)   || \
-    (CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD) || \
-    (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) || \
-    (CONFIG_KEYPAD == SANSA_CONNECT_PAD)    || \
-    (CONFIG_KEYPAD == SANSA_C200_PAD)       || \
-    (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD)   || \
-    (CONFIG_KEYPAD == ONDAVX747_PAD)
-#define BTN_FIRE       BUTTON_VOL_UP
-#define BTN_PAUSE      BUTTON_VOL_DOWN
-
-#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-#define BTN_FIRE       BUTTON_HOME
-#define BTN_PAUSE      BUTTON_SELECT
-
-#elif (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
-#define BTN_FIRE       BUTTON_FFWD
-#define BTN_PAUSE      BUTTON_REW
-
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD)
-#define BTN_FIRE       BUTTON_REC
-#define BTN_PAUSE      BUTTON_POWER
-
-#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD)
-#define BTN_FIRE       BUTTON_SELECT
-#define BTN_PAUSE      BUTTON_POWER
-
-#elif (CONFIG_KEYPAD == CREATIVE_ZEN_PAD)
-#define BTN_FIRE       BUTTON_SELECT
-#define BTN_PAUSE      BUTTON_BACK
-
-#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD)
-#define BTN_FIRE       BUTTON_PLAY
-#define BTN_PAUSE      BUTTON_MENU
-
-#elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD)
-#define BTN_FIRE       BUTTON_USER
-#define BTN_PAUSE      BUTTON_MENU
-
-#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
-#define BTN_FIRE       BUTTON_PLAY
-#define BTN_PAUSE      BUTTON_BACK
-
-#elif (CONFIG_KEYPAD == IRIVER_H300_PAD)
-#define BTN_FIRE       BUTTON_REC
-#define BTN_PAUSE      BUTTON_MODE
-
-#elif (CONFIG_KEYPAD == HM801_PAD)
-#define BTN_FIRE       BUTTON_PREV
-#define BTN_PAUSE      BUTTON_NEXT
-
-#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
-#define BTN_FIRE       BUTTON_REC
-#define BTN_PAUSE      BUTTON_PLAY
-
-#elif (CONFIG_KEYPAD == GIGABEAT_PAD)      || \
-      (CONFIG_KEYPAD == GIGABEAT_S_PAD)
-#define BTN_FIRE       BUTTON_VOL_UP
-#define BTN_PAUSE      BUTTON_MENU
-/* #if CONFIG_KEYPAD == PHILIPS_HDD1630_PAD */
-#endif
-
-/* ... and now for the bad ones that don't have
- * standard names for the directional buttons */
-#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
-#define BTN_UP         BUTTON_OK
-#define BTN_DOWN       BUTTON_CANCEL
-#define BTN_LEFT       BUTTON_MENU
-#define BTN_RIGHT      BUTTON_PLAY
-#define BTN_FIRE       BUTTON_POWER
-#define BTN_PAUSE      BUTTON_REC
-
-#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
-#define BTN_UP         BUTTON_SCROLL_UP
-#define BTN_DOWN       BUTTON_SCROLL_DOWN
-#define BTN_LEFT       BUTTON_LEFT
-#define BTN_RIGHT      BUTTON_RIGHT
-#define BTN_FIRE       BUTTON_REW
-#define BTN_PAUSE      BUTTON_PLAY
-
-#elif (CONFIG_KEYPAD == MROBE500_PAD)
-#define BTN_FIRE      BUTTON_POWER
-
-#elif (CONFIG_KEYPAD == MROBE_REMOTE)
-#define BTN_UP         BUTTON_RC_PLAY
-#define BTN_DOWN       BUTTON_RC_DOWN
-#define BTN_LEFT       BUTTON_RC_REW
-#define BTN_RIGHT      BUTTON_RC_FF
-
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
-      (CONFIG_KEYPAD == IPOD_3G_PAD) || \
-      (CONFIG_KEYPAD == IPOD_1G2G_PAD)
-#define BTN_UP         BUTTON_MENU
-#define BTN_DOWN       BUTTON_PLAY
-#define BTN_LEFT       BUTTON_LEFT
-#define BTN_RIGHT      BUTTON_RIGHT
-#define BTN_FIRE       BUTTON_SELECT
-#define BTN_PAUSE      (BUTTON_MENU | BUTTON_SELECT)
-
-#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
-#define BTN_FIRE       BUTTON_POWER
-
-#elif (CONFIG_KEYPAD == COWON_D2_PAD)
-#define BTN_FIRE       BUTTON_PLUS
-#define BTN_PAUSE      BUTTON_MINUS
-
-#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \
-      (CONFIG_KEYPAD == DX50_PAD)
-#define BTN_LEFT       BUTTON_LEFT
-#define BTN_RIGHT      BUTTON_RIGHT
-#define BTN_FIRE       BUTTON_BOTTOMLEFT
-#define BTN_PAUSE      BUTTON_TOPLEFT
-
-#else
-#error Unsupported keypad
-#endif
-
-#ifdef HAVE_TOUCHSCREEN
-#define BTN_UP         BUTTON_TOPMIDDLE
-#define BTN_DOWN       BUTTON_BOTTOMMIDDLE
-#define BTN_LEFT       BUTTON_LEFT
-#define BTN_RIGHT      BUTTON_RIGHT
-
-#if (CONFIG_KEYPAD == MROBE500_PAD) || \
-    (CONFIG_KEYPAD == ONDAVX777_PAD)
-#define BTN_PAUSE      BUTTON_BOTTOMLEFT
-
-#elif (CONFIG_KEYPAD != COWON_D2_PAD) && \
-      (CONFIG_KEYPAD != DX50_PAD)     && \
-      (CONFIG_KEYPAD != ONDAVX777_PAD)
-#define BTN_FIRE       BUTTON_BOTTOMLEFT
-#define BTN_PAUSE      BUTTON_TOPLEFT
-#endif
-
-/* HAVE_TOUCHSCREEN */
-#endif
-
-/* _XWORLD_KEYMAPS_H */
-#endif
diff --git a/apps/plugins/puzzles/puzzles.make b/apps/plugins/puzzles/puzzles.make
index 8780986a51..87e113efa9 100644
--- a/apps/plugins/puzzles/puzzles.make
+++ b/apps/plugins/puzzles/puzzles.make
@@ -48,9 +48,11 @@ PUZZLESOPTIMIZE := -Os # tiny plugin buffer
 endif
 
 # we suppress all warnings
-PUZZLESFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) $(PUZZLESOPTIMIZE)              \
-                -Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing -w \
-                -DFOR_REAL -I$(PUZZLES_SRCDIR)
+PUZZLESFLAGS =  -I$(PUZZLES_SRCDIR)/dummy                                       \
+                $(filter-out -O%,$(PLUGINFLAGS)) $(PUZZLESOPTIMIZE)             \
+                -Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing \
+                -DFOR_REAL -I$(PUZZLES_SRCDIR)/src                              \
+                -include $(PUZZLES_SRCDIR)/rbcompat.h
 ifdef PUZZLES_COMBINED
 PUZZLESFLAGS += -DCOMBINED
 endif
@@ -71,11 +73,11 @@ $(PUZZLES_OBJDIR)/puzzles.ovl: $(PUZZLES_OBJ) $(PUZZLES_OUTLDS) $(TLSFLIB)
                 -lgcc $(PUZZLES_OVLFLAGS)
         $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@)
 else
-$(PUZZLES_OBJDIR)/sgt-%.rock: $(PUZZLES_OBJDIR)/%.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB)
+$(PUZZLES_OBJDIR)/sgt-%.rock: $(PUZZLES_OBJDIR)/src/%.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB)
         $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(PUZZLES_OBJDIR)/$*.elf \
                 $(filter %.o, $^) \
                 $(filter %.a, $+) \
-                -lgcc $(filter-out -Wl%.map, $(PLUGINLDFLAGS)) -Wl,-Map,$(PUZZLES_OBJDIR)/$*.map
+                -lgcc $(filter-out -Wl%.map, $(PLUGINLDFLAGS)) -Wl,-Map,$(PUZZLES_OBJDIR)/src/$*.map
         $(SILENT)$(call objcopy,$(PUZZLES_OBJDIR)/$*.elf,$@)
 endif
 
@@ -87,3 +89,7 @@ $(PUZZLES_OBJDIR)/%.o: $(PUZZLES_SRCDIR)/%.c $(PUZZLES_SRCDIR)/puzzles.make
 $(PUZZLES_OBJDIR)/unfinished/%.o: $(PUZZLES_SRCDIR)/unfinished/%.c $(PUZZLES_SRCDIR)/puzzles.make
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@
+
+$(PUZZLES_OBJDIR)/src/%.o: $(PUZZLES_SRCDIR)/src/%.c $(PUZZLES_SRCDIR)/puzzles.make
+        $(SILENT)mkdir -p $(dir $@)
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@
diff --git a/apps/plugins/puzzles/rbcompat.h b/apps/plugins/puzzles/rbcompat.h
index 148aaef073..4bb9f39ca7 100644
--- a/apps/plugins/puzzles/rbcompat.h
+++ b/apps/plugins/puzzles/rbcompat.h
@@ -1,5 +1,11 @@
+#ifndef __RBCOMPAT_H__
+#define __RBCOMPAT_H__
+
 #include "plugin.h"
 #include "rbassert.h"
+#include "lib/pluginlib_exit.h"
+
+#include <tlsf.h>
 
 int sprintf_wrapper(char *str, const char *fmt, ...);
 char *getenv_wrapper(const char *c);
@@ -60,3 +66,9 @@ double acos_wrapper(double x);
 #define strtoq strtoq_wrapper
 #define strtouq strtouq_wrapper
 #define vsprintf vsprintf_wrapper
+
+#define abs(x) ((x)<0?-(x):(x))
+
+/* work around compilation error */
+typedef void FILE;
+#endif
diff --git a/apps/plugins/puzzles/malloc.c b/apps/plugins/puzzles/rbmalloc.c
index 47a7137459..5bf914ff87 100644
--- a/apps/plugins/puzzles/malloc.c
+++ b/apps/plugins/puzzles/rbmalloc.c
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "puzzles.h"
+#include "src/puzzles.h"
 
 /*
  * smalloc should guarantee to return a useful pointer - Halibut
diff --git a/apps/plugins/puzzles/rbwrappers.c b/apps/plugins/puzzles/rbwrappers.c
index e595cf93d1..4fbfdc4e60 100644
--- a/apps/plugins/puzzles/rbwrappers.c
+++ b/apps/plugins/puzzles/rbwrappers.c
@@ -1346,9 +1346,12 @@ double scalbn_wrapper (double x, int n)
         if (k > 0)                              /* normal result */
             {__HI(x) = (hx&0x800fffff)|(k<<20); return x;}
         if (k <= -54)
+        {
             if (n > 50000)      /* in case integer overflow in n+k */
                 return huge*copysign_wrapper(huge,x);   /*overflow*/
-            else return tiny*copysign_wrapper(tiny,x);  /*underflow*/
+            else
+                return tiny*copysign_wrapper(tiny,x);  /*underflow*/
+        }
         k += 54;                                /* subnormal result */
         __HI(x) = (hx&0x800fffff)|(k<<20);
         return x*twom54;
@@ -1608,18 +1611,6 @@ static void bcopy_wrapper(const void *src, void *dst, size_t n)
 }
 
 int
-sscanf_wrapper(const char *ibuf, const char *fmt, ...)
-{
-        va_list ap;
-        int ret;
-
-        va_start(ap, fmt);
-        ret = rb_vsscanf(ibuf, fmt, ap);
-        va_end(ap);
-        return(ret);
-}
-
-int
 rb_vsscanf(const char *inp, char const *fmt0, va_list ap)
 {
         int inr;
@@ -2065,6 +2056,18 @@ match_failure:
         return (nassigned);
 }
 
+int
+sscanf_wrapper(const char *ibuf, const char *fmt, ...)
+{
+        va_list ap;
+        int ret;
+
+        va_start(ap, fmt);
+        ret = rb_vsscanf(ibuf, fmt, ap);
+        va_end(ap);
+        return(ret);
+}
+
 /*
  * Fill in the given table from the scanset at the given format
  * (just after `[').  Return a pointer to the character past the
diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c
index 077d5f8fe2..54d24b065b 100644
--- a/apps/plugins/puzzles/rockbox.c
+++ b/apps/plugins/puzzles/rockbox.c
@@ -23,8 +23,8 @@
 
 #include "plugin.h"
 
-#include "puzzles.h"
-#include "keymaps.h"
+#include "src/puzzles.h"
+#include "src/keymaps.h"
 
 #ifndef COMBINED
 #include "lib/playback_control.h"
@@ -315,6 +315,7 @@ static void rb_draw_line(void *handle, int x1, int y1, int x2, int y2,
         draw_antialiased_line(x1, y1, x2, y2);
 }
 
+#if 0
 /*
  * draw filled polygon
  * originally by Sebastian Leonhardt (ulmutul)
@@ -409,6 +410,7 @@ static void v_fillarea(int count, int *pxy)
         fill_poly_line(i, count, pxy);
     }
 }
+#endif
 
 static void rb_draw_poly(void *handle, int *coords, int npoints,
                          int fillcolor, int outlinecolor)
@@ -916,7 +918,7 @@ static bool config_menu(void)
             config_item old;
             int pos = rb->gui_synclist_get_sel_pos(&list);
             memcpy(&old, config + pos, sizeof(old));
-            char *old_str;
+            char *old_str = NULL;
             if(old.type == C_STRING)
                 old_str = dupstr(old.sval);
             bool freed_str = do_configure_item(config + pos);
@@ -928,13 +930,13 @@ static bool config_menu(void)
                 if(freed_str)
                     config[pos].sval = old_str;
             }
-            else if(old.type == C_STRING)
-            {
-                /* success, and we duplicated the old string, so free it */
-                sfree(old_str);
-            }
             else
             {
+                if(old.type == C_STRING)
+                {
+                    /* success, and we duplicated the old string, so free it */
+                    sfree(old_str);
+                }
                 success = true;
             }
             break;
@@ -956,33 +958,29 @@ done:
 
 const char *preset_formatter(int sel, void *data, char *buf, size_t len)
 {
-    char *name;
-    game_params *junk;
-    midend_fetch_preset(me, sel, &name, &junk);
-    rb->strlcpy(buf, name, len);
+    struct preset_menu *menu = data;
+    rb->snprintf(buf, len, "%s", menu->entries[sel].title);
     return buf;
 }
 
-static bool presets_menu(void)
+/* main worker function */
+static bool do_preset_menu(struct preset_menu *menu, char *title)
 {
-    if(!midend_num_presets(me))
-    {
-        rb->splash(HZ, "No presets!");
+    if(!menu->n_entries)
         return false;
-    }
 
     /* display a list */
     struct gui_synclist list;
 
-    rb->gui_synclist_init(&list, &preset_formatter, NULL, false, 1, NULL);
+    rb->gui_synclist_init(&list, &preset_formatter, menu, false, 1, NULL);
     rb->gui_synclist_set_icon_callback(&list, NULL);
-    rb->gui_synclist_set_nb_items(&list, midend_num_presets(me));
+    rb->gui_synclist_set_nb_items(&list, menu->n_entries);
     rb->gui_synclist_limit_scroll(&list, false);
 
-    int current = midend_which_preset(me);
-    rb->gui_synclist_select_item(&list, current >= 0 ? current : 0);
+    rb->gui_synclist_select_item(&list, 0); /* we don't start with the current one selected */
 
-    rb->gui_synclist_set_title(&list, "Game Type", NOICON);
+    char def[] = "Game Type";
+    rb->gui_synclist_set_title(&list, title ? title : def, NOICON);
     while(1)
     {
         rb->gui_synclist_draw(&list);
@@ -994,11 +992,19 @@ static bool presets_menu(void)
         case ACTION_STD_OK:
         {
             int sel = rb->gui_synclist_get_sel_pos(&list);
-            char *junk;
-            game_params *params;
-            midend_fetch_preset(me, sel, &junk, &params);
-            midend_set_params(me, params);
-            return true;
+            struct preset_menu_entry *entry = menu->entries + sel;
+            if(entry->params)
+            {
+                midend_set_params(me, entry->params);
+                return true;
+            }
+            else
+            {
+                /* recurse */
+                if(do_preset_menu(entry->submenu, entry->title))
+                    return true;
+            }
+            break;
         }
         case ACTION_STD_PREV:
         case ACTION_STD_CANCEL:
@@ -1009,6 +1015,11 @@ static bool presets_menu(void)
     }
 }
 
+static bool presets_menu(void)
+{
+    return do_preset_menu(midend_get_presets(me, NULL), NULL);
+}
+
 static const struct {
     const char *game, *help;
 } quick_help_text[] = {
@@ -1212,7 +1223,7 @@ static int pausemenu_cb(int action, const struct menu_item_ex *this_item)
                 return ACTION_EXIT_MENUITEM;
 #endif
         case 9:
-            if(!midend_num_presets(me))
+            if(!midend_get_presets(me, NULL)->n_entries)
                 return ACTION_EXIT_MENUITEM;
             break;
         case 10:
@@ -1808,7 +1819,7 @@ static int mainmenu_cb(int action, const struct menu_item_ex *this_item)
                 return ACTION_EXIT_MENUITEM;
 #endif
         case 5:
-            if(!midend_num_presets(me))
+            if(!midend_get_presets(me, NULL)->n_entries)
                 return ACTION_EXIT_MENUITEM;
             break;
         case 6:
diff --git a/apps/plugins/puzzles/Buildscr b/apps/plugins/puzzles/src/Buildscr
index 910981f079..910981f079 100644
--- a/apps/plugins/puzzles/Buildscr
+++ b/apps/plugins/puzzles/src/Buildscr
diff --git a/apps/plugins/puzzles/CHECKLST.txt b/apps/plugins/puzzles/src/CHECKLST.txt
index 2bef909e14..2bef909e14 100644
--- a/apps/plugins/puzzles/CHECKLST.txt
+++ b/apps/plugins/puzzles/src/CHECKLST.txt
diff --git a/apps/plugins/puzzles/LICENCE b/apps/plugins/puzzles/src/LICENCE
index 4235005ea7..4235005ea7 100644
--- a/apps/plugins/puzzles/LICENCE
+++ b/apps/plugins/puzzles/src/LICENCE
diff --git a/apps/plugins/puzzles/src/Makefile b/apps/plugins/puzzles/src/Makefile
new file mode 100644
index 0000000000..09acd2dd39
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile
@@ -0,0 +1,727 @@
+# Makefile for puzzles under X/GTK and Unix.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+
+# You can define this path to point at your tools if you need to
+# TOOLPATH = /opt/gcc/bin
+CC := $(TOOLPATH)$(CC)
+# You can manually set this to `gtk-config' or `pkg-config gtk+-1.2'
+# (depending on what works on your system) if you want to enforce
+# building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0'
+# if you want to enforce 2.0. The default is to try 2.0 and fall back
+# to 1.2 if it isn't found.
+GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 $$0 2>/dev/null || gtk-config $$0'
+
+CFLAGS := -O2 -Wall -ansi -pedantic -g -I./ -Iicons/ `$(GTK_CONFIG) \
+                --cflags` $(CFLAGS)
+XLIBS = `$(GTK_CONFIG) --libs` -lm
+ULIBS = -lm#
+INSTALL=install
+INSTALL_PROGRAM=$(INSTALL)
+INSTALL_DATA=$(INSTALL)
+prefix=/usr/local
+exec_prefix=$(prefix)
+bindir=$(exec_prefix)/bin
+gamesdir=$(exec_prefix)/games
+mandir=$(prefix)/man
+man1dir=$(mandir)/man1
+
+all: $(BINPREFIX)blackbox $(BINPREFIX)bridges $(BINPREFIX)cube \
+                $(BINPREFIX)dominosa $(BINPREFIX)fifteen \
+                $(BINPREFIX)fifteensolver $(BINPREFIX)filling \
+                $(BINPREFIX)fillingsolver $(BINPREFIX)flip $(BINPREFIX)flood \
+                $(BINPREFIX)galaxies $(BINPREFIX)galaxiespicture \
+                $(BINPREFIX)galaxiessolver $(BINPREFIX)guess \
+                $(BINPREFIX)inertia $(BINPREFIX)keen $(BINPREFIX)keensolver \
+                $(BINPREFIX)latincheck $(BINPREFIX)lightup \
+                $(BINPREFIX)lightupsolver $(BINPREFIX)loopy \
+                $(BINPREFIX)loopysolver $(BINPREFIX)magnets \
+                $(BINPREFIX)magnetssolver $(BINPREFIX)map \
+                $(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc \
+                $(BINPREFIX)mines $(BINPREFIX)net $(BINPREFIX)netslide \
+                $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)palisade \
+                $(BINPREFIX)pattern $(BINPREFIX)patternpicture \
+                $(BINPREFIX)patternsolver $(BINPREFIX)pearl \
+                $(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range \
+                $(BINPREFIX)rect $(BINPREFIX)samegame $(BINPREFIX)signpost \
+                $(BINPREFIX)signpostsolver $(BINPREFIX)singles \
+                $(BINPREFIX)singlessolver $(BINPREFIX)sixteen \
+                $(BINPREFIX)slant $(BINPREFIX)slantsolver $(BINPREFIX)solo \
+                $(BINPREFIX)solosolver $(BINPREFIX)tents \
+                $(BINPREFIX)tentssolver $(BINPREFIX)towers \
+                $(BINPREFIX)towerssolver $(BINPREFIX)tracks \
+                $(BINPREFIX)twiddle $(BINPREFIX)undead $(BINPREFIX)unequal \
+                $(BINPREFIX)unequalsolver $(BINPREFIX)unruly \
+                $(BINPREFIX)unrulysolver $(BINPREFIX)untangle
+
+$(BINPREFIX)blackbox: blackbox.o drawing.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ blackbox.o drawing.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)bridges: bridges.o drawing.o dsf.o findloop.o gtk.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ bridges.o drawing.o dsf.o findloop.o gtk.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                 $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)cube: cube.o drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o version.o
+        $(CC) -o $@ cube.o drawing.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)dominosa: dominosa.o drawing.o gtk.o laydomino.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ dominosa.o drawing.o gtk.o laydomino.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)fifteen: drawing.o fifteen.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o fifteen.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)fifteensolver: fifteen2.o malloc.o misc.o nullfe.o random.o
+        $(CC) -o $@ fifteen2.o malloc.o misc.o nullfe.o random.o  $(XLFLAGS) \
+                $(ULIBS)
+
+$(BINPREFIX)filling: drawing.o dsf.o filling.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o dsf.o filling.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)fillingsolver: dsf.o filling2.o malloc.o misc.o nullfe.o \
+                random.o
+        $(CC) -o $@ dsf.o filling2.o malloc.o misc.o nullfe.o random.o  \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)flip: drawing.o flip.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o tree234.o version.o
+        $(CC) -o $@ drawing.o flip.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)flood: drawing.o flood.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o flood.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)galaxies: drawing.o dsf.o galaxies.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o dsf.o galaxies.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)galaxiespicture: dsf.o galaxie4.o malloc.o misc.o nullfe.o \
+                random.o
+        $(CC) -o $@ dsf.o galaxie4.o malloc.o misc.o nullfe.o random.o -lm \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)galaxiessolver: dsf.o galaxie2.o malloc.o misc.o nullfe.o \
+                random.o
+        $(CC) -o $@ dsf.o galaxie2.o malloc.o misc.o nullfe.o random.o -lm \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)guess: drawing.o gtk.o guess.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o gtk.o guess.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)inertia: drawing.o gtk.o inertia.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o gtk.o inertia.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)keen: drawing.o dsf.o gtk.o keen.o latin.o malloc.o maxflow.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o keen.o latin.o malloc.o maxflow.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)keensolver: dsf.o keen2.o latin6.o malloc.o maxflow.o misc.o \
+                nullfe.o random.o tree234.o
+        $(CC) -o $@ dsf.o keen2.o latin6.o malloc.o maxflow.o misc.o \
+                nullfe.o random.o tree234.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)latincheck: latin8.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tree234.o
+        $(CC) -o $@ latin8.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tree234.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)lightup: combi.o drawing.o gtk.o lightup.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ combi.o drawing.o gtk.o lightup.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)lightupsolver: combi.o lightup2.o malloc.o misc.o nullfe.o \
+                random.o
+        $(CC) -o $@ combi.o lightup2.o malloc.o misc.o nullfe.o random.o  \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)loopy: drawing.o dsf.o grid.o gtk.o loopgen.o loopy.o malloc.o \
+                midend.o misc.o no-icon.o penrose.o printing.o ps.o random.o \
+                tree234.o version.o
+        $(CC) -o $@ drawing.o dsf.o grid.o gtk.o loopgen.o loopy.o malloc.o \
+                midend.o misc.o no-icon.o penrose.o printing.o ps.o random.o \
+                tree234.o version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)loopysolver: dsf.o grid.o loopgen.o loopy2.o malloc.o misc.o \
+                nullfe.o penrose.o random.o tree234.o
+        $(CC) -o $@ dsf.o grid.o loopgen.o loopy2.o malloc.o misc.o nullfe.o \
+                penrose.o random.o tree234.o -lm $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)magnets: drawing.o gtk.o laydomino.o magnets.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o gtk.o laydomino.o magnets.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)magnetssolver: laydomino.o magnets2.o malloc.o misc.o nullfe.o \
+                random.o
+        $(CC) -o $@ laydomino.o magnets2.o malloc.o misc.o nullfe.o random.o \
+                -lm $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)map: drawing.o dsf.o gtk.o malloc.o map.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o malloc.o map.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)mapsolver: dsf.o malloc.o map2.o misc.o nullfe.o random.o
+        $(CC) -o $@ dsf.o malloc.o map2.o misc.o nullfe.o random.o -lm \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)mineobfusc: malloc.o mines2.o misc.o nullfe.o random.o tree234.o
+        $(CC) -o $@ malloc.o mines2.o misc.o nullfe.o random.o tree234.o  \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)mines: drawing.o gtk.o malloc.o midend.o mines.o misc.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o mines.o misc.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)net: drawing.o dsf.o findloop.o gtk.o malloc.o midend.o misc.o \
+                net.o no-icon.o printing.o ps.o random.o tree234.o version.o
+        $(CC) -o $@ drawing.o dsf.o findloop.o gtk.o malloc.o midend.o \
+                misc.o net.o no-icon.o printing.o ps.o random.o tree234.o \
+                version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)netslide: drawing.o gtk.o malloc.o midend.o misc.o netslide.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o netslide.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)nullgame: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                nullgame.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                nullgame.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)obfusc: malloc.o misc.o nullfe.o obfusc.o random.o
+        $(CC) -o $@ malloc.o misc.o nullfe.o obfusc.o random.o  $(XLFLAGS) \
+                $(ULIBS)
+
+$(BINPREFIX)palisade: divvy.o drawing.o dsf.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o palisade.o printing.o ps.o random.o version.o
+        $(CC) -o $@ divvy.o drawing.o dsf.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o palisade.o printing.o ps.o random.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)pattern: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                pattern.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                pattern.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)patternpicture: malloc.o misc.o nullfe.o pattern4.o random.o
+        $(CC) -o $@ malloc.o misc.o nullfe.o pattern4.o random.o  $(XLFLAGS) \
+                $(ULIBS)
+
+$(BINPREFIX)patternsolver: malloc.o misc.o nullfe.o pattern2.o random.o
+        $(CC) -o $@ malloc.o misc.o nullfe.o pattern2.o random.o  $(XLFLAGS) \
+                $(ULIBS)
+
+$(BINPREFIX)pearl: drawing.o dsf.o grid.o gtk.o loopgen.o malloc.o midend.o \
+                misc.o no-icon.o pearl.o penrose.o printing.o ps.o random.o \
+                tdq.o tree234.o version.o
+        $(CC) -o $@ drawing.o dsf.o grid.o gtk.o loopgen.o malloc.o midend.o \
+                misc.o no-icon.o pearl.o penrose.o printing.o ps.o random.o \
+                tdq.o tree234.o version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)pearlbench: dsf.o grid.o loopgen.o malloc.o misc.o nullfe.o \
+                pearl2.o penrose.o random.o tdq.o tree234.o
+        $(CC) -o $@ dsf.o grid.o loopgen.o malloc.o misc.o nullfe.o pearl2.o \
+                penrose.o random.o tdq.o tree234.o -lm $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)pegs: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o pegs.o \
+                printing.o ps.o random.o tree234.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                pegs.o printing.o ps.o random.o tree234.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)range: drawing.o dsf.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o range.o version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o range.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)rect: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o rect.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o rect.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)samegame: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o samegame.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o samegame.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)signpost: drawing.o dsf.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o signpost.o version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o signpost.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)signpostsolver: dsf.o malloc.o misc.o nullfe.o random.o \
+                signpos2.o
+        $(CC) -o $@ dsf.o malloc.o misc.o nullfe.o random.o signpos2.o -lm \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)singles: drawing.o dsf.o gtk.o latin.o malloc.o maxflow.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o singles.o \
+                tree234.o version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o latin.o malloc.o maxflow.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o singles.o \
+                tree234.o version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)singlessolver: dsf.o latin.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o singles3.o tree234.o
+        $(CC) -o $@ dsf.o latin.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o singles3.o tree234.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)sixteen: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o sixteen.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o sixteen.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)slant: drawing.o dsf.o findloop.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o slant.o version.o
+        $(CC) -o $@ drawing.o dsf.o findloop.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o slant.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)slantsolver: dsf.o findloop.o malloc.o misc.o nullfe.o random.o \
+                slant2.o
+        $(CC) -o $@ dsf.o findloop.o malloc.o misc.o nullfe.o random.o \
+                slant2.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)solo: divvy.o drawing.o dsf.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o solo.o version.o
+        $(CC) -o $@ divvy.o drawing.o dsf.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o solo.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)solosolver: divvy.o dsf.o malloc.o misc.o nullfe.o random.o \
+                solo2.o
+        $(CC) -o $@ divvy.o dsf.o malloc.o misc.o nullfe.o random.o solo2.o  \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)tents: drawing.o dsf.o gtk.o malloc.o maxflow.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o tents.o version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o malloc.o maxflow.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o tents.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)tentssolver: dsf.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tents3.o
+        $(CC) -o $@ dsf.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tents3.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)towers: drawing.o gtk.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o towers.o tree234.o \
+                version.o
+        $(CC) -o $@ drawing.o gtk.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o towers.o tree234.o \
+                version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)towerssolver: latin6.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o towers2.o tree234.o
+        $(CC) -o $@ latin6.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                towers2.o tree234.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)tracks: drawing.o dsf.o findloop.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tracks.o version.o
+        $(CC) -o $@ drawing.o dsf.o findloop.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tracks.o version.o \
+                 $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)twiddle: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o twiddle.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o twiddle.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)undead: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o undead.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o undead.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)unequal: drawing.o gtk.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                unequal.o version.o
+        $(CC) -o $@ drawing.o gtk.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                unequal.o version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)unequalsolver: latin6.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o tree234.o unequal2.o
+        $(CC) -o $@ latin6.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tree234.o unequal2.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)unruly: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o unruly.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o unruly.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)unrulysolver: malloc.o misc.o nullfe.o random.o unruly2.o
+        $(CC) -o $@ malloc.o misc.o nullfe.o random.o unruly2.o  $(XLFLAGS) \
+                $(ULIBS)
+
+$(BINPREFIX)untangle: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o tree234.o untangle.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o tree234.o untangle.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+blackbox.o: ./blackbox.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+blackbo3.o: ./blackbox.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+bridges.o: ./bridges.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+bridges3.o: ./bridges.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+combi.o: ./combi.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube.o: ./cube.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube3.o: ./cube.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+divvy.o: ./divvy.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominosa.o: ./dominosa.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominos3.o: ./dominosa.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+drawing.o: ./drawing.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dsf.o: ./dsf.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen5.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+fifteen2.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+filling.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+filling5.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+filling2.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+findloop.o: ./findloop.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip3.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+flood.o: ./flood.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flood3.o: ./flood.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxies.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+galaxie7.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxie4.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+galaxie2.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+grid.o: ./grid.c ./puzzles.h ./tree234.h ./grid.h ./penrose.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+gtk.o: ./gtk.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess.o: ./guess.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess3.o: ./guess.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+inertia.o: ./inertia.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+inertia3.o: ./inertia.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+keen5.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen2.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+latin.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+latin8.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_LATIN_TEST -c $< -o $@
+latin6.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+laydomino.o: ./laydomino.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup5.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+lightup2.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+list.o: ./list.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopgen.o: ./loopgen.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy5.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+loopy2.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+magnets.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+magnets5.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+magnets2.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+malloc.o: ./malloc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map5.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+map2.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+maxflow.o: ./maxflow.c ./maxflow.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+midend.o: ./midend.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines5.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+mines2.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_OBFUSCATOR -c $< -o $@
+misc.o: ./misc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net3.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+netslide.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+netslid3.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+no-icon.o: ./no-icon.c
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullfe.o: ./nullfe.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullgame.o: ./nullgame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+obfusc.o: ./obfusc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+osx.o: ./osx.m ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisade.o: ./palisade.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisad3.o: ./palisade.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pattern7.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern4.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+pattern2.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pearl.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pearl5.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pearl2.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pegs.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pegs3.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+penrose.o: ./penrose.c ./puzzles.h ./penrose.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+printing.o: ./printing.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+ps.o: ./ps.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+random.o: ./random.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range.o: ./range.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range3.o: ./range.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+rect.o: ./rect.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+rect3.o: ./rect.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+samegame.o: ./samegame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+samegam3.o: ./samegame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpost.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+signpos5.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpos2.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+singles.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+singles5.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+singles3.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+sixteen.o: ./sixteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+sixteen3.o: ./sixteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+slant5.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant2.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+solo.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+solo5.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+solo2.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tdq.o: ./tdq.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents5.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tents3.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+towers.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+towers5.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+towers2.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tracks.o: ./tracks.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tracks3.o: ./tracks.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tree234.o: ./tree234.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle.o: ./twiddle.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle3.o: ./twiddle.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+undead.o: ./undead.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+undead3.o: ./undead.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unequal5.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal2.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+unruly.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unruly5.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unruly2.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+untangle.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+untangl3.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+version.o: ./version.c ./version.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows1.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+
+GAMES += blackbox
+GAMES += bridges
+GAMES += cube
+GAMES += dominosa
+GAMES += fifteen
+GAMES += filling
+GAMES += flip
+GAMES += flood
+GAMES += galaxies
+GAMES += guess
+GAMES += inertia
+GAMES += keen
+GAMES += lightup
+GAMES += loopy
+GAMES += magnets
+GAMES += map
+GAMES += mines
+GAMES += net
+GAMES += netslide
+GAMES += palisade
+GAMES += pattern
+GAMES += pearl
+GAMES += pegs
+GAMES += range
+GAMES += rect
+GAMES += samegame
+GAMES += signpost
+GAMES += singles
+GAMES += sixteen
+GAMES += slant
+GAMES += solo
+GAMES += tents
+GAMES += towers
+GAMES += tracks
+GAMES += twiddle
+GAMES += undead
+GAMES += unequal
+GAMES += unruly
+GAMES += untangle
+install:
+        for i in $(GAMES); do \
+                $(INSTALL_PROGRAM) -m 755 $(BINPREFIX)$$i $(DESTDIR)$(gamesdir)/$(BINPREFIX)$$i \
+                || exit 1; \
+        done
+test: benchmark.html benchmark.txt
+
+benchmark.html: benchmark.txt benchmark.pl
+        ./benchmark.pl benchmark.txt > $@
+
+benchmark.txt: benchmark.sh $(GAMES)
+        ./benchmark.sh > $@
+
+
+clean:
+        rm -f *.o $(BINPREFIX)blackbox $(BINPREFIX)bridges $(BINPREFIX)cube $(BINPREFIX)dominosa $(BINPREFIX)fifteen $(BINPREFIX)fifteensolver $(BINPREFIX)filling $(BINPREFIX)fillingsolver $(BINPREFIX)flip $(BINPREFIX)flood $(BINPREFIX)galaxies $(BINPREFIX)galaxiespicture $(BINPREFIX)galaxiessolver $(BINPREFIX)guess $(BINPREFIX)inertia $(BINPREFIX)keen $(BINPREFIX)keensolver $(BINPREFIX)latincheck $(BINPREFIX)lightup $(BINPREFIX)lightupsolver $(BINPREFIX)loopy $(BINPREFIX)loopysolver $(BINPREFIX)magnets $(BINPREFIX)magnetssolver $(BINPREFIX)map $(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc $(BINPREFIX)mines $(BINPREFIX)net $(BINPREFIX)netslide $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)palisade $(BINPREFIX)pattern $(BINPREFIX)patternpicture $(BINPREFIX)patternsolver $(BINPREFIX)pearl $(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range $(BINPREFIX)rect $(BINPREFIX)samegame $(BINPREFIX)signpost $(BINPREFIX)signpostsolver $(BINPREFIX)singles $(BINPREFIX)singlessolver $(BINPREFIX)sixteen $(BINPREFIX)slant $(BINPREFIX)slantsolver $(BINPREFIX)solo $(BINPREFIX)solosolver $(BINPREFIX)tents $(BINPREFIX)tentssolver $(BINPREFIX)towers $(BINPREFIX)towerssolver $(BINPREFIX)tracks $(BINPREFIX)twiddle $(BINPREFIX)undead $(BINPREFIX)unequal $(BINPREFIX)unequalsolver $(BINPREFIX)unruly $(BINPREFIX)unrulysolver $(BINPREFIX)untangle
diff --git a/apps/plugins/puzzles/src/Makefile.am b/apps/plugins/puzzles/src/Makefile.am
new file mode 100644
index 0000000000..6e03ed49a5
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.am
@@ -0,0 +1,446 @@
+# Makefile.am for puzzles under Unix with Autoconf/Automake.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+
+GAMES =
+noinst_PROGRAMS = blackbox bridges cube dominosa fifteen fifteensolver \
+                filling fillingsolver flip flood galaxies galaxiespicture \
+                galaxiessolver guess inertia keen keensolver latincheck \
+                lightup lightupsolver loopy loopysolver magnets \
+                magnetssolver map mapsolver mineobfusc mines net netslide \
+                nullgame obfusc palisade pattern patternpicture \
+                patternsolver pearl pearlbench pegs range rect samegame \
+                signpost signpostsolver singles singlessolver sixteen slant \
+                slantsolver solo solosolver tents tentssolver towers \
+                towerssolver tracks twiddle undead unequal unequalsolver \
+                unruly unrulysolver untangle
+AUTOMAKE_OPTIONS = subdir-objects
+
+allsources = ./blackbox.c ./bridges.c ./combi.c ./cube.c ./divvy.c \
+                ./dominosa.c ./drawing.c ./dsf.c ./fifteen.c ./filling.c \
+                ./findloop.c ./flip.c ./flood.c ./galaxies.c ./grid.c \
+                ./grid.h ./gtk.c ./guess.c ./inertia.c ./keen.c ./latin.c \
+                ./latin.h ./laydomino.c ./lightup.c ./list.c ./loopgen.c \
+                ./loopgen.h ./loopy.c ./magnets.c ./malloc.c ./map.c \
+                ./maxflow.c ./maxflow.h ./midend.c ./mines.c ./misc.c \
+                ./net.c ./netslide.c ./no-icon.c ./nullfe.c ./nullgame.c \
+                ./obfusc.c ./osx.m ./palisade.c ./pattern.c ./pearl.c \
+                ./pegs.c ./penrose.c ./penrose.h ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./range.c ./rect.c ./resource.h \
+                ./samegame.c ./signpost.c ./singles.c ./sixteen.c ./slant.c \
+                ./solo.c ./tdq.c ./tents.c ./towers.c ./tracks.c ./tree234.c \
+                ./tree234.h ./twiddle.c ./undead.c ./unequal.c ./unruly.c \
+                ./untangle.c ./version.c ./version.h ./windows.c
+
+AM_CPPFLAGS = -I$(srcdir)/./ -I$(srcdir)/icons/ 
+AM_CFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)
+blackbox_SOURCES = ./blackbox.c ./drawing.c ./gtk.c ./malloc.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+blackbox_LDADD = $(GTK_LIBS) -lm
+
+bridges_SOURCES = ./bridges.c ./drawing.c ./dsf.c ./findloop.c ./gtk.c \
+                ./malloc.c ./midend.c ./misc.c ./no-icon.c ./printing.c \
+                ./ps.c ./puzzles.h ./random.c ./version.c ./version.h
+bridges_LDADD = $(GTK_LIBS) -lm
+
+cube_SOURCES = ./cube.c ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./version.c ./version.h
+cube_LDADD = $(GTK_LIBS) -lm
+
+dominosa_SOURCES = ./dominosa.c ./drawing.c ./gtk.c ./laydomino.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./version.c ./version.h
+dominosa_LDADD = $(GTK_LIBS) -lm
+
+fifteen_SOURCES = ./drawing.c ./fifteen.c ./gtk.c ./malloc.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+fifteen_LDADD = $(GTK_LIBS) -lm
+
+fifteensolver_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+fifteensolver_LDADD = libfifteen2_a-fifteen.$(OBJEXT) -lm
+
+filling_SOURCES = ./drawing.c ./dsf.c ./filling.c ./gtk.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./version.c ./version.h
+filling_LDADD = $(GTK_LIBS) -lm
+
+fillingsolver_SOURCES = ./dsf.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+fillingsolver_LDADD = libfilling2_a-filling.$(OBJEXT) -lm
+
+flip_SOURCES = ./drawing.c ./flip.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h ./version.c ./version.h
+flip_LDADD = $(GTK_LIBS) -lm
+
+flood_SOURCES = ./drawing.c ./flood.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./version.c ./version.h
+flood_LDADD = $(GTK_LIBS) -lm
+
+galaxies_SOURCES = ./drawing.c ./dsf.c ./galaxies.c ./gtk.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./version.c ./version.h
+galaxies_LDADD = $(GTK_LIBS) -lm
+
+galaxiespicture_SOURCES = ./dsf.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+galaxiespicture_LDADD = libgalaxie4_a-galaxies.$(OBJEXT) -lm
+
+galaxiessolver_SOURCES = ./dsf.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+galaxiessolver_LDADD = libgalaxie2_a-galaxies.$(OBJEXT) -lm
+
+guess_SOURCES = ./drawing.c ./gtk.c ./guess.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./version.c ./version.h
+guess_LDADD = $(GTK_LIBS) -lm
+
+inertia_SOURCES = ./drawing.c ./gtk.c ./inertia.c ./malloc.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+inertia_LDADD = $(GTK_LIBS) -lm
+
+keen_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./keen.c ./latin.c ./latin.h \
+                ./malloc.c ./maxflow.c ./maxflow.h ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h ./version.c ./version.h
+keen_LDADD = $(GTK_LIBS) -lm
+
+keensolver_SOURCES = ./dsf.c ./malloc.c ./maxflow.c ./maxflow.h ./misc.c \
+                ./nullfe.c ./puzzles.h ./random.c ./tree234.c ./tree234.h
+keensolver_LDADD = libkeen2_a-keen.$(OBJEXT) liblatin6_a-latin.$(OBJEXT) -lm
+
+latincheck_SOURCES = ./malloc.c ./maxflow.c ./maxflow.h ./misc.c ./nullfe.c \
+                ./puzzles.h ./random.c ./tree234.c ./tree234.h
+latincheck_LDADD = liblatin8_a-latin.$(OBJEXT) -lm
+
+lightup_SOURCES = ./combi.c ./drawing.c ./gtk.c ./lightup.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./version.c ./version.h
+lightup_LDADD = $(GTK_LIBS) -lm
+
+lightupsolver_SOURCES = ./combi.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+lightupsolver_LDADD = liblightup2_a-lightup.$(OBJEXT) -lm
+
+loopy_SOURCES = ./drawing.c ./dsf.c ./grid.c ./grid.h ./gtk.c ./loopgen.c \
+                ./loopgen.h ./loopy.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./penrose.c ./penrose.h ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./tree234.c ./tree234.h ./version.c \
+                ./version.h
+loopy_LDADD = $(GTK_LIBS) -lm
+
+loopysolver_SOURCES = ./dsf.c ./grid.c ./grid.h ./loopgen.c ./loopgen.h \
+                ./malloc.c ./misc.c ./nullfe.c ./penrose.c ./penrose.h \
+                ./puzzles.h ./random.c ./tree234.c ./tree234.h
+loopysolver_LDADD = libloopy2_a-loopy.$(OBJEXT) -lm
+
+magnets_SOURCES = ./drawing.c ./gtk.c ./laydomino.c ./magnets.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./version.c ./version.h
+magnets_LDADD = $(GTK_LIBS) -lm
+
+magnetssolver_SOURCES = ./laydomino.c ./malloc.c ./misc.c ./nullfe.c \
+                ./puzzles.h ./random.c
+magnetssolver_LDADD = libmagnets2_a-magnets.$(OBJEXT) -lm
+
+map_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./malloc.c ./map.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+map_LDADD = $(GTK_LIBS) -lm
+
+mapsolver_SOURCES = ./dsf.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+mapsolver_LDADD = libmap2_a-map.$(OBJEXT) -lm
+
+mineobfusc_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h
+mineobfusc_LDADD = libmines2_a-mines.$(OBJEXT) -lm
+
+mines_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./mines.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h ./version.c ./version.h
+mines_LDADD = $(GTK_LIBS) -lm
+
+net_SOURCES = ./drawing.c ./dsf.c ./findloop.c ./gtk.c ./malloc.c ./midend.c \
+                ./misc.c ./net.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./tree234.c ./tree234.h ./version.c ./version.h
+net_LDADD = $(GTK_LIBS) -lm
+
+netslide_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./netslide.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./tree234.c ./tree234.h ./version.c ./version.h
+netslide_LDADD = $(GTK_LIBS) -lm
+
+nullgame_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./nullgame.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+nullgame_LDADD = $(GTK_LIBS) -lm
+
+obfusc_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./obfusc.c ./puzzles.h \
+                ./random.c
+obfusc_LDADD = -lm
+
+palisade_SOURCES = ./divvy.c ./drawing.c ./dsf.c ./gtk.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./palisade.c ./printing.c \
+                ./ps.c ./puzzles.h ./random.c ./version.c ./version.h
+palisade_LDADD = $(GTK_LIBS) -lm
+
+pattern_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./pattern.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+pattern_LDADD = $(GTK_LIBS) -lm
+
+patternpicture_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+patternpicture_LDADD = libpattern4_a-pattern.$(OBJEXT) -lm
+
+patternsolver_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+patternsolver_LDADD = libpattern2_a-pattern.$(OBJEXT) -lm
+
+pearl_SOURCES = ./drawing.c ./dsf.c ./grid.c ./grid.h ./gtk.c ./loopgen.c \
+                ./loopgen.h ./malloc.c ./midend.c ./misc.c ./no-icon.c \
+                ./pearl.c ./penrose.c ./penrose.h ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./tdq.c ./tree234.c ./tree234.h \
+                ./version.c ./version.h
+pearl_LDADD = $(GTK_LIBS) -lm
+
+pearlbench_SOURCES = ./dsf.c ./grid.c ./grid.h ./loopgen.c ./loopgen.h \
+                ./malloc.c ./misc.c ./nullfe.c ./penrose.c ./penrose.h \
+                ./puzzles.h ./random.c ./tdq.c ./tree234.c ./tree234.h
+pearlbench_LDADD = libpearl2_a-pearl.$(OBJEXT) -lm
+
+pegs_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./pegs.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./tree234.c ./tree234.h ./version.c ./version.h
+pegs_LDADD = $(GTK_LIBS) -lm
+
+range_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./range.c ./version.c ./version.h
+range_LDADD = $(GTK_LIBS) -lm
+
+rect_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./rect.c ./version.c ./version.h
+rect_LDADD = $(GTK_LIBS) -lm
+
+samegame_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./samegame.c ./version.c ./version.h
+samegame_LDADD = $(GTK_LIBS) -lm
+
+signpost_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./malloc.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./signpost.c ./version.c ./version.h
+signpost_LDADD = $(GTK_LIBS) -lm
+
+signpostsolver_SOURCES = ./dsf.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+signpostsolver_LDADD = libsignpos2_a-signpost.$(OBJEXT) -lm
+
+singles_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./latin.c ./latin.h ./malloc.c \
+                ./maxflow.c ./maxflow.h ./midend.c ./misc.c ./no-icon.c \
+                ./printing.c ./ps.c ./puzzles.h ./random.c ./singles.c \
+                ./tree234.c ./tree234.h ./version.c ./version.h
+singles_LDADD = $(GTK_LIBS) -lm
+
+singlessolver_SOURCES = ./dsf.c ./latin.c ./latin.h ./malloc.c ./maxflow.c \
+                ./maxflow.h ./misc.c ./nullfe.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h
+singlessolver_LDADD = libsingles3_a-singles.$(OBJEXT) -lm
+
+sixteen_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./sixteen.c ./version.c ./version.h
+sixteen_LDADD = $(GTK_LIBS) -lm
+
+slant_SOURCES = ./drawing.c ./dsf.c ./findloop.c ./gtk.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./slant.c ./version.c ./version.h
+slant_LDADD = $(GTK_LIBS) -lm
+
+slantsolver_SOURCES = ./dsf.c ./findloop.c ./malloc.c ./misc.c ./nullfe.c \
+                ./puzzles.h ./random.c
+slantsolver_LDADD = libslant2_a-slant.$(OBJEXT) -lm
+
+solo_SOURCES = ./divvy.c ./drawing.c ./dsf.c ./gtk.c ./malloc.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./solo.c ./version.c ./version.h
+solo_LDADD = $(GTK_LIBS) -lm
+
+solosolver_SOURCES = ./divvy.c ./dsf.c ./malloc.c ./misc.c ./nullfe.c \
+                ./puzzles.h ./random.c
+solosolver_LDADD = libsolo2_a-solo.$(OBJEXT) -lm
+
+tents_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./malloc.c ./maxflow.c \
+                ./maxflow.h ./midend.c ./misc.c ./no-icon.c ./printing.c \
+                ./ps.c ./puzzles.h ./random.c ./tents.c ./version.c \
+                ./version.h
+tents_LDADD = $(GTK_LIBS) -lm
+
+tentssolver_SOURCES = ./dsf.c ./malloc.c ./maxflow.c ./maxflow.h ./misc.c \
+                ./nullfe.c ./puzzles.h ./random.c
+tentssolver_LDADD = libtents3_a-tents.$(OBJEXT) -lm
+
+towers_SOURCES = ./drawing.c ./gtk.c ./latin.c ./latin.h ./malloc.c \
+                ./maxflow.c ./maxflow.h ./midend.c ./misc.c ./no-icon.c \
+                ./printing.c ./ps.c ./puzzles.h ./random.c ./towers.c \
+                ./tree234.c ./tree234.h ./version.c ./version.h
+towers_LDADD = $(GTK_LIBS) -lm
+
+towerssolver_SOURCES = ./malloc.c ./maxflow.c ./maxflow.h ./misc.c \
+                ./nullfe.c ./puzzles.h ./random.c ./tree234.c ./tree234.h
+towerssolver_LDADD = liblatin6_a-latin.$(OBJEXT) \
+                libtowers2_a-towers.$(OBJEXT) -lm
+
+tracks_SOURCES = ./drawing.c ./dsf.c ./findloop.c ./gtk.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./tracks.c ./version.c ./version.h
+tracks_LDADD = $(GTK_LIBS) -lm
+
+twiddle_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./twiddle.c ./version.c ./version.h
+twiddle_LDADD = $(GTK_LIBS) -lm
+
+undead_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./undead.c ./version.c ./version.h
+undead_LDADD = $(GTK_LIBS) -lm
+
+unequal_SOURCES = ./drawing.c ./gtk.c ./latin.c ./latin.h ./malloc.c \
+                ./maxflow.c ./maxflow.h ./midend.c ./misc.c ./no-icon.c \
+                ./printing.c ./ps.c ./puzzles.h ./random.c ./tree234.c \
+                ./tree234.h ./unequal.c ./version.c ./version.h
+unequal_LDADD = $(GTK_LIBS) -lm
+
+unequalsolver_SOURCES = ./malloc.c ./maxflow.c ./maxflow.h ./misc.c \
+                ./nullfe.c ./puzzles.h ./random.c ./tree234.c ./tree234.h
+unequalsolver_LDADD = liblatin6_a-latin.$(OBJEXT) \
+                libunequal2_a-unequal.$(OBJEXT) -lm
+
+unruly_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./unruly.c ./version.c ./version.h
+unruly_LDADD = $(GTK_LIBS) -lm
+
+unrulysolver_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./puzzles.h ./random.c
+unrulysolver_LDADD = libunruly2_a-unruly.$(OBJEXT) -lm
+
+untangle_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h ./untangle.c ./version.c ./version.h
+untangle_LDADD = $(GTK_LIBS) -lm
+
+libfifteen2_a_SOURCES = ./fifteen.c ./puzzles.h
+libfifteen2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libfilling2_a_SOURCES = ./filling.c ./puzzles.h
+libfilling2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libgalaxie2_a_SOURCES = ./galaxies.c ./puzzles.h
+libgalaxie2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libgalaxie4_a_SOURCES = ./galaxies.c ./puzzles.h
+libgalaxie4_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  \
+                -DSTANDALONE_PICTURE_GENERATOR
+libkeen2_a_SOURCES = ./keen.c ./puzzles.h ./latin.h
+libkeen2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+liblatin6_a_SOURCES = ./latin.c ./puzzles.h ./tree234.h ./maxflow.h \
+                ./latin.h
+liblatin6_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+liblatin8_a_SOURCES = ./latin.c ./puzzles.h ./tree234.h ./maxflow.h \
+                ./latin.h
+liblatin8_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_LATIN_TEST
+liblightup2_a_SOURCES = ./lightup.c ./puzzles.h
+liblightup2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libloopy2_a_SOURCES = ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+libloopy2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libmagnets2_a_SOURCES = ./magnets.c ./puzzles.h
+libmagnets2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libmap2_a_SOURCES = ./map.c ./puzzles.h
+libmap2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libmines2_a_SOURCES = ./mines.c ./tree234.h ./puzzles.h
+libmines2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_OBFUSCATOR
+libpattern2_a_SOURCES = ./pattern.c ./puzzles.h
+libpattern2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libpattern4_a_SOURCES = ./pattern.c ./puzzles.h
+libpattern4_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  \
+                -DSTANDALONE_PICTURE_GENERATOR
+libpearl2_a_SOURCES = ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+libpearl2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libsignpos2_a_SOURCES = ./signpost.c ./puzzles.h
+libsignpos2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libsingles3_a_SOURCES = ./singles.c ./puzzles.h ./latin.h
+libsingles3_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libslant2_a_SOURCES = ./slant.c ./puzzles.h
+libslant2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libsolo2_a_SOURCES = ./solo.c ./puzzles.h
+libsolo2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libtents3_a_SOURCES = ./tents.c ./puzzles.h ./maxflow.h
+libtents3_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libtowers2_a_SOURCES = ./towers.c ./puzzles.h ./latin.h
+libtowers2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libunequal2_a_SOURCES = ./unequal.c ./puzzles.h ./latin.h
+libunequal2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libunruly2_a_SOURCES = ./unruly.c ./puzzles.h
+libunruly2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+noinst_LIBRARIES = libfifteen2.a libfilling2.a libgalaxie2.a libgalaxie4.a \
+                libkeen2.a liblatin6.a liblatin8.a liblightup2.a libloopy2.a \
+                libmagnets2.a libmap2.a libmines2.a libpattern2.a \
+                libpattern4.a libpearl2.a libsignpos2.a libsingles3.a \
+                libslant2.a libsolo2.a libtents3.a libtowers2.a \
+                libunequal2.a libunruly2.a
+
+GAMES += blackbox
+GAMES += bridges
+GAMES += cube
+GAMES += dominosa
+GAMES += fifteen
+GAMES += filling
+GAMES += flip
+GAMES += flood
+GAMES += galaxies
+GAMES += guess
+GAMES += inertia
+GAMES += keen
+GAMES += lightup
+GAMES += loopy
+GAMES += magnets
+GAMES += map
+GAMES += mines
+GAMES += net
+GAMES += netslide
+GAMES += palisade
+GAMES += pattern
+GAMES += pearl
+GAMES += pegs
+GAMES += range
+GAMES += rect
+GAMES += samegame
+GAMES += signpost
+GAMES += singles
+GAMES += sixteen
+GAMES += slant
+GAMES += solo
+GAMES += tents
+GAMES += towers
+GAMES += tracks
+GAMES += twiddle
+GAMES += undead
+GAMES += unequal
+GAMES += unruly
+GAMES += untangle
+bin_PROGRAMS = $(GAMES)
+test: benchmark.html benchmark.txt
+
+benchmark.html: benchmark.txt benchmark.pl
+        ./benchmark.pl benchmark.txt > $@
+
+benchmark.txt: benchmark.sh $(GAMES)
+        ./benchmark.sh > $@
diff --git a/apps/plugins/puzzles/src/Makefile.cyg b/apps/plugins/puzzles/src/Makefile.cyg
new file mode 100644
index 0000000000..4dcfd8ae2d
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.cyg
@@ -0,0 +1,718 @@
+# Makefile for puzzles under cygwin.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+
+# You can define this path to point at your tools if you need to
+# TOOLPATH = c:\cygwin\bin\ # or similar, if you're running Windows
+# TOOLPATH = /pkg/mingw32msvc/i386-mingw32msvc/bin/
+CC = $(TOOLPATH)gcc
+RC = $(TOOLPATH)windres
+# Uncomment the following two lines to compile under Winelib
+# CC = winegcc
+# RC = wrc
+# You may also need to tell windres where to find include files:
+# RCINC = --include-dir c:\cygwin\include\
+
+CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT \
+                -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP -I./ -Iicons/
+LDFLAGS = -mno-cygwin -s
+RCFLAGS = $(RCINC) --define WIN32=1 --define _WIN32=1 --define WINVER=0x0400 \
+                --define MINGW32_FIX=1 --include ./ --include icons/
+
+all: blackbox.exe bridges.exe cube.exe dominosa.exe fifteen.exe \
+                fifteensolver.exe filling.exe fillingsolver.exe flip.exe \
+                flood.exe galaxies.exe galaxiespicture.exe \
+                galaxiessolver.exe guess.exe inertia.exe keen.exe \
+                keensolver.exe latincheck.exe lightup.exe lightupsolver.exe \
+                loopy.exe loopysolver.exe magnets.exe magnetssolver.exe \
+                map.exe mapsolver.exe mineobfusc.exe mines.exe netgame.exe \
+                netslide.exe nullgame.exe palisade.exe pattern.exe \
+                patternpicture.exe patternsolver.exe pearl.exe \
+                pearlbench.exe pegs.exe puzzles.exe range.exe rect.exe \
+                samegame.exe signpost.exe signpostsolver.exe singles.exe \
+                singlessolver.exe sixteen.exe slant.exe slantsolver.exe \
+                solo.exe solosolver.exe tents.exe tentssolver.exe towers.exe \
+                towerssolver.exe tracks.exe twiddle.exe undead.exe \
+                unequal.exe unequalsolver.exe unruly.exe unrulysolver.exe \
+                untangle.exe
+
+blackbox.exe: blackbox.o drawing.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,blackbox.map blackbox.o \
+                drawing.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+bridges.exe: bridges.o drawing.o dsf.o findloop.o malloc.o midend.o misc.o \
+                noicon.res.o printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,bridges.map bridges.o \
+                drawing.o dsf.o findloop.o malloc.o midend.o misc.o \
+                noicon.res.o printing.o random.o version.o windows.o \
+                -lcomctl32 -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+cube.exe: cube.o drawing.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,cube.map cube.o drawing.o \
+                malloc.o midend.o misc.o noicon.res.o printing.o random.o \
+                version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 -luser32 \
+                -lwinspool
+
+dominosa.exe: dominosa.o drawing.o laydomino.o malloc.o midend.o misc.o \
+                noicon.res.o printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,dominosa.map dominosa.o \
+                drawing.o laydomino.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o -lcomctl32 \
+                -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+fifteen.exe: drawing.o fifteen.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,fifteen.map drawing.o \
+                fifteen.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+fifteensolver.exe: fifteen2.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,fifteensolver.map fifteen2.o \
+                malloc.o misc.o nullfe.o random.o 
+
+filling.exe: drawing.o dsf.o filling.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,filling.map drawing.o \
+                dsf.o filling.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o -lcomctl32 \
+                -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+fillingsolver.exe: dsf.o filling2.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,fillingsolver.map dsf.o filling2.o \
+                malloc.o misc.o nullfe.o random.o 
+
+flip.exe: drawing.o flip.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o tree234.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,flip.map drawing.o flip.o \
+                malloc.o midend.o misc.o noicon.res.o printing.o random.o \
+                tree234.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+flood.exe: drawing.o flood.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,flood.map drawing.o \
+                flood.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+galaxies.exe: drawing.o dsf.o galaxies.o malloc.o midend.o misc.o \
+                noicon.res.o printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,galaxies.map drawing.o \
+                dsf.o galaxies.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o -lcomctl32 \
+                -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+galaxiespicture.exe: dsf.o galaxie4.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,galaxiespicture.map dsf.o galaxie4.o \
+                malloc.o misc.o nullfe.o random.o 
+
+galaxiessolver.exe: dsf.o galaxie2.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,galaxiessolver.map dsf.o galaxie2.o \
+                malloc.o misc.o nullfe.o random.o 
+
+guess.exe: drawing.o guess.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,guess.map drawing.o \
+                guess.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+inertia.exe: drawing.o inertia.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,inertia.map drawing.o \
+                inertia.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+keen.exe: drawing.o dsf.o keen.o latin.o malloc.o maxflow.o midend.o misc.o \
+                noicon.res.o printing.o random.o tree234.o version.o \
+                windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,keen.map drawing.o dsf.o \
+                keen.o latin.o malloc.o maxflow.o midend.o misc.o \
+                noicon.res.o printing.o random.o tree234.o version.o \
+                windows.o -lcomctl32 -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+keensolver.exe: dsf.o keen2.o latin6.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o tree234.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,keensolver.map dsf.o keen2.o \
+                latin6.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tree234.o 
+
+latincheck.exe: latin8.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tree234.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,latincheck.map latin8.o malloc.o \
+                maxflow.o misc.o nullfe.o random.o tree234.o 
+
+lightup.exe: combi.o drawing.o lightup.o malloc.o midend.o misc.o \
+                noicon.res.o printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,lightup.map combi.o \
+                drawing.o lightup.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o -lcomctl32 \
+                -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+lightupsolver.exe: combi.o lightup2.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,lightupsolver.map combi.o lightup2.o \
+                malloc.o misc.o nullfe.o random.o 
+
+loopy.exe: drawing.o dsf.o grid.o loopgen.o loopy.o malloc.o midend.o misc.o \
+                noicon.res.o penrose.o printing.o random.o tree234.o \
+                version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,loopy.map drawing.o dsf.o \
+                grid.o loopgen.o loopy.o malloc.o midend.o misc.o \
+                noicon.res.o penrose.o printing.o random.o tree234.o \
+                version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 -luser32 \
+                -lwinspool
+
+loopysolver.exe: dsf.o grid.o loopgen.o loopy2.o malloc.o misc.o nullfe.o \
+                penrose.o random.o tree234.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,loopysolver.map dsf.o grid.o \
+                loopgen.o loopy2.o malloc.o misc.o nullfe.o penrose.o \
+                random.o tree234.o 
+
+magnets.exe: drawing.o laydomino.o magnets.o malloc.o midend.o misc.o \
+                noicon.res.o printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,magnets.map drawing.o \
+                laydomino.o magnets.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o -lcomctl32 \
+                -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+magnetssolver.exe: laydomino.o magnets2.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,magnetssolver.map laydomino.o \
+                magnets2.o malloc.o misc.o nullfe.o random.o 
+
+map.exe: drawing.o dsf.o malloc.o map.o midend.o misc.o noicon.res.o \
+                printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,map.map drawing.o dsf.o \
+                malloc.o map.o midend.o misc.o noicon.res.o printing.o \
+                random.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+mapsolver.exe: dsf.o malloc.o map2.o misc.o nullfe.o random.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,mapsolver.map dsf.o malloc.o map2.o \
+                misc.o nullfe.o random.o 
+
+mineobfusc.exe: malloc.o mines2.o misc.o nullfe.o random.o tree234.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,mineobfusc.map malloc.o mines2.o \
+                misc.o nullfe.o random.o tree234.o 
+
+mines.exe: drawing.o malloc.o midend.o mines.o misc.o noicon.res.o \
+                printing.o random.o tree234.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,mines.map drawing.o \
+                malloc.o midend.o mines.o misc.o noicon.res.o printing.o \
+                random.o tree234.o version.o windows.o -lcomctl32 -lcomdlg32 \
+                -lgdi32 -luser32 -lwinspool
+
+netgame.exe: drawing.o dsf.o findloop.o malloc.o midend.o misc.o net.o \
+                noicon.res.o printing.o random.o tree234.o version.o \
+                windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,netgame.map drawing.o \
+                dsf.o findloop.o malloc.o midend.o misc.o net.o noicon.res.o \
+                printing.o random.o tree234.o version.o windows.o -lcomctl32 \
+                -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+netslide.exe: drawing.o malloc.o midend.o misc.o netslide.o noicon.res.o \
+                printing.o random.o tree234.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,netslide.map drawing.o \
+                malloc.o midend.o misc.o netslide.o noicon.res.o printing.o \
+                random.o tree234.o version.o windows.o -lcomctl32 -lcomdlg32 \
+                -lgdi32 -luser32 -lwinspool
+
+nullgame.exe: drawing.o malloc.o midend.o misc.o noicon.res.o nullgame.o \
+                printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,nullgame.map drawing.o \
+                malloc.o midend.o misc.o noicon.res.o nullgame.o printing.o \
+                random.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+palisade.exe: divvy.o drawing.o dsf.o malloc.o midend.o misc.o noicon.res.o \
+                palisade.o printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,palisade.map divvy.o \
+                drawing.o dsf.o malloc.o midend.o misc.o noicon.res.o \
+                palisade.o printing.o random.o version.o windows.o \
+                -lcomctl32 -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+pattern.exe: drawing.o malloc.o midend.o misc.o noicon.res.o pattern.o \
+                printing.o random.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,pattern.map drawing.o \
+                malloc.o midend.o misc.o noicon.res.o pattern.o printing.o \
+                random.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+patternpicture.exe: malloc.o misc.o nullfe.o pattern4.o random.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,patternpicture.map malloc.o misc.o \
+                nullfe.o pattern4.o random.o 
+
+patternsolver.exe: malloc.o misc.o nullfe.o pattern2.o random.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,patternsolver.map malloc.o misc.o \
+                nullfe.o pattern2.o random.o 
+
+pearl.exe: drawing.o dsf.o grid.o loopgen.o malloc.o midend.o misc.o pearl.o \
+                penrose.o printing.o random.o tdq.o tree234.o version.o \
+                windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,pearl.map drawing.o dsf.o \
+                grid.o loopgen.o malloc.o midend.o misc.o pearl.o penrose.o \
+                printing.o random.o tdq.o tree234.o version.o windows.o \
+                -lcomctl32 -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+pearlbench.exe: dsf.o grid.o loopgen.o malloc.o misc.o nullfe.o pearl2.o \
+                penrose.o random.o tdq.o tree234.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,pearlbench.map dsf.o grid.o \
+                loopgen.o malloc.o misc.o nullfe.o pearl2.o penrose.o \
+                random.o tdq.o tree234.o 
+
+pegs.exe: drawing.o malloc.o midend.o misc.o noicon.res.o pegs.o printing.o \
+                random.o tree234.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,pegs.map drawing.o \
+                malloc.o midend.o misc.o noicon.res.o pegs.o printing.o \
+                random.o tree234.o version.o windows.o -lcomctl32 -lcomdlg32 \
+                -lgdi32 -luser32 -lwinspool
+
+puzzles.exe: blackbo3.o bridges3.o combi.o cube3.o divvy.o dominos3.o \
+                drawing.o dsf.o fifteen5.o filling5.o findloop.o flip3.o \
+                flood3.o galaxie7.o grid.o guess3.o inertia3.o keen5.o \
+                latin.o laydomino.o lightup5.o list.o loopgen.o loopy5.o \
+                magnets5.o malloc.o map5.o maxflow.o midend.o mines5.o \
+                misc.o net3.o netslid3.o noicon.res.o palisad3.o pattern7.o \
+                pearl5.o pegs3.o penrose.o printing.o random.o range3.o \
+                rect3.o samegam3.o signpos5.o singles5.o sixteen3.o slant5.o \
+                solo5.o tdq.o tents5.o towers5.o tracks3.o tree234.o \
+                twiddle3.o undead3.o unequal5.o unruly5.o untangl3.o \
+                version.o windows1.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,puzzles.map blackbo3.o \
+                bridges3.o combi.o cube3.o divvy.o dominos3.o drawing.o \
+                dsf.o fifteen5.o filling5.o findloop.o flip3.o flood3.o \
+                galaxie7.o grid.o guess3.o inertia3.o keen5.o latin.o \
+                laydomino.o lightup5.o list.o loopgen.o loopy5.o magnets5.o \
+                malloc.o map5.o maxflow.o midend.o mines5.o misc.o net3.o \
+                netslid3.o noicon.res.o palisad3.o pattern7.o pearl5.o \
+                pegs3.o penrose.o printing.o random.o range3.o rect3.o \
+                samegam3.o signpos5.o singles5.o sixteen3.o slant5.o solo5.o \
+                tdq.o tents5.o towers5.o tracks3.o tree234.o twiddle3.o \
+                undead3.o unequal5.o unruly5.o untangl3.o version.o \
+                windows1.o -lcomctl32 -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+range.exe: drawing.o dsf.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o range.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,range.map drawing.o dsf.o \
+                malloc.o midend.o misc.o noicon.res.o printing.o random.o \
+                range.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+rect.exe: drawing.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o rect.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,rect.map drawing.o \
+                malloc.o midend.o misc.o noicon.res.o printing.o random.o \
+                rect.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+samegame.exe: drawing.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o samegame.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,samegame.map drawing.o \
+                malloc.o midend.o misc.o noicon.res.o printing.o random.o \
+                samegame.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+signpost.exe: drawing.o dsf.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o signpost.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,signpost.map drawing.o \
+                dsf.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o signpost.o version.o windows.o -lcomctl32 \
+                -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+signpostsolver.exe: dsf.o malloc.o misc.o nullfe.o random.o signpos2.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,signpostsolver.map dsf.o malloc.o \
+                misc.o nullfe.o random.o signpos2.o 
+
+singles.exe: drawing.o dsf.o latin.o malloc.o maxflow.o midend.o misc.o \
+                noicon.res.o printing.o random.o singles.o tree234.o \
+                version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,singles.map drawing.o \
+                dsf.o latin.o malloc.o maxflow.o midend.o misc.o \
+                noicon.res.o printing.o random.o singles.o tree234.o \
+                version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 -luser32 \
+                -lwinspool
+
+singlessolver.exe: dsf.o latin.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                singles3.o tree234.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,singlessolver.map dsf.o latin.o \
+                malloc.o maxflow.o misc.o nullfe.o random.o singles3.o \
+                tree234.o 
+
+sixteen.exe: drawing.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o sixteen.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,sixteen.map drawing.o \
+                malloc.o midend.o misc.o noicon.res.o printing.o random.o \
+                sixteen.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+slant.exe: drawing.o dsf.o findloop.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o slant.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,slant.map drawing.o dsf.o \
+                findloop.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o slant.o version.o windows.o -lcomctl32 -lcomdlg32 \
+                -lgdi32 -luser32 -lwinspool
+
+slantsolver.exe: dsf.o findloop.o malloc.o misc.o nullfe.o random.o slant2.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,slantsolver.map dsf.o findloop.o \
+                malloc.o misc.o nullfe.o random.o slant2.o 
+
+solo.exe: divvy.o drawing.o dsf.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o solo.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,solo.map divvy.o drawing.o \
+                dsf.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o solo.o version.o windows.o -lcomctl32 -lcomdlg32 \
+                -lgdi32 -luser32 -lwinspool
+
+solosolver.exe: divvy.o dsf.o malloc.o misc.o nullfe.o random.o solo2.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,solosolver.map divvy.o dsf.o \
+                malloc.o misc.o nullfe.o random.o solo2.o 
+
+tents.exe: drawing.o dsf.o malloc.o maxflow.o midend.o misc.o noicon.res.o \
+                printing.o random.o tents.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,tents.map drawing.o dsf.o \
+                malloc.o maxflow.o midend.o misc.o noicon.res.o printing.o \
+                random.o tents.o version.o windows.o -lcomctl32 -lcomdlg32 \
+                -lgdi32 -luser32 -lwinspool
+
+tentssolver.exe: dsf.o malloc.o maxflow.o misc.o nullfe.o random.o tents3.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,tentssolver.map dsf.o malloc.o \
+                maxflow.o misc.o nullfe.o random.o tents3.o 
+
+towers.exe: drawing.o latin.o malloc.o maxflow.o midend.o misc.o \
+                noicon.res.o printing.o random.o towers.o tree234.o \
+                version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,towers.map drawing.o \
+                latin.o malloc.o maxflow.o midend.o misc.o noicon.res.o \
+                printing.o random.o towers.o tree234.o version.o windows.o \
+                -lcomctl32 -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+towerssolver.exe: latin6.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                towers2.o tree234.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,towerssolver.map latin6.o malloc.o \
+                maxflow.o misc.o nullfe.o random.o towers2.o tree234.o 
+
+tracks.exe: drawing.o dsf.o findloop.o malloc.o midend.o misc.o noicon.res.o \
+                printing.o random.o tracks.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,tracks.map drawing.o dsf.o \
+                findloop.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o tracks.o version.o windows.o -lcomctl32 -lcomdlg32 \
+                -lgdi32 -luser32 -lwinspool
+
+twiddle.exe: drawing.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o twiddle.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,twiddle.map drawing.o \
+                malloc.o midend.o misc.o noicon.res.o printing.o random.o \
+                twiddle.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+undead.exe: drawing.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o undead.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,undead.map drawing.o \
+                malloc.o midend.o misc.o noicon.res.o printing.o random.o \
+                undead.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+unequal.exe: drawing.o latin.o malloc.o maxflow.o midend.o misc.o \
+                noicon.res.o printing.o random.o tree234.o unequal.o \
+                version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,unequal.map drawing.o \
+                latin.o malloc.o maxflow.o midend.o misc.o noicon.res.o \
+                printing.o random.o tree234.o unequal.o version.o windows.o \
+                -lcomctl32 -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+unequalsolver.exe: latin6.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tree234.o unequal2.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,unequalsolver.map latin6.o malloc.o \
+                maxflow.o misc.o nullfe.o random.o tree234.o unequal2.o 
+
+unruly.exe: drawing.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o unruly.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,unruly.map drawing.o \
+                malloc.o midend.o misc.o noicon.res.o printing.o random.o \
+                unruly.o version.o windows.o -lcomctl32 -lcomdlg32 -lgdi32 \
+                -luser32 -lwinspool
+
+unrulysolver.exe: malloc.o misc.o nullfe.o random.o unruly2.o
+        $(CC) $(LDFLAGS) -o $@ -Wl,-Map,unrulysolver.map malloc.o misc.o \
+                nullfe.o random.o unruly2.o 
+
+untangle.exe: drawing.o malloc.o midend.o misc.o noicon.res.o printing.o \
+                random.o tree234.o untangle.o version.o windows.o
+        $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,untangle.map drawing.o \
+                malloc.o midend.o misc.o noicon.res.o printing.o random.o \
+                tree234.o untangle.o version.o windows.o -lcomctl32 \
+                -lcomdlg32 -lgdi32 -luser32 -lwinspool
+
+blackbox.o: ./blackbox.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+blackbo3.o: ./blackbox.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+bridges.o: ./bridges.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+bridges3.o: ./bridges.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+combi.o: ./combi.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube.o: ./cube.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube3.o: ./cube.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+divvy.o: ./divvy.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominosa.o: ./dominosa.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominos3.o: ./dominosa.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+drawing.o: ./drawing.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dsf.o: ./dsf.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen5.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+fifteen2.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+filling.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+filling5.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+filling2.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+findloop.o: ./findloop.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip3.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+flood.o: ./flood.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flood3.o: ./flood.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxies.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+galaxie7.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxie4.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+galaxie2.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+grid.o: ./grid.c ./puzzles.h ./tree234.h ./grid.h ./penrose.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+gtk.o: ./gtk.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess.o: ./guess.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess3.o: ./guess.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+inertia.o: ./inertia.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+inertia3.o: ./inertia.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+keen5.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen2.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+latin.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+latin8.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_LATIN_TEST -c $< -o $@
+latin6.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+laydomino.o: ./laydomino.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup5.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+lightup2.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+list.o: ./list.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopgen.o: ./loopgen.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy5.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+loopy2.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+magnets.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+magnets5.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+magnets2.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+malloc.o: ./malloc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map5.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+map2.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+maxflow.o: ./maxflow.c ./maxflow.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+midend.o: ./midend.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines5.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+mines2.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_OBFUSCATOR -c $< -o $@
+misc.o: ./misc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net3.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+netslide.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+netslid3.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+no-icon.o: ./no-icon.c
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+noicon.res.o: ./noicon.rc ./puzzles.rc2 ./resource.h
+        $(RC) $(FWHACK) $(RCFL) $(RCFLAGS) $< $@
+nullfe.o: ./nullfe.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullgame.o: ./nullgame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+obfusc.o: ./obfusc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+osx.o: ./osx.m ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisade.o: ./palisade.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisad3.o: ./palisade.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pattern7.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern4.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+pattern2.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pearl.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pearl5.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pearl2.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pegs.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pegs3.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+penrose.o: ./penrose.c ./puzzles.h ./penrose.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+printing.o: ./printing.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+ps.o: ./ps.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+random.o: ./random.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range.o: ./range.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range3.o: ./range.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+rect.o: ./rect.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+rect3.o: ./rect.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+samegame.o: ./samegame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+samegam3.o: ./samegame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpost.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+signpos5.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpos2.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+singles.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+singles5.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+singles3.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+sixteen.o: ./sixteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+sixteen3.o: ./sixteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+slant5.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant2.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+solo.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+solo5.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+solo2.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tdq.o: ./tdq.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents5.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tents3.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+towers.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+towers5.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+towers2.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tracks.o: ./tracks.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tracks3.o: ./tracks.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tree234.o: ./tree234.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle.o: ./twiddle.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle3.o: ./twiddle.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+undead.o: ./undead.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+undead3.o: ./undead.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unequal5.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal2.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+unruly.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unruly5.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unruly2.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+untangle.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+untangl3.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+version.o: ./version.c ./version.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows1.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+
+
+clean:
+        rm -f *.o *.exe *.res.o *.map
+
diff --git a/apps/plugins/puzzles/src/Makefile.doc b/apps/plugins/puzzles/src/Makefile.doc
new file mode 100644
index 0000000000..c7d6946cf1
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.doc
@@ -0,0 +1,17 @@
+all: puzzles.hlp puzzles.txt HACKING
+
+preprocessed.but: puzzles.but
+        sed 's/PREFIX-/$(BINPREFIX)/g' puzzles.but > preprocessed.but
+
+puzzles.hlp puzzles.txt: preprocessed.but
+        halibut --winhelp=puzzles.hlp --text=puzzles.txt preprocessed.but
+
+HACKING: devel.but
+        halibut --text=HACKING devel.but
+
+chm: puzzles.hhp
+puzzles.hhp: puzzles.but chm.but
+        halibut --html puzzles.but chm.but
+
+clean:
+        rm -f puzzles.hlp puzzles.txt preprocessed.but HACKING *.html *.hh[pck]
diff --git a/apps/plugins/puzzles/src/Makefile.emcc b/apps/plugins/puzzles/src/Makefile.emcc
new file mode 100644
index 0000000000..9677b2a1cf
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.emcc
@@ -0,0 +1,497 @@
+# Makefile for puzzles using Emscripten. Requires GNU make.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+
+# This can be set on the command line to point at the emcc command,
+# if it is not on your PATH.
+EMCC = emcc
+
+CFLAGS = -DSLOW_SYSTEM -I./ -Iicons/
+
+all: $(OUTPREFIX)blackbox.js $(OUTPREFIX)bridges.js $(OUTPREFIX)cube.js \
+                $(OUTPREFIX)dominosa.js $(OUTPREFIX)fifteen.js \
+                $(OUTPREFIX)filling.js $(OUTPREFIX)flip.js \
+                $(OUTPREFIX)flood.js $(OUTPREFIX)galaxies.js \
+                $(OUTPREFIX)guess.js $(OUTPREFIX)inertia.js \
+                $(OUTPREFIX)keen.js $(OUTPREFIX)lightup.js \
+                $(OUTPREFIX)loopy.js $(OUTPREFIX)magnets.js \
+                $(OUTPREFIX)map.js $(OUTPREFIX)mines.js $(OUTPREFIX)net.js \
+                $(OUTPREFIX)netslide.js $(OUTPREFIX)nullgame.js \
+                $(OUTPREFIX)palisade.js $(OUTPREFIX)pattern.js \
+                $(OUTPREFIX)pearl.js $(OUTPREFIX)pegs.js \
+                $(OUTPREFIX)range.js $(OUTPREFIX)rect.js \
+                $(OUTPREFIX)samegame.js $(OUTPREFIX)signpost.js \
+                $(OUTPREFIX)singles.js $(OUTPREFIX)sixteen.js \
+                $(OUTPREFIX)slant.js $(OUTPREFIX)solo.js \
+                $(OUTPREFIX)tents.js $(OUTPREFIX)towers.js \
+                $(OUTPREFIX)tracks.js $(OUTPREFIX)twiddle.js \
+                $(OUTPREFIX)undead.js $(OUTPREFIX)unequal.js \
+                $(OUTPREFIX)unruly.js $(OUTPREFIX)untangle.js
+
+$(OUTPREFIX)blackbox.js: blackbox.o drawing.o emcc.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)blackbox.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" blackbox.o drawing.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)bridges.js: bridges.o drawing.o dsf.o findloop.o emcc.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)bridges.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" bridges.o drawing.o dsf.o findloop.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)cube.js: cube.o drawing.o emcc.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)cube.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" cube.o drawing.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)dominosa.js: dominosa.o drawing.o emcc.o laydomino.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)dominosa.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" dominosa.o drawing.o emcc.o laydomino.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)fifteen.js: drawing.o fifteen.o emcc.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)fifteen.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o fifteen.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)filling.js: drawing.o dsf.o filling.o emcc.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)filling.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o filling.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)flip.js: drawing.o flip.o emcc.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)flip.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o flip.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o tree234.o version.o
+
+$(OUTPREFIX)flood.js: drawing.o flood.o emcc.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)flood.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o flood.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)galaxies.js: drawing.o dsf.o galaxies.o emcc.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)galaxies.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o galaxies.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)guess.js: drawing.o emcc.o guess.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)guess.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o guess.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)inertia.js: drawing.o emcc.o inertia.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)inertia.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o inertia.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)keen.js: drawing.o dsf.o emcc.o keen.o latin.o malloc.o \
+                maxflow.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                tree234.o version.o emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)keen.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o emcc.o keen.o latin.o malloc.o maxflow.o midend.o misc.o no-icon.o printing.o ps.o random.o tree234.o version.o
+
+$(OUTPREFIX)lightup.js: combi.o drawing.o emcc.o lightup.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)lightup.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" combi.o drawing.o emcc.o lightup.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)loopy.js: drawing.o dsf.o grid.o emcc.o loopgen.o loopy.o \
+                malloc.o midend.o misc.o no-icon.o penrose.o printing.o ps.o \
+                random.o tree234.o version.o emccpre.js emcclib.js \
+                emccx.json
+        $(EMCC) -o $(OUTPREFIX)loopy.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o grid.o emcc.o loopgen.o loopy.o malloc.o midend.o misc.o no-icon.o penrose.o printing.o ps.o random.o tree234.o version.o
+
+$(OUTPREFIX)magnets.js: drawing.o emcc.o laydomino.o magnets.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)magnets.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o laydomino.o magnets.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)map.js: drawing.o dsf.o emcc.o malloc.o map.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)map.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o emcc.o malloc.o map.o midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)mines.js: drawing.o emcc.o malloc.o midend.o mines.o misc.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)mines.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o mines.o misc.o no-icon.o printing.o ps.o random.o tree234.o version.o
+
+$(OUTPREFIX)net.js: drawing.o dsf.o findloop.o emcc.o malloc.o midend.o \
+                misc.o net.o no-icon.o printing.o ps.o random.o tree234.o \
+                version.o emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)net.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o findloop.o emcc.o malloc.o midend.o misc.o net.o no-icon.o printing.o ps.o random.o tree234.o version.o
+
+$(OUTPREFIX)netslide.js: drawing.o emcc.o malloc.o midend.o misc.o \
+                netslide.o no-icon.o printing.o ps.o random.o tree234.o \
+                version.o emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)netslide.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o misc.o netslide.o no-icon.o printing.o ps.o random.o tree234.o version.o
+
+$(OUTPREFIX)nullgame.js: drawing.o emcc.o malloc.o midend.o misc.o no-icon.o \
+                nullgame.o printing.o ps.o random.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)nullgame.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o misc.o no-icon.o nullgame.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)palisade.js: divvy.o drawing.o dsf.o emcc.o malloc.o midend.o \
+                misc.o no-icon.o palisade.o printing.o ps.o random.o \
+                version.o emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)palisade.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" divvy.o drawing.o dsf.o emcc.o malloc.o midend.o misc.o no-icon.o palisade.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)pattern.js: drawing.o emcc.o malloc.o midend.o misc.o no-icon.o \
+                pattern.o printing.o ps.o random.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)pattern.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o misc.o no-icon.o pattern.o printing.o ps.o random.o version.o
+
+$(OUTPREFIX)pearl.js: drawing.o dsf.o grid.o emcc.o loopgen.o malloc.o \
+                midend.o misc.o no-icon.o pearl.o penrose.o printing.o ps.o \
+                random.o tdq.o tree234.o version.o emccpre.js emcclib.js \
+                emccx.json
+        $(EMCC) -o $(OUTPREFIX)pearl.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o grid.o emcc.o loopgen.o malloc.o midend.o misc.o no-icon.o pearl.o penrose.o printing.o ps.o random.o tdq.o tree234.o version.o
+
+$(OUTPREFIX)pegs.js: drawing.o emcc.o malloc.o midend.o misc.o no-icon.o \
+                pegs.o printing.o ps.o random.o tree234.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)pegs.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o misc.o no-icon.o pegs.o printing.o ps.o random.o tree234.o version.o
+
+$(OUTPREFIX)range.js: drawing.o dsf.o emcc.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o range.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)range.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o range.o version.o
+
+$(OUTPREFIX)rect.js: drawing.o emcc.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o rect.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)rect.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o rect.o version.o
+
+$(OUTPREFIX)samegame.js: drawing.o emcc.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o samegame.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)samegame.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o samegame.o version.o
+
+$(OUTPREFIX)signpost.js: drawing.o dsf.o emcc.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o signpost.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)signpost.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o signpost.o version.o
+
+$(OUTPREFIX)singles.js: drawing.o dsf.o emcc.o latin.o malloc.o maxflow.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o singles.o \
+                tree234.o version.o emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)singles.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o emcc.o latin.o malloc.o maxflow.o midend.o misc.o no-icon.o printing.o ps.o random.o singles.o tree234.o version.o
+
+$(OUTPREFIX)sixteen.js: drawing.o emcc.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o sixteen.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)sixteen.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o sixteen.o version.o
+
+$(OUTPREFIX)slant.js: drawing.o dsf.o findloop.o emcc.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o slant.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)slant.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o findloop.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o slant.o version.o
+
+$(OUTPREFIX)solo.js: divvy.o drawing.o dsf.o emcc.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o solo.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)solo.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" divvy.o drawing.o dsf.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o solo.o version.o
+
+$(OUTPREFIX)tents.js: drawing.o dsf.o emcc.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tents.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)tents.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o emcc.o malloc.o maxflow.o midend.o misc.o no-icon.o printing.o ps.o random.o tents.o version.o
+
+$(OUTPREFIX)towers.js: drawing.o emcc.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o towers.o tree234.o \
+                version.o emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)towers.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o latin.o malloc.o maxflow.o midend.o misc.o no-icon.o printing.o ps.o random.o towers.o tree234.o version.o
+
+$(OUTPREFIX)tracks.js: drawing.o dsf.o findloop.o emcc.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tracks.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)tracks.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o dsf.o findloop.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o tracks.o version.o
+
+$(OUTPREFIX)twiddle.js: drawing.o emcc.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o twiddle.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)twiddle.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o twiddle.o version.o
+
+$(OUTPREFIX)undead.js: drawing.o emcc.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o undead.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)undead.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o undead.o version.o
+
+$(OUTPREFIX)unequal.js: drawing.o emcc.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                unequal.o version.o emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)unequal.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o latin.o malloc.o maxflow.o midend.o misc.o no-icon.o printing.o ps.o random.o tree234.o unequal.o version.o
+
+$(OUTPREFIX)unruly.js: drawing.o emcc.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o unruly.o version.o emccpre.js \
+                emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)unruly.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o unruly.o version.o
+
+$(OUTPREFIX)untangle.js: drawing.o emcc.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o tree234.o untangle.o version.o \
+                emccpre.js emcclib.js emccx.json
+        $(EMCC) -o $(OUTPREFIX)untangle.js -O2 -s ASM_JS=1 --pre-js emccpre.js --js-library emcclib.js -s EXPORTED_FUNCTIONS="`sed 's://.*::' emccx.json | tr -d ' \n'`" drawing.o emcc.o malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o tree234.o untangle.o version.o
+
+blackbox.o: ./blackbox.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+blackbo3.o: ./blackbox.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+bridges.o: ./bridges.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+bridges3.o: ./bridges.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+combi.o: ./combi.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube.o: ./cube.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube3.o: ./cube.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+divvy.o: ./divvy.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominosa.o: ./dominosa.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominos3.o: ./dominosa.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+drawing.o: ./drawing.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dsf.o: ./dsf.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen.o: ./fifteen.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen5.o: ./fifteen.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+fifteen2.o: ./fifteen.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+filling.o: ./filling.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+filling5.o: ./filling.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+filling2.o: ./filling.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+findloop.o: ./findloop.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip.o: ./flip.c ./puzzles.h ./tree234.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip3.o: ./flip.c ./puzzles.h ./tree234.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+flood.o: ./flood.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flood3.o: ./flood.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxies.o: ./galaxies.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+galaxie7.o: ./galaxies.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxie4.o: ./galaxies.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+galaxie2.o: ./galaxies.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+grid.o: ./grid.c ./puzzles.h ./tree234.h ./grid.h ./penrose.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+emcc.o: ./emcc.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess.o: ./guess.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess3.o: ./guess.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+inertia.o: ./inertia.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+inertia3.o: ./inertia.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen.o: ./keen.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+keen5.o: ./keen.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen2.o: ./keen.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+latin.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+latin8.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_LATIN_TEST -c $< -o $@
+latin6.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+laydomino.o: ./laydomino.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup.o: ./lightup.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup5.o: ./lightup.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+lightup2.o: ./lightup.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+list.o: ./list.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopgen.o: ./loopgen.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy5.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+loopy2.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+magnets.o: ./magnets.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+magnets5.o: ./magnets.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+magnets2.o: ./magnets.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+malloc.o: ./malloc.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map.o: ./map.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map5.o: ./map.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+map2.o: ./map.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+maxflow.o: ./maxflow.c ./maxflow.h ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+midend.o: ./midend.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines.o: ./mines.c ./tree234.h ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines5.o: ./mines.c ./tree234.h ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+mines2.o: ./mines.c ./tree234.h ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_OBFUSCATOR -c $< -o $@
+misc.o: ./misc.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net.o: ./net.c ./puzzles.h ./tree234.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net3.o: ./net.c ./puzzles.h ./tree234.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+netslide.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+netslid3.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+no-icon.o: ./no-icon.c
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullfe.o: ./nullfe.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullgame.o: ./nullgame.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+obfusc.o: ./obfusc.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+osx.o: ./osx.m ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisade.o: ./palisade.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisad3.o: ./palisade.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern.o: ./pattern.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pattern7.o: ./pattern.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern4.o: ./pattern.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+pattern2.o: ./pattern.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pearl.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pearl5.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pearl2.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pegs.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pegs3.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+penrose.o: ./penrose.c ./puzzles.h ./penrose.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+printing.o: ./printing.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+ps.o: ./ps.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+random.o: ./random.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range.o: ./range.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range3.o: ./range.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+rect.o: ./rect.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+rect3.o: ./rect.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+samegame.o: ./samegame.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+samegam3.o: ./samegame.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpost.o: ./signpost.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+signpos5.o: ./signpost.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpos2.o: ./signpost.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+singles.o: ./singles.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+singles5.o: ./singles.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+singles3.o: ./singles.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+sixteen.o: ./sixteen.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+sixteen3.o: ./sixteen.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant.o: ./slant.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+slant5.o: ./slant.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant2.o: ./slant.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+solo.o: ./solo.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+solo5.o: ./solo.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+solo2.o: ./solo.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tdq.o: ./tdq.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents5.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tents3.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+towers.o: ./towers.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+towers5.o: ./towers.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+towers2.o: ./towers.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tracks.o: ./tracks.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tracks3.o: ./tracks.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tree234.o: ./tree234.c ./tree234.h ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle.o: ./twiddle.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle3.o: ./twiddle.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+undead.o: ./undead.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+undead3.o: ./undead.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal.o: ./unequal.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unequal5.o: ./unequal.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal2.o: ./unequal.c ./puzzles.h ./latin.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+unruly.o: ./unruly.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unruly5.o: ./unruly.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unruly2.o: ./unruly.c ./puzzles.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+untangle.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+untangl3.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+version.o: ./version.c ./version.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows.o: ./windows.c ./puzzles.h ./resource.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows1.o: ./windows.c ./puzzles.h ./resource.h
+        $(EMCC) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+
+
+clean:
+        rm -rf *.o  $(OUTPREFIX)blackbox.js $(OUTPREFIX)bridges.js $(OUTPREFIX)cube.js $(OUTPREFIX)dominosa.js $(OUTPREFIX)fifteen.js $(OUTPREFIX)filling.js $(OUTPREFIX)flip.js $(OUTPREFIX)flood.js $(OUTPREFIX)galaxies.js $(OUTPREFIX)guess.js $(OUTPREFIX)inertia.js $(OUTPREFIX)keen.js $(OUTPREFIX)lightup.js $(OUTPREFIX)loopy.js $(OUTPREFIX)magnets.js $(OUTPREFIX)map.js $(OUTPREFIX)mines.js $(OUTPREFIX)net.js $(OUTPREFIX)netslide.js $(OUTPREFIX)nullgame.js $(OUTPREFIX)palisade.js $(OUTPREFIX)pattern.js $(OUTPREFIX)pearl.js $(OUTPREFIX)pegs.js $(OUTPREFIX)range.js $(OUTPREFIX)rect.js $(OUTPREFIX)samegame.js $(OUTPREFIX)signpost.js $(OUTPREFIX)singles.js $(OUTPREFIX)sixteen.js $(OUTPREFIX)slant.js $(OUTPREFIX)solo.js $(OUTPREFIX)tents.js $(OUTPREFIX)towers.js $(OUTPREFIX)tracks.js $(OUTPREFIX)twiddle.js $(OUTPREFIX)undead.js $(OUTPREFIX)unequal.js $(OUTPREFIX)unruly.js $(OUTPREFIX)untangle.js
diff --git a/apps/plugins/puzzles/src/Makefile.gnustep b/apps/plugins/puzzles/src/Makefile.gnustep
new file mode 100644
index 0000000000..79677f2728
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.gnustep
@@ -0,0 +1,412 @@
+# Makefile for puzzles under GNUstep.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+NEEDS_GUI=yes
+include $(GNUSTEP_MAKEFILES)/common.make
+include $(GNUSTEP_MAKEFILES)/rules.make
+include $(GNUSTEP_MAKEFILES)/Instance/rules.make
+
+all:: Puzzles fifteensolver fillingsolver galaxiespicture galaxiessolver \
+                keensolver latincheck lightupsolver loopysolver \
+                magnetssolver mapsolver mineobfusc obfusc patternpicture \
+                patternsolver pearlbench signpostsolver singlessolver \
+                slantsolver solosolver tentssolver towerssolver \
+                unequalsolver unrulysolver
+
+.SUFFIXES: .o .c .m
+
+
+
+Puzzles.app:
+        mkdir -p $@
+Puzzles.app/Resources: Puzzles.app
+        mkdir -p $@
+Puzzles.app/Resources/Puzzles.icns: Puzzles.app/Resources osx.icns
+        cp osx.icns $@
+Puzzles.app/Info.plist: Puzzles.app osx-info.plist
+        cp osx-info.plist $@
+Puzzles: Puzzles.app Puzzles.app/Puzzles \
+                Puzzles.app/Resources/Puzzles.icns Puzzles.app/Info.plist \
+                $(Puzzles_extra)
+
+Puzzles.app/Puzzles: blackbo3.o bridges3.o combi.o cube3.o divvy.o \
+                dominos3.o drawing.o dsf.o fifteen5.o filling5.o findloop.o \
+                flip3.o flood3.o galaxie7.o grid.o guess3.o inertia3.o \
+                keen5.o latin.o laydomino.o lightup5.o list.o loopgen.o \
+                loopy5.o magnets5.o malloc.o map5.o maxflow.o midend.o \
+                mines5.o misc.o net3.o netslid3.o osx.o palisad3.o \
+                pattern7.o pearl5.o pegs3.o penrose.o random.o range3.o \
+                rect3.o samegam3.o signpos5.o singles5.o sixteen3.o slant5.o \
+                solo5.o tdq.o tents5.o towers5.o tracks3.o tree234.o \
+                twiddle3.o undead3.o unequal5.o unruly5.o untangl3.o \
+                version.o
+        $(CC) $(ALL_LDFLAGS) -o $@ blackbo3.o bridges3.o combi.o cube3.o \
+                divvy.o dominos3.o drawing.o dsf.o fifteen5.o filling5.o \
+                findloop.o flip3.o flood3.o galaxie7.o grid.o guess3.o \
+                inertia3.o keen5.o latin.o laydomino.o lightup5.o list.o \
+                loopgen.o loopy5.o magnets5.o malloc.o map5.o maxflow.o \
+                midend.o mines5.o misc.o net3.o netslid3.o osx.o palisad3.o \
+                pattern7.o pearl5.o pegs3.o penrose.o random.o range3.o \
+                rect3.o samegam3.o signpos5.o singles5.o sixteen3.o slant5.o \
+                solo5.o tdq.o tents5.o towers5.o tracks3.o tree234.o \
+                twiddle3.o undead3.o unequal5.o unruly5.o untangl3.o \
+                version.o $(ALL_LIB_DIRS)  $(ALL_LIBS)
+
+fifteensolver: fifteen2.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(ULDFLAGS) -o $@ fifteen2.o malloc.o misc.o nullfe.o random.o
+
+fillingsolver: dsf.o filling2.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(ULDFLAGS) -o $@ dsf.o filling2.o malloc.o misc.o nullfe.o \
+                random.o 
+
+galaxiespicture: dsf.o galaxie4.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(ULDFLAGS) -o $@ dsf.o galaxie4.o malloc.o misc.o nullfe.o \
+                random.o -lm
+
+galaxiessolver: dsf.o galaxie2.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(ULDFLAGS) -o $@ dsf.o galaxie2.o malloc.o misc.o nullfe.o \
+                random.o -lm
+
+keensolver: dsf.o keen2.o latin6.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o tree234.o
+        $(CC) $(ULDFLAGS) -o $@ dsf.o keen2.o latin6.o malloc.o maxflow.o \
+                misc.o nullfe.o random.o tree234.o 
+
+latincheck: latin8.o malloc.o maxflow.o misc.o nullfe.o random.o tree234.o
+        $(CC) $(ULDFLAGS) -o $@ latin8.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o tree234.o 
+
+lightupsolver: combi.o lightup2.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(ULDFLAGS) -o $@ combi.o lightup2.o malloc.o misc.o nullfe.o \
+                random.o 
+
+loopysolver: dsf.o grid.o loopgen.o loopy2.o malloc.o misc.o nullfe.o \
+                penrose.o random.o tree234.o
+        $(CC) $(ULDFLAGS) -o $@ dsf.o grid.o loopgen.o loopy2.o malloc.o \
+                misc.o nullfe.o penrose.o random.o tree234.o -lm
+
+magnetssolver: laydomino.o magnets2.o malloc.o misc.o nullfe.o random.o
+        $(CC) $(ULDFLAGS) -o $@ laydomino.o magnets2.o malloc.o misc.o \
+                nullfe.o random.o -lm
+
+mapsolver: dsf.o malloc.o map2.o misc.o nullfe.o random.o
+        $(CC) $(ULDFLAGS) -o $@ dsf.o malloc.o map2.o misc.o nullfe.o \
+                random.o -lm
+
+mineobfusc: malloc.o mines2.o misc.o nullfe.o random.o tree234.o
+        $(CC) $(ULDFLAGS) -o $@ malloc.o mines2.o misc.o nullfe.o random.o \
+                tree234.o 
+
+obfusc: malloc.o misc.o nullfe.o obfusc.o random.o
+        $(CC) $(ULDFLAGS) -o $@ malloc.o misc.o nullfe.o obfusc.o random.o 
+
+patternpicture: malloc.o misc.o nullfe.o pattern4.o random.o
+        $(CC) $(ULDFLAGS) -o $@ malloc.o misc.o nullfe.o pattern4.o random.o
+
+patternsolver: malloc.o misc.o nullfe.o pattern2.o random.o
+        $(CC) $(ULDFLAGS) -o $@ malloc.o misc.o nullfe.o pattern2.o random.o
+
+pearlbench: dsf.o grid.o loopgen.o malloc.o misc.o nullfe.o pearl2.o \
+                penrose.o random.o tdq.o tree234.o
+        $(CC) $(ULDFLAGS) -o $@ dsf.o grid.o loopgen.o malloc.o misc.o \
+                nullfe.o pearl2.o penrose.o random.o tdq.o tree234.o -lm
+
+signpostsolver: dsf.o malloc.o misc.o nullfe.o random.o signpos2.o
+        $(CC) $(ULDFLAGS) -o $@ dsf.o malloc.o misc.o nullfe.o random.o \
+                signpos2.o -lm
+
+singlessolver: dsf.o latin.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                singles3.o tree234.o
+        $(CC) $(ULDFLAGS) -o $@ dsf.o latin.o malloc.o maxflow.o misc.o \
+                nullfe.o random.o singles3.o tree234.o 
+
+slantsolver: dsf.o findloop.o malloc.o misc.o nullfe.o random.o slant2.o
+        $(CC) $(ULDFLAGS) -o $@ dsf.o findloop.o malloc.o misc.o nullfe.o \
+                random.o slant2.o 
+
+solosolver: divvy.o dsf.o malloc.o misc.o nullfe.o random.o solo2.o
+        $(CC) $(ULDFLAGS) -o $@ divvy.o dsf.o malloc.o misc.o nullfe.o \
+                random.o solo2.o 
+
+tentssolver: dsf.o malloc.o maxflow.o misc.o nullfe.o random.o tents3.o
+        $(CC) $(ULDFLAGS) -o $@ dsf.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o tents3.o 
+
+towerssolver: latin6.o malloc.o maxflow.o misc.o nullfe.o random.o towers2.o \
+                tree234.o
+        $(CC) $(ULDFLAGS) -o $@ latin6.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o towers2.o tree234.o 
+
+unequalsolver: latin6.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tree234.o unequal2.o
+        $(CC) $(ULDFLAGS) -o $@ latin6.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o tree234.o unequal2.o 
+
+unrulysolver: malloc.o misc.o nullfe.o random.o unruly2.o
+        $(CC) $(ULDFLAGS) -o $@ malloc.o misc.o nullfe.o random.o unruly2.o 
+
+blackbox.o: ./blackbox.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+blackbo3.o: ./blackbox.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+bridges.o: ./bridges.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+bridges3.o: ./bridges.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+combi.o: ./combi.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube.o: ./cube.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube3.o: ./cube.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+divvy.o: ./divvy.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominosa.o: ./dominosa.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominos3.o: ./dominosa.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+drawing.o: ./drawing.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dsf.o: ./dsf.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen.o: ./fifteen.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen5.o: ./fifteen.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+fifteen2.o: ./fifteen.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+filling.o: ./filling.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+filling5.o: ./filling.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+filling2.o: ./filling.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+findloop.o: ./findloop.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip3.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+flood.o: ./flood.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flood3.o: ./flood.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxies.o: ./galaxies.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+galaxie7.o: ./galaxies.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxie4.o: ./galaxies.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+galaxie2.o: ./galaxies.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+grid.o: ./grid.c ./puzzles.h ./tree234.h ./grid.h ./penrose.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+gtk.o: ./gtk.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess.o: ./guess.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess3.o: ./guess.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+inertia.o: ./inertia.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+inertia3.o: ./inertia.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+keen5.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen2.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+latin.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+latin8.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_LATIN_TEST -c $< -o $@
+latin6.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+laydomino.o: ./laydomino.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup.o: ./lightup.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup5.o: ./lightup.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+lightup2.o: ./lightup.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+list.o: ./list.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopgen.o: ./loopgen.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy5.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+loopy2.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+magnets.o: ./magnets.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+magnets5.o: ./magnets.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+magnets2.o: ./magnets.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+malloc.o: ./malloc.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map.o: ./map.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map5.o: ./map.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+map2.o: ./map.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+maxflow.o: ./maxflow.c ./maxflow.h ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+midend.o: ./midend.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines5.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+mines2.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_OBFUSCATOR -c $< -o $@
+misc.o: ./misc.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net3.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+netslide.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+netslid3.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+no-icon.o: ./no-icon.c
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullfe.o: ./nullfe.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullgame.o: ./nullgame.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+obfusc.o: ./obfusc.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+osx.o: ./osx.m ./puzzles.h
+        $(CC) -DGNUSTEP $(ALL_OBJCFLAGS) $(COMPAT) $(FWHACK) $(OBJCFLAGS) $(XFLAGS) -c $< -o $@
+palisade.o: ./palisade.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisad3.o: ./palisade.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern.o: ./pattern.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pattern7.o: ./pattern.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern4.o: ./pattern.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+pattern2.o: ./pattern.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pearl.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pearl5.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pearl2.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pegs.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pegs3.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+penrose.o: ./penrose.c ./puzzles.h ./penrose.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+printing.o: ./printing.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+ps.o: ./ps.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+random.o: ./random.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range.o: ./range.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range3.o: ./range.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+rect.o: ./rect.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+rect3.o: ./rect.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+samegame.o: ./samegame.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+samegam3.o: ./samegame.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpost.o: ./signpost.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+signpos5.o: ./signpost.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpos2.o: ./signpost.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+singles.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+singles5.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+singles3.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+sixteen.o: ./sixteen.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+sixteen3.o: ./sixteen.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant.o: ./slant.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+slant5.o: ./slant.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant2.o: ./slant.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+solo.o: ./solo.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+solo5.o: ./solo.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+solo2.o: ./solo.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tdq.o: ./tdq.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents5.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tents3.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+towers.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+towers5.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+towers2.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tracks.o: ./tracks.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tracks3.o: ./tracks.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tree234.o: ./tree234.c ./tree234.h ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle.o: ./twiddle.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle3.o: ./twiddle.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+undead.o: ./undead.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+undead3.o: ./undead.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unequal5.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal2.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+unruly.o: ./unruly.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unruly5.o: ./unruly.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unruly2.o: ./unruly.c ./puzzles.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+untangle.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+untangl3.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+version.o: ./version.c ./version.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows1.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) $(ALL_CFLAGS) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+
+clean::
+        rm -f *.o fifteensolver fillingsolver galaxiespicture galaxiessolver keensolver latincheck lightupsolver loopysolver magnetssolver mapsolver mineobfusc obfusc patternpicture patternsolver pearlbench signpostsolver singlessolver slantsolver solosolver tentssolver towerssolver unequalsolver unrulysolver
+        rm -rf *.app
diff --git a/apps/plugins/puzzles/src/Makefile.gtk b/apps/plugins/puzzles/src/Makefile.gtk
new file mode 100644
index 0000000000..e5c1d40b90
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.gtk
@@ -0,0 +1,727 @@
+# Makefile for puzzles under X/GTK and Unix.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+
+# You can define this path to point at your tools if you need to
+# TOOLPATH = /opt/gcc/bin
+CC := $(TOOLPATH)$(CC)
+# You can manually set this to `gtk-config' or `pkg-config gtk+-1.2'
+# (depending on what works on your system) if you want to enforce
+# building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0'
+# if you want to enforce 2.0. The default is to try 2.0 and fall back
+# to 1.2 if it isn't found.
+GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 $$0 2>/dev/null || gtk-config $$0'
+
+CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g -I./ -Iicons/ `$(GTK_CONFIG) \
+                --cflags` $(CFLAGS)
+XLIBS = `$(GTK_CONFIG) --libs` -lm
+ULIBS = -lm#
+INSTALL=install
+INSTALL_PROGRAM=$(INSTALL)
+INSTALL_DATA=$(INSTALL)
+prefix=/usr/local
+exec_prefix=$(prefix)
+bindir=$(exec_prefix)/bin
+gamesdir=$(exec_prefix)/games
+mandir=$(prefix)/man
+man1dir=$(mandir)/man1
+
+all: $(BINPREFIX)blackbox $(BINPREFIX)bridges $(BINPREFIX)cube \
+                $(BINPREFIX)dominosa $(BINPREFIX)fifteen \
+                $(BINPREFIX)fifteensolver $(BINPREFIX)filling \
+                $(BINPREFIX)fillingsolver $(BINPREFIX)flip $(BINPREFIX)flood \
+                $(BINPREFIX)galaxies $(BINPREFIX)galaxiespicture \
+                $(BINPREFIX)galaxiessolver $(BINPREFIX)guess \
+                $(BINPREFIX)inertia $(BINPREFIX)keen $(BINPREFIX)keensolver \
+                $(BINPREFIX)latincheck $(BINPREFIX)lightup \
+                $(BINPREFIX)lightupsolver $(BINPREFIX)loopy \
+                $(BINPREFIX)loopysolver $(BINPREFIX)magnets \
+                $(BINPREFIX)magnetssolver $(BINPREFIX)map \
+                $(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc \
+                $(BINPREFIX)mines $(BINPREFIX)net $(BINPREFIX)netslide \
+                $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)palisade \
+                $(BINPREFIX)pattern $(BINPREFIX)patternpicture \
+                $(BINPREFIX)patternsolver $(BINPREFIX)pearl \
+                $(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range \
+                $(BINPREFIX)rect $(BINPREFIX)samegame $(BINPREFIX)signpost \
+                $(BINPREFIX)signpostsolver $(BINPREFIX)singles \
+                $(BINPREFIX)singlessolver $(BINPREFIX)sixteen \
+                $(BINPREFIX)slant $(BINPREFIX)slantsolver $(BINPREFIX)solo \
+                $(BINPREFIX)solosolver $(BINPREFIX)tents \
+                $(BINPREFIX)tentssolver $(BINPREFIX)towers \
+                $(BINPREFIX)towerssolver $(BINPREFIX)tracks \
+                $(BINPREFIX)twiddle $(BINPREFIX)undead $(BINPREFIX)unequal \
+                $(BINPREFIX)unequalsolver $(BINPREFIX)unruly \
+                $(BINPREFIX)unrulysolver $(BINPREFIX)untangle
+
+$(BINPREFIX)blackbox: blackbox.o drawing.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ blackbox.o drawing.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)bridges: bridges.o drawing.o dsf.o findloop.o gtk.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ bridges.o drawing.o dsf.o findloop.o gtk.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                 $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)cube: cube.o drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o version.o
+        $(CC) -o $@ cube.o drawing.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)dominosa: dominosa.o drawing.o gtk.o laydomino.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ dominosa.o drawing.o gtk.o laydomino.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)fifteen: drawing.o fifteen.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o fifteen.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)fifteensolver: fifteen2.o malloc.o misc.o nullfe.o random.o
+        $(CC) -o $@ fifteen2.o malloc.o misc.o nullfe.o random.o  $(XLFLAGS) \
+                $(ULIBS)
+
+$(BINPREFIX)filling: drawing.o dsf.o filling.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o dsf.o filling.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)fillingsolver: dsf.o filling2.o malloc.o misc.o nullfe.o \
+                random.o
+        $(CC) -o $@ dsf.o filling2.o malloc.o misc.o nullfe.o random.o  \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)flip: drawing.o flip.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o tree234.o version.o
+        $(CC) -o $@ drawing.o flip.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)flood: drawing.o flood.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o flood.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)galaxies: drawing.o dsf.o galaxies.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o dsf.o galaxies.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)galaxiespicture: dsf.o galaxie4.o malloc.o misc.o nullfe.o \
+                random.o
+        $(CC) -o $@ dsf.o galaxie4.o malloc.o misc.o nullfe.o random.o -lm \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)galaxiessolver: dsf.o galaxie2.o malloc.o misc.o nullfe.o \
+                random.o
+        $(CC) -o $@ dsf.o galaxie2.o malloc.o misc.o nullfe.o random.o -lm \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)guess: drawing.o gtk.o guess.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o gtk.o guess.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)inertia: drawing.o gtk.o inertia.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o gtk.o inertia.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)keen: drawing.o dsf.o gtk.o keen.o latin.o malloc.o maxflow.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o keen.o latin.o malloc.o maxflow.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)keensolver: dsf.o keen2.o latin6.o malloc.o maxflow.o misc.o \
+                nullfe.o random.o tree234.o
+        $(CC) -o $@ dsf.o keen2.o latin6.o malloc.o maxflow.o misc.o \
+                nullfe.o random.o tree234.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)latincheck: latin8.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tree234.o
+        $(CC) -o $@ latin8.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tree234.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)lightup: combi.o drawing.o gtk.o lightup.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ combi.o drawing.o gtk.o lightup.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)lightupsolver: combi.o lightup2.o malloc.o misc.o nullfe.o \
+                random.o
+        $(CC) -o $@ combi.o lightup2.o malloc.o misc.o nullfe.o random.o  \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)loopy: drawing.o dsf.o grid.o gtk.o loopgen.o loopy.o malloc.o \
+                midend.o misc.o no-icon.o penrose.o printing.o ps.o random.o \
+                tree234.o version.o
+        $(CC) -o $@ drawing.o dsf.o grid.o gtk.o loopgen.o loopy.o malloc.o \
+                midend.o misc.o no-icon.o penrose.o printing.o ps.o random.o \
+                tree234.o version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)loopysolver: dsf.o grid.o loopgen.o loopy2.o malloc.o misc.o \
+                nullfe.o penrose.o random.o tree234.o
+        $(CC) -o $@ dsf.o grid.o loopgen.o loopy2.o malloc.o misc.o nullfe.o \
+                penrose.o random.o tree234.o -lm $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)magnets: drawing.o gtk.o laydomino.o magnets.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o gtk.o laydomino.o magnets.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)magnetssolver: laydomino.o magnets2.o malloc.o misc.o nullfe.o \
+                random.o
+        $(CC) -o $@ laydomino.o magnets2.o malloc.o misc.o nullfe.o random.o \
+                -lm $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)map: drawing.o dsf.o gtk.o malloc.o map.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o malloc.o map.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)mapsolver: dsf.o malloc.o map2.o misc.o nullfe.o random.o
+        $(CC) -o $@ dsf.o malloc.o map2.o misc.o nullfe.o random.o -lm \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)mineobfusc: malloc.o mines2.o misc.o nullfe.o random.o tree234.o
+        $(CC) -o $@ malloc.o mines2.o misc.o nullfe.o random.o tree234.o  \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)mines: drawing.o gtk.o malloc.o midend.o mines.o misc.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o mines.o misc.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)net: drawing.o dsf.o findloop.o gtk.o malloc.o midend.o misc.o \
+                net.o no-icon.o printing.o ps.o random.o tree234.o version.o
+        $(CC) -o $@ drawing.o dsf.o findloop.o gtk.o malloc.o midend.o \
+                misc.o net.o no-icon.o printing.o ps.o random.o tree234.o \
+                version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)netslide: drawing.o gtk.o malloc.o midend.o misc.o netslide.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o netslide.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)nullgame: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                nullgame.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                nullgame.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)obfusc: malloc.o misc.o nullfe.o obfusc.o random.o
+        $(CC) -o $@ malloc.o misc.o nullfe.o obfusc.o random.o  $(XLFLAGS) \
+                $(ULIBS)
+
+$(BINPREFIX)palisade: divvy.o drawing.o dsf.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o palisade.o printing.o ps.o random.o version.o
+        $(CC) -o $@ divvy.o drawing.o dsf.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o palisade.o printing.o ps.o random.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)pattern: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                pattern.o printing.o ps.o random.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                pattern.o printing.o ps.o random.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)patternpicture: malloc.o misc.o nullfe.o pattern4.o random.o
+        $(CC) -o $@ malloc.o misc.o nullfe.o pattern4.o random.o  $(XLFLAGS) \
+                $(ULIBS)
+
+$(BINPREFIX)patternsolver: malloc.o misc.o nullfe.o pattern2.o random.o
+        $(CC) -o $@ malloc.o misc.o nullfe.o pattern2.o random.o  $(XLFLAGS) \
+                $(ULIBS)
+
+$(BINPREFIX)pearl: drawing.o dsf.o grid.o gtk.o loopgen.o malloc.o midend.o \
+                misc.o no-icon.o pearl.o penrose.o printing.o ps.o random.o \
+                tdq.o tree234.o version.o
+        $(CC) -o $@ drawing.o dsf.o grid.o gtk.o loopgen.o malloc.o midend.o \
+                misc.o no-icon.o pearl.o penrose.o printing.o ps.o random.o \
+                tdq.o tree234.o version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)pearlbench: dsf.o grid.o loopgen.o malloc.o misc.o nullfe.o \
+                pearl2.o penrose.o random.o tdq.o tree234.o
+        $(CC) -o $@ dsf.o grid.o loopgen.o malloc.o misc.o nullfe.o pearl2.o \
+                penrose.o random.o tdq.o tree234.o -lm $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)pegs: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o pegs.o \
+                printing.o ps.o random.o tree234.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                pegs.o printing.o ps.o random.o tree234.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)range: drawing.o dsf.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o range.o version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o range.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)rect: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o rect.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o rect.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)samegame: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o samegame.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o samegame.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)signpost: drawing.o dsf.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o signpost.o version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o signpost.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)signpostsolver: dsf.o malloc.o misc.o nullfe.o random.o \
+                signpos2.o
+        $(CC) -o $@ dsf.o malloc.o misc.o nullfe.o random.o signpos2.o -lm \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)singles: drawing.o dsf.o gtk.o latin.o malloc.o maxflow.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o singles.o \
+                tree234.o version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o latin.o malloc.o maxflow.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o singles.o \
+                tree234.o version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)singlessolver: dsf.o latin.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o singles3.o tree234.o
+        $(CC) -o $@ dsf.o latin.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o singles3.o tree234.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)sixteen: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o sixteen.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o sixteen.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)slant: drawing.o dsf.o findloop.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o slant.o version.o
+        $(CC) -o $@ drawing.o dsf.o findloop.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o slant.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)slantsolver: dsf.o findloop.o malloc.o misc.o nullfe.o random.o \
+                slant2.o
+        $(CC) -o $@ dsf.o findloop.o malloc.o misc.o nullfe.o random.o \
+                slant2.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)solo: divvy.o drawing.o dsf.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o solo.o version.o
+        $(CC) -o $@ divvy.o drawing.o dsf.o gtk.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o solo.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)solosolver: divvy.o dsf.o malloc.o misc.o nullfe.o random.o \
+                solo2.o
+        $(CC) -o $@ divvy.o dsf.o malloc.o misc.o nullfe.o random.o solo2.o  \
+                $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)tents: drawing.o dsf.o gtk.o malloc.o maxflow.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o tents.o version.o
+        $(CC) -o $@ drawing.o dsf.o gtk.o malloc.o maxflow.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o tents.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)tentssolver: dsf.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tents3.o
+        $(CC) -o $@ dsf.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tents3.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)towers: drawing.o gtk.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o towers.o tree234.o \
+                version.o
+        $(CC) -o $@ drawing.o gtk.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o towers.o tree234.o \
+                version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)towerssolver: latin6.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o towers2.o tree234.o
+        $(CC) -o $@ latin6.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                towers2.o tree234.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)tracks: drawing.o dsf.o findloop.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tracks.o version.o
+        $(CC) -o $@ drawing.o dsf.o findloop.o gtk.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tracks.o version.o \
+                 $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)twiddle: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o twiddle.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o twiddle.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)undead: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o undead.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o undead.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)unequal: drawing.o gtk.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                unequal.o version.o
+        $(CC) -o $@ drawing.o gtk.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                unequal.o version.o  $(XLFLAGS) $(XLIBS)
+
+$(BINPREFIX)unequalsolver: latin6.o malloc.o maxflow.o misc.o nullfe.o \
+                random.o tree234.o unequal2.o
+        $(CC) -o $@ latin6.o malloc.o maxflow.o misc.o nullfe.o random.o \
+                tree234.o unequal2.o  $(XLFLAGS) $(ULIBS)
+
+$(BINPREFIX)unruly: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o unruly.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o unruly.o version.o  $(XLFLAGS) \
+                $(XLIBS)
+
+$(BINPREFIX)unrulysolver: malloc.o misc.o nullfe.o random.o unruly2.o
+        $(CC) -o $@ malloc.o misc.o nullfe.o random.o unruly2.o  $(XLFLAGS) \
+                $(ULIBS)
+
+$(BINPREFIX)untangle: drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o tree234.o untangle.o version.o
+        $(CC) -o $@ drawing.o gtk.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o tree234.o untangle.o version.o  \
+                $(XLFLAGS) $(XLIBS)
+
+blackbox.o: ./blackbox.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+blackbo3.o: ./blackbox.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+bridges.o: ./bridges.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+bridges3.o: ./bridges.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+combi.o: ./combi.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube.o: ./cube.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube3.o: ./cube.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+divvy.o: ./divvy.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominosa.o: ./dominosa.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominos3.o: ./dominosa.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+drawing.o: ./drawing.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dsf.o: ./dsf.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen5.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+fifteen2.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+filling.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+filling5.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+filling2.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+findloop.o: ./findloop.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip3.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+flood.o: ./flood.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flood3.o: ./flood.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxies.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+galaxie7.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxie4.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+galaxie2.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+grid.o: ./grid.c ./puzzles.h ./tree234.h ./grid.h ./penrose.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+gtk.o: ./gtk.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess.o: ./guess.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess3.o: ./guess.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+inertia.o: ./inertia.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+inertia3.o: ./inertia.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+keen5.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen2.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+latin.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+latin8.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_LATIN_TEST -c $< -o $@
+latin6.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+laydomino.o: ./laydomino.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup5.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+lightup2.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+list.o: ./list.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopgen.o: ./loopgen.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy5.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+loopy2.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+magnets.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+magnets5.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+magnets2.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+malloc.o: ./malloc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map5.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+map2.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+maxflow.o: ./maxflow.c ./maxflow.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+midend.o: ./midend.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines5.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+mines2.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_OBFUSCATOR -c $< -o $@
+misc.o: ./misc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net3.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+netslide.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+netslid3.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+no-icon.o: ./no-icon.c
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullfe.o: ./nullfe.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullgame.o: ./nullgame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+obfusc.o: ./obfusc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+osx.o: ./osx.m ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisade.o: ./palisade.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisad3.o: ./palisade.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pattern7.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern4.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+pattern2.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pearl.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pearl5.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pearl2.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pegs.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pegs3.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+penrose.o: ./penrose.c ./puzzles.h ./penrose.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+printing.o: ./printing.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+ps.o: ./ps.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+random.o: ./random.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range.o: ./range.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range3.o: ./range.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+rect.o: ./rect.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+rect3.o: ./rect.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+samegame.o: ./samegame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+samegam3.o: ./samegame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpost.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+signpos5.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpos2.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+singles.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+singles5.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+singles3.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+sixteen.o: ./sixteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+sixteen3.o: ./sixteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+slant5.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant2.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+solo.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+solo5.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+solo2.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tdq.o: ./tdq.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents5.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tents3.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+towers.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+towers5.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+towers2.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tracks.o: ./tracks.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tracks3.o: ./tracks.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tree234.o: ./tree234.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle.o: ./twiddle.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle3.o: ./twiddle.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+undead.o: ./undead.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+undead3.o: ./undead.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unequal5.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal2.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+unruly.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unruly5.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unruly2.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+untangle.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+untangl3.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+version.o: ./version.c ./version.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows1.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+
+GAMES += blackbox
+GAMES += bridges
+GAMES += cube
+GAMES += dominosa
+GAMES += fifteen
+GAMES += filling
+GAMES += flip
+GAMES += flood
+GAMES += galaxies
+GAMES += guess
+GAMES += inertia
+GAMES += keen
+GAMES += lightup
+GAMES += loopy
+GAMES += magnets
+GAMES += map
+GAMES += mines
+GAMES += net
+GAMES += netslide
+GAMES += palisade
+GAMES += pattern
+GAMES += pearl
+GAMES += pegs
+GAMES += range
+GAMES += rect
+GAMES += samegame
+GAMES += signpost
+GAMES += singles
+GAMES += sixteen
+GAMES += slant
+GAMES += solo
+GAMES += tents
+GAMES += towers
+GAMES += tracks
+GAMES += twiddle
+GAMES += undead
+GAMES += unequal
+GAMES += unruly
+GAMES += untangle
+install:
+        for i in $(GAMES); do \
+                $(INSTALL_PROGRAM) -m 755 $(BINPREFIX)$$i $(DESTDIR)$(gamesdir)/$(BINPREFIX)$$i \
+                || exit 1; \
+        done
+test: benchmark.html benchmark.txt
+
+benchmark.html: benchmark.txt benchmark.pl
+        ./benchmark.pl benchmark.txt > $@
+
+benchmark.txt: benchmark.sh $(GAMES)
+        ./benchmark.sh > $@
+
+
+clean:
+        rm -f *.o $(BINPREFIX)blackbox $(BINPREFIX)bridges $(BINPREFIX)cube $(BINPREFIX)dominosa $(BINPREFIX)fifteen $(BINPREFIX)fifteensolver $(BINPREFIX)filling $(BINPREFIX)fillingsolver $(BINPREFIX)flip $(BINPREFIX)flood $(BINPREFIX)galaxies $(BINPREFIX)galaxiespicture $(BINPREFIX)galaxiessolver $(BINPREFIX)guess $(BINPREFIX)inertia $(BINPREFIX)keen $(BINPREFIX)keensolver $(BINPREFIX)latincheck $(BINPREFIX)lightup $(BINPREFIX)lightupsolver $(BINPREFIX)loopy $(BINPREFIX)loopysolver $(BINPREFIX)magnets $(BINPREFIX)magnetssolver $(BINPREFIX)map $(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc $(BINPREFIX)mines $(BINPREFIX)net $(BINPREFIX)netslide $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)palisade $(BINPREFIX)pattern $(BINPREFIX)patternpicture $(BINPREFIX)patternsolver $(BINPREFIX)pearl $(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range $(BINPREFIX)rect $(BINPREFIX)samegame $(BINPREFIX)signpost $(BINPREFIX)signpostsolver $(BINPREFIX)singles $(BINPREFIX)singlessolver $(BINPREFIX)sixteen $(BINPREFIX)slant $(BINPREFIX)slantsolver $(BINPREFIX)solo $(BINPREFIX)solosolver $(BINPREFIX)tents $(BINPREFIX)tentssolver $(BINPREFIX)towers $(BINPREFIX)towerssolver $(BINPREFIX)tracks $(BINPREFIX)twiddle $(BINPREFIX)undead $(BINPREFIX)unequal $(BINPREFIX)unequalsolver $(BINPREFIX)unruly $(BINPREFIX)unrulysolver $(BINPREFIX)untangle
diff --git a/apps/plugins/puzzles/src/Makefile.in b/apps/plugins/puzzles/src/Makefile.in
new file mode 100644
index 0000000000..b86194f893
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.in
@@ -0,0 +1,2611 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Makefile.am for puzzles under Unix with Autoconf/Automake.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \   ]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs   ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+noinst_PROGRAMS = blackbox$(EXEEXT) bridges$(EXEEXT) cube$(EXEEXT) \
+        dominosa$(EXEEXT) fifteen$(EXEEXT) fifteensolver$(EXEEXT) \
+        filling$(EXEEXT) fillingsolver$(EXEEXT) flip$(EXEEXT) \
+        flood$(EXEEXT) galaxies$(EXEEXT) galaxiespicture$(EXEEXT) \
+        galaxiessolver$(EXEEXT) guess$(EXEEXT) inertia$(EXEEXT) \
+        keen$(EXEEXT) keensolver$(EXEEXT) latincheck$(EXEEXT) \
+        lightup$(EXEEXT) lightupsolver$(EXEEXT) loopy$(EXEEXT) \
+        loopysolver$(EXEEXT) magnets$(EXEEXT) magnetssolver$(EXEEXT) \
+        map$(EXEEXT) mapsolver$(EXEEXT) mineobfusc$(EXEEXT) \
+        mines$(EXEEXT) net$(EXEEXT) netslide$(EXEEXT) \
+        nullgame$(EXEEXT) obfusc$(EXEEXT) palisade$(EXEEXT) \
+        pattern$(EXEEXT) patternpicture$(EXEEXT) \
+        patternsolver$(EXEEXT) pearl$(EXEEXT) pearlbench$(EXEEXT) \
+        pegs$(EXEEXT) range$(EXEEXT) rect$(EXEEXT) samegame$(EXEEXT) \
+        signpost$(EXEEXT) signpostsolver$(EXEEXT) singles$(EXEEXT) \
+        singlessolver$(EXEEXT) sixteen$(EXEEXT) slant$(EXEEXT) \
+        slantsolver$(EXEEXT) solo$(EXEEXT) solosolver$(EXEEXT) \
+        tents$(EXEEXT) tentssolver$(EXEEXT) towers$(EXEEXT) \
+        towerssolver$(EXEEXT) tracks$(EXEEXT) twiddle$(EXEEXT) \
+        undead$(EXEEXT) unequal$(EXEEXT) unequalsolver$(EXEEXT) \
+        unruly$(EXEEXT) unrulysolver$(EXEEXT) untangle$(EXEEXT)
+bin_PROGRAMS = $(am__EXEEXT_1)
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+        $(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+        $(am__configure_deps) $(am__DIST_COMMON)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libfifteen2_a_AR = $(AR) $(ARFLAGS)
+libfifteen2_a_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libfifteen2_a_OBJECTS = ./libfifteen2_a-fifteen.$(OBJEXT)
+libfifteen2_a_OBJECTS = $(am_libfifteen2_a_OBJECTS)
+libfilling2_a_AR = $(AR) $(ARFLAGS)
+libfilling2_a_LIBADD =
+am_libfilling2_a_OBJECTS = ./libfilling2_a-filling.$(OBJEXT)
+libfilling2_a_OBJECTS = $(am_libfilling2_a_OBJECTS)
+libgalaxie2_a_AR = $(AR) $(ARFLAGS)
+libgalaxie2_a_LIBADD =
+am_libgalaxie2_a_OBJECTS = ./libgalaxie2_a-galaxies.$(OBJEXT)
+libgalaxie2_a_OBJECTS = $(am_libgalaxie2_a_OBJECTS)
+libgalaxie4_a_AR = $(AR) $(ARFLAGS)
+libgalaxie4_a_LIBADD =
+am_libgalaxie4_a_OBJECTS = ./libgalaxie4_a-galaxies.$(OBJEXT)
+libgalaxie4_a_OBJECTS = $(am_libgalaxie4_a_OBJECTS)
+libkeen2_a_AR = $(AR) $(ARFLAGS)
+libkeen2_a_LIBADD =
+am_libkeen2_a_OBJECTS = ./libkeen2_a-keen.$(OBJEXT)
+libkeen2_a_OBJECTS = $(am_libkeen2_a_OBJECTS)
+liblatin6_a_AR = $(AR) $(ARFLAGS)
+liblatin6_a_LIBADD =
+am_liblatin6_a_OBJECTS = ./liblatin6_a-latin.$(OBJEXT)
+liblatin6_a_OBJECTS = $(am_liblatin6_a_OBJECTS)
+liblatin8_a_AR = $(AR) $(ARFLAGS)
+liblatin8_a_LIBADD =
+am_liblatin8_a_OBJECTS = ./liblatin8_a-latin.$(OBJEXT)
+liblatin8_a_OBJECTS = $(am_liblatin8_a_OBJECTS)
+liblightup2_a_AR = $(AR) $(ARFLAGS)
+liblightup2_a_LIBADD =
+am_liblightup2_a_OBJECTS = ./liblightup2_a-lightup.$(OBJEXT)
+liblightup2_a_OBJECTS = $(am_liblightup2_a_OBJECTS)
+libloopy2_a_AR = $(AR) $(ARFLAGS)
+libloopy2_a_LIBADD =
+am_libloopy2_a_OBJECTS = ./libloopy2_a-loopy.$(OBJEXT)
+libloopy2_a_OBJECTS = $(am_libloopy2_a_OBJECTS)
+libmagnets2_a_AR = $(AR) $(ARFLAGS)
+libmagnets2_a_LIBADD =
+am_libmagnets2_a_OBJECTS = ./libmagnets2_a-magnets.$(OBJEXT)
+libmagnets2_a_OBJECTS = $(am_libmagnets2_a_OBJECTS)
+libmap2_a_AR = $(AR) $(ARFLAGS)
+libmap2_a_LIBADD =
+am_libmap2_a_OBJECTS = ./libmap2_a-map.$(OBJEXT)
+libmap2_a_OBJECTS = $(am_libmap2_a_OBJECTS)
+libmines2_a_AR = $(AR) $(ARFLAGS)
+libmines2_a_LIBADD =
+am_libmines2_a_OBJECTS = ./libmines2_a-mines.$(OBJEXT)
+libmines2_a_OBJECTS = $(am_libmines2_a_OBJECTS)
+libpattern2_a_AR = $(AR) $(ARFLAGS)
+libpattern2_a_LIBADD =
+am_libpattern2_a_OBJECTS = ./libpattern2_a-pattern.$(OBJEXT)
+libpattern2_a_OBJECTS = $(am_libpattern2_a_OBJECTS)
+libpattern4_a_AR = $(AR) $(ARFLAGS)
+libpattern4_a_LIBADD =
+am_libpattern4_a_OBJECTS = ./libpattern4_a-pattern.$(OBJEXT)
+libpattern4_a_OBJECTS = $(am_libpattern4_a_OBJECTS)
+libpearl2_a_AR = $(AR) $(ARFLAGS)
+libpearl2_a_LIBADD =
+am_libpearl2_a_OBJECTS = ./libpearl2_a-pearl.$(OBJEXT)
+libpearl2_a_OBJECTS = $(am_libpearl2_a_OBJECTS)
+libsignpos2_a_AR = $(AR) $(ARFLAGS)
+libsignpos2_a_LIBADD =
+am_libsignpos2_a_OBJECTS = ./libsignpos2_a-signpost.$(OBJEXT)
+libsignpos2_a_OBJECTS = $(am_libsignpos2_a_OBJECTS)
+libsingles3_a_AR = $(AR) $(ARFLAGS)
+libsingles3_a_LIBADD =
+am_libsingles3_a_OBJECTS = ./libsingles3_a-singles.$(OBJEXT)
+libsingles3_a_OBJECTS = $(am_libsingles3_a_OBJECTS)
+libslant2_a_AR = $(AR) $(ARFLAGS)
+libslant2_a_LIBADD =
+am_libslant2_a_OBJECTS = ./libslant2_a-slant.$(OBJEXT)
+libslant2_a_OBJECTS = $(am_libslant2_a_OBJECTS)
+libsolo2_a_AR = $(AR) $(ARFLAGS)
+libsolo2_a_LIBADD =
+am_libsolo2_a_OBJECTS = ./libsolo2_a-solo.$(OBJEXT)
+libsolo2_a_OBJECTS = $(am_libsolo2_a_OBJECTS)
+libtents3_a_AR = $(AR) $(ARFLAGS)
+libtents3_a_LIBADD =
+am_libtents3_a_OBJECTS = ./libtents3_a-tents.$(OBJEXT)
+libtents3_a_OBJECTS = $(am_libtents3_a_OBJECTS)
+libtowers2_a_AR = $(AR) $(ARFLAGS)
+libtowers2_a_LIBADD =
+am_libtowers2_a_OBJECTS = ./libtowers2_a-towers.$(OBJEXT)
+libtowers2_a_OBJECTS = $(am_libtowers2_a_OBJECTS)
+libunequal2_a_AR = $(AR) $(ARFLAGS)
+libunequal2_a_LIBADD =
+am_libunequal2_a_OBJECTS = ./libunequal2_a-unequal.$(OBJEXT)
+libunequal2_a_OBJECTS = $(am_libunequal2_a_OBJECTS)
+libunruly2_a_AR = $(AR) $(ARFLAGS)
+libunruly2_a_LIBADD =
+am_libunruly2_a_OBJECTS = ./libunruly2_a-unruly.$(OBJEXT)
+libunruly2_a_OBJECTS = $(am_libunruly2_a_OBJECTS)
+am__EXEEXT_1 = blackbox$(EXEEXT) bridges$(EXEEXT) cube$(EXEEXT) \
+        dominosa$(EXEEXT) fifteen$(EXEEXT) filling$(EXEEXT) \
+        flip$(EXEEXT) flood$(EXEEXT) galaxies$(EXEEXT) guess$(EXEEXT) \
+        inertia$(EXEEXT) keen$(EXEEXT) lightup$(EXEEXT) loopy$(EXEEXT) \
+        magnets$(EXEEXT) map$(EXEEXT) mines$(EXEEXT) net$(EXEEXT) \
+        netslide$(EXEEXT) palisade$(EXEEXT) pattern$(EXEEXT) \
+        pearl$(EXEEXT) pegs$(EXEEXT) range$(EXEEXT) rect$(EXEEXT) \
+        samegame$(EXEEXT) signpost$(EXEEXT) singles$(EXEEXT) \
+        sixteen$(EXEEXT) slant$(EXEEXT) solo$(EXEEXT) tents$(EXEEXT) \
+        towers$(EXEEXT) tracks$(EXEEXT) twiddle$(EXEEXT) \
+        undead$(EXEEXT) unequal$(EXEEXT) unruly$(EXEEXT) \
+        untangle$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am_blackbox_OBJECTS = ./blackbox.$(OBJEXT) ./drawing.$(OBJEXT) \
+        ./gtk.$(OBJEXT) ./malloc.$(OBJEXT) ./midend.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./version.$(OBJEXT)
+blackbox_OBJECTS = $(am_blackbox_OBJECTS)
+am__DEPENDENCIES_1 =
+blackbox_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_bridges_OBJECTS = ./bridges.$(OBJEXT) ./drawing.$(OBJEXT) \
+        ./dsf.$(OBJEXT) ./findloop.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./version.$(OBJEXT)
+bridges_OBJECTS = $(am_bridges_OBJECTS)
+bridges_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_cube_OBJECTS = ./cube.$(OBJEXT) ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./version.$(OBJEXT)
+cube_OBJECTS = $(am_cube_OBJECTS)
+cube_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_dominosa_OBJECTS = ./dominosa.$(OBJEXT) ./drawing.$(OBJEXT) \
+        ./gtk.$(OBJEXT) ./laydomino.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./version.$(OBJEXT)
+dominosa_OBJECTS = $(am_dominosa_OBJECTS)
+dominosa_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_fifteen_OBJECTS = ./drawing.$(OBJEXT) ./fifteen.$(OBJEXT) \
+        ./gtk.$(OBJEXT) ./malloc.$(OBJEXT) ./midend.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./version.$(OBJEXT)
+fifteen_OBJECTS = $(am_fifteen_OBJECTS)
+fifteen_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_fifteensolver_OBJECTS = ./malloc.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./nullfe.$(OBJEXT) ./random.$(OBJEXT)
+fifteensolver_OBJECTS = $(am_fifteensolver_OBJECTS)
+fifteensolver_DEPENDENCIES = libfifteen2_a-fifteen.$(OBJEXT)
+am_filling_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) \
+        ./filling.$(OBJEXT) ./gtk.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./version.$(OBJEXT)
+filling_OBJECTS = $(am_filling_OBJECTS)
+filling_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_fillingsolver_OBJECTS = ./dsf.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) ./random.$(OBJEXT)
+fillingsolver_OBJECTS = $(am_fillingsolver_OBJECTS)
+fillingsolver_DEPENDENCIES = libfilling2_a-filling.$(OBJEXT)
+am_flip_OBJECTS = ./drawing.$(OBJEXT) ./flip.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./tree234.$(OBJEXT) ./version.$(OBJEXT)
+flip_OBJECTS = $(am_flip_OBJECTS)
+flip_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_flood_OBJECTS = ./drawing.$(OBJEXT) ./flood.$(OBJEXT) \
+        ./gtk.$(OBJEXT) ./malloc.$(OBJEXT) ./midend.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./version.$(OBJEXT)
+flood_OBJECTS = $(am_flood_OBJECTS)
+flood_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_galaxies_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) \
+        ./galaxies.$(OBJEXT) ./gtk.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./version.$(OBJEXT)
+galaxies_OBJECTS = $(am_galaxies_OBJECTS)
+galaxies_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_galaxiespicture_OBJECTS = ./dsf.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) ./random.$(OBJEXT)
+galaxiespicture_OBJECTS = $(am_galaxiespicture_OBJECTS)
+galaxiespicture_DEPENDENCIES = libgalaxie4_a-galaxies.$(OBJEXT)
+am_galaxiessolver_OBJECTS = ./dsf.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) ./random.$(OBJEXT)
+galaxiessolver_OBJECTS = $(am_galaxiessolver_OBJECTS)
+galaxiessolver_DEPENDENCIES = libgalaxie2_a-galaxies.$(OBJEXT)
+am_guess_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./guess.$(OBJEXT) ./malloc.$(OBJEXT) ./midend.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./version.$(OBJEXT)
+guess_OBJECTS = $(am_guess_OBJECTS)
+guess_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_inertia_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./inertia.$(OBJEXT) ./malloc.$(OBJEXT) ./midend.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./version.$(OBJEXT)
+inertia_OBJECTS = $(am_inertia_OBJECTS)
+inertia_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_keen_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./keen.$(OBJEXT) ./latin.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./maxflow.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./tree234.$(OBJEXT) ./version.$(OBJEXT)
+keen_OBJECTS = $(am_keen_OBJECTS)
+keen_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_keensolver_OBJECTS = ./dsf.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./maxflow.$(OBJEXT) ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) \
+        ./random.$(OBJEXT) ./tree234.$(OBJEXT)
+keensolver_OBJECTS = $(am_keensolver_OBJECTS)
+keensolver_DEPENDENCIES = libkeen2_a-keen.$(OBJEXT) \
+        liblatin6_a-latin.$(OBJEXT)
+am_latincheck_OBJECTS = ./malloc.$(OBJEXT) ./maxflow.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) ./random.$(OBJEXT) \
+        ./tree234.$(OBJEXT)
+latincheck_OBJECTS = $(am_latincheck_OBJECTS)
+latincheck_DEPENDENCIES = liblatin8_a-latin.$(OBJEXT)
+am_lightup_OBJECTS = ./combi.$(OBJEXT) ./drawing.$(OBJEXT) \
+        ./gtk.$(OBJEXT) ./lightup.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./version.$(OBJEXT)
+lightup_OBJECTS = $(am_lightup_OBJECTS)
+lightup_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_lightupsolver_OBJECTS = ./combi.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) ./random.$(OBJEXT)
+lightupsolver_OBJECTS = $(am_lightupsolver_OBJECTS)
+lightupsolver_DEPENDENCIES = liblightup2_a-lightup.$(OBJEXT)
+am_loopy_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) \
+        ./grid.$(OBJEXT) ./gtk.$(OBJEXT) ./loopgen.$(OBJEXT) \
+        ./loopy.$(OBJEXT) ./malloc.$(OBJEXT) ./midend.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) ./penrose.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./tree234.$(OBJEXT) ./version.$(OBJEXT)
+loopy_OBJECTS = $(am_loopy_OBJECTS)
+loopy_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_loopysolver_OBJECTS = ./dsf.$(OBJEXT) ./grid.$(OBJEXT) \
+        ./loopgen.$(OBJEXT) ./malloc.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./nullfe.$(OBJEXT) ./penrose.$(OBJEXT) ./random.$(OBJEXT) \
+        ./tree234.$(OBJEXT)
+loopysolver_OBJECTS = $(am_loopysolver_OBJECTS)
+loopysolver_DEPENDENCIES = libloopy2_a-loopy.$(OBJEXT)
+am_magnets_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./laydomino.$(OBJEXT) ./magnets.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./version.$(OBJEXT)
+magnets_OBJECTS = $(am_magnets_OBJECTS)
+magnets_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_magnetssolver_OBJECTS = ./laydomino.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) ./random.$(OBJEXT)
+magnetssolver_OBJECTS = $(am_magnetssolver_OBJECTS)
+magnetssolver_DEPENDENCIES = libmagnets2_a-magnets.$(OBJEXT)
+am_map_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./map.$(OBJEXT) ./midend.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./version.$(OBJEXT)
+map_OBJECTS = $(am_map_OBJECTS)
+map_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_mapsolver_OBJECTS = ./dsf.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) ./random.$(OBJEXT)
+mapsolver_OBJECTS = $(am_mapsolver_OBJECTS)
+mapsolver_DEPENDENCIES = libmap2_a-map.$(OBJEXT)
+am_mineobfusc_OBJECTS = ./malloc.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./nullfe.$(OBJEXT) ./random.$(OBJEXT) ./tree234.$(OBJEXT)
+mineobfusc_OBJECTS = $(am_mineobfusc_OBJECTS)
+mineobfusc_DEPENDENCIES = libmines2_a-mines.$(OBJEXT)
+am_mines_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./mines.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./tree234.$(OBJEXT) \
+        ./version.$(OBJEXT)
+mines_OBJECTS = $(am_mines_OBJECTS)
+mines_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_net_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) \
+        ./findloop.$(OBJEXT) ./gtk.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./net.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./tree234.$(OBJEXT) ./version.$(OBJEXT)
+net_OBJECTS = $(am_net_OBJECTS)
+net_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_netslide_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./netslide.$(OBJEXT) ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./tree234.$(OBJEXT) \
+        ./version.$(OBJEXT)
+netslide_OBJECTS = $(am_netslide_OBJECTS)
+netslide_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_nullgame_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./nullgame.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./version.$(OBJEXT)
+nullgame_OBJECTS = $(am_nullgame_OBJECTS)
+nullgame_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_obfusc_OBJECTS = ./malloc.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./nullfe.$(OBJEXT) ./obfusc.$(OBJEXT) ./random.$(OBJEXT)
+obfusc_OBJECTS = $(am_obfusc_OBJECTS)
+obfusc_DEPENDENCIES =
+am_palisade_OBJECTS = ./divvy.$(OBJEXT) ./drawing.$(OBJEXT) \
+        ./dsf.$(OBJEXT) ./gtk.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) \
+        ./palisade.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./version.$(OBJEXT)
+palisade_OBJECTS = $(am_palisade_OBJECTS)
+palisade_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_pattern_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./pattern.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./version.$(OBJEXT)
+pattern_OBJECTS = $(am_pattern_OBJECTS)
+pattern_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_patternpicture_OBJECTS = ./malloc.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./nullfe.$(OBJEXT) ./random.$(OBJEXT)
+patternpicture_OBJECTS = $(am_patternpicture_OBJECTS)
+patternpicture_DEPENDENCIES = libpattern4_a-pattern.$(OBJEXT)
+am_patternsolver_OBJECTS = ./malloc.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./nullfe.$(OBJEXT) ./random.$(OBJEXT)
+patternsolver_OBJECTS = $(am_patternsolver_OBJECTS)
+patternsolver_DEPENDENCIES = libpattern2_a-pattern.$(OBJEXT)
+am_pearl_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) \
+        ./grid.$(OBJEXT) ./gtk.$(OBJEXT) ./loopgen.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./pearl.$(OBJEXT) ./penrose.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./tdq.$(OBJEXT) ./tree234.$(OBJEXT) ./version.$(OBJEXT)
+pearl_OBJECTS = $(am_pearl_OBJECTS)
+pearl_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_pearlbench_OBJECTS = ./dsf.$(OBJEXT) ./grid.$(OBJEXT) \
+        ./loopgen.$(OBJEXT) ./malloc.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./nullfe.$(OBJEXT) ./penrose.$(OBJEXT) ./random.$(OBJEXT) \
+        ./tdq.$(OBJEXT) ./tree234.$(OBJEXT)
+pearlbench_OBJECTS = $(am_pearlbench_OBJECTS)
+pearlbench_DEPENDENCIES = libpearl2_a-pearl.$(OBJEXT)
+am_pegs_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./pegs.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./tree234.$(OBJEXT) \
+        ./version.$(OBJEXT)
+pegs_OBJECTS = $(am_pegs_OBJECTS)
+pegs_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_range_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./range.$(OBJEXT) ./version.$(OBJEXT)
+range_OBJECTS = $(am_range_OBJECTS)
+range_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_rect_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./rect.$(OBJEXT) ./version.$(OBJEXT)
+rect_OBJECTS = $(am_rect_OBJECTS)
+rect_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_samegame_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./samegame.$(OBJEXT) ./version.$(OBJEXT)
+samegame_OBJECTS = $(am_samegame_OBJECTS)
+samegame_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_signpost_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) \
+        ./gtk.$(OBJEXT) ./malloc.$(OBJEXT) ./midend.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./signpost.$(OBJEXT) \
+        ./version.$(OBJEXT)
+signpost_OBJECTS = $(am_signpost_OBJECTS)
+signpost_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_signpostsolver_OBJECTS = ./dsf.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) ./random.$(OBJEXT)
+signpostsolver_OBJECTS = $(am_signpostsolver_OBJECTS)
+signpostsolver_DEPENDENCIES = libsignpos2_a-signpost.$(OBJEXT)
+am_singles_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) \
+        ./gtk.$(OBJEXT) ./latin.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./maxflow.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./singles.$(OBJEXT) ./tree234.$(OBJEXT) \
+        ./version.$(OBJEXT)
+singles_OBJECTS = $(am_singles_OBJECTS)
+singles_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_singlessolver_OBJECTS = ./dsf.$(OBJEXT) ./latin.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./maxflow.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./nullfe.$(OBJEXT) ./random.$(OBJEXT) ./tree234.$(OBJEXT)
+singlessolver_OBJECTS = $(am_singlessolver_OBJECTS)
+singlessolver_DEPENDENCIES = libsingles3_a-singles.$(OBJEXT)
+am_sixteen_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./sixteen.$(OBJEXT) ./version.$(OBJEXT)
+sixteen_OBJECTS = $(am_sixteen_OBJECTS)
+sixteen_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_slant_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) \
+        ./findloop.$(OBJEXT) ./gtk.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./slant.$(OBJEXT) ./version.$(OBJEXT)
+slant_OBJECTS = $(am_slant_OBJECTS)
+slant_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_slantsolver_OBJECTS = ./dsf.$(OBJEXT) ./findloop.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) \
+        ./random.$(OBJEXT)
+slantsolver_OBJECTS = $(am_slantsolver_OBJECTS)
+slantsolver_DEPENDENCIES = libslant2_a-slant.$(OBJEXT)
+am_solo_OBJECTS = ./divvy.$(OBJEXT) ./drawing.$(OBJEXT) \
+        ./dsf.$(OBJEXT) ./gtk.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./solo.$(OBJEXT) ./version.$(OBJEXT)
+solo_OBJECTS = $(am_solo_OBJECTS)
+solo_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_solosolver_OBJECTS = ./divvy.$(OBJEXT) ./dsf.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) \
+        ./random.$(OBJEXT)
+solosolver_OBJECTS = $(am_solosolver_OBJECTS)
+solosolver_DEPENDENCIES = libsolo2_a-solo.$(OBJEXT)
+am_tents_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./maxflow.$(OBJEXT) ./midend.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) \
+        ./ps.$(OBJEXT) ./random.$(OBJEXT) ./tents.$(OBJEXT) \
+        ./version.$(OBJEXT)
+tents_OBJECTS = $(am_tents_OBJECTS)
+tents_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_tentssolver_OBJECTS = ./dsf.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./maxflow.$(OBJEXT) ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) \
+        ./random.$(OBJEXT)
+tentssolver_OBJECTS = $(am_tentssolver_OBJECTS)
+tentssolver_DEPENDENCIES = libtents3_a-tents.$(OBJEXT)
+am_towers_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./latin.$(OBJEXT) ./malloc.$(OBJEXT) ./maxflow.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./towers.$(OBJEXT) ./tree234.$(OBJEXT) ./version.$(OBJEXT)
+towers_OBJECTS = $(am_towers_OBJECTS)
+towers_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_towerssolver_OBJECTS = ./malloc.$(OBJEXT) ./maxflow.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) ./random.$(OBJEXT) \
+        ./tree234.$(OBJEXT)
+towerssolver_OBJECTS = $(am_towerssolver_OBJECTS)
+towerssolver_DEPENDENCIES = liblatin6_a-latin.$(OBJEXT) \
+        libtowers2_a-towers.$(OBJEXT)
+am_tracks_OBJECTS = ./drawing.$(OBJEXT) ./dsf.$(OBJEXT) \
+        ./findloop.$(OBJEXT) ./gtk.$(OBJEXT) ./malloc.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./tracks.$(OBJEXT) ./version.$(OBJEXT)
+tracks_OBJECTS = $(am_tracks_OBJECTS)
+tracks_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_twiddle_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./twiddle.$(OBJEXT) ./version.$(OBJEXT)
+twiddle_OBJECTS = $(am_twiddle_OBJECTS)
+twiddle_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_undead_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./undead.$(OBJEXT) ./version.$(OBJEXT)
+undead_OBJECTS = $(am_undead_OBJECTS)
+undead_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_unequal_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./latin.$(OBJEXT) ./malloc.$(OBJEXT) ./maxflow.$(OBJEXT) \
+        ./midend.$(OBJEXT) ./misc.$(OBJEXT) ./no-icon.$(OBJEXT) \
+        ./printing.$(OBJEXT) ./ps.$(OBJEXT) ./random.$(OBJEXT) \
+        ./tree234.$(OBJEXT) ./unequal.$(OBJEXT) ./version.$(OBJEXT)
+unequal_OBJECTS = $(am_unequal_OBJECTS)
+unequal_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_unequalsolver_OBJECTS = ./malloc.$(OBJEXT) ./maxflow.$(OBJEXT) \
+        ./misc.$(OBJEXT) ./nullfe.$(OBJEXT) ./random.$(OBJEXT) \
+        ./tree234.$(OBJEXT)
+unequalsolver_OBJECTS = $(am_unequalsolver_OBJECTS)
+unequalsolver_DEPENDENCIES = liblatin6_a-latin.$(OBJEXT) \
+        libunequal2_a-unequal.$(OBJEXT)
+am_unruly_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./unruly.$(OBJEXT) ./version.$(OBJEXT)
+unruly_OBJECTS = $(am_unruly_OBJECTS)
+unruly_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_unrulysolver_OBJECTS = ./malloc.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./nullfe.$(OBJEXT) ./random.$(OBJEXT)
+unrulysolver_OBJECTS = $(am_unrulysolver_OBJECTS)
+unrulysolver_DEPENDENCIES = libunruly2_a-unruly.$(OBJEXT)
+am_untangle_OBJECTS = ./drawing.$(OBJEXT) ./gtk.$(OBJEXT) \
+        ./malloc.$(OBJEXT) ./midend.$(OBJEXT) ./misc.$(OBJEXT) \
+        ./no-icon.$(OBJEXT) ./printing.$(OBJEXT) ./ps.$(OBJEXT) \
+        ./random.$(OBJEXT) ./tree234.$(OBJEXT) ./untangle.$(OBJEXT) \
+        ./version.$(OBJEXT)
+untangle_OBJECTS = $(am_untangle_OBJECTS)
+untangle_DEPENDENCIES = $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libfifteen2_a_SOURCES) $(libfilling2_a_SOURCES) \
+        $(libgalaxie2_a_SOURCES) $(libgalaxie4_a_SOURCES) \
+        $(libkeen2_a_SOURCES) $(liblatin6_a_SOURCES) \
+        $(liblatin8_a_SOURCES) $(liblightup2_a_SOURCES) \
+        $(libloopy2_a_SOURCES) $(libmagnets2_a_SOURCES) \
+        $(libmap2_a_SOURCES) $(libmines2_a_SOURCES) \
+        $(libpattern2_a_SOURCES) $(libpattern4_a_SOURCES) \
+        $(libpearl2_a_SOURCES) $(libsignpos2_a_SOURCES) \
+        $(libsingles3_a_SOURCES) $(libslant2_a_SOURCES) \
+        $(libsolo2_a_SOURCES) $(libtents3_a_SOURCES) \
+        $(libtowers2_a_SOURCES) $(libunequal2_a_SOURCES) \
+        $(libunruly2_a_SOURCES) $(blackbox_SOURCES) $(bridges_SOURCES) \
+        $(cube_SOURCES) $(dominosa_SOURCES) $(fifteen_SOURCES) \
+        $(fifteensolver_SOURCES) $(filling_SOURCES) \
+        $(fillingsolver_SOURCES) $(flip_SOURCES) $(flood_SOURCES) \
+        $(galaxies_SOURCES) $(galaxiespicture_SOURCES) \
+        $(galaxiessolver_SOURCES) $(guess_SOURCES) $(inertia_SOURCES) \
+        $(keen_SOURCES) $(keensolver_SOURCES) $(latincheck_SOURCES) \
+        $(lightup_SOURCES) $(lightupsolver_SOURCES) $(loopy_SOURCES) \
+        $(loopysolver_SOURCES) $(magnets_SOURCES) \
+        $(magnetssolver_SOURCES) $(map_SOURCES) $(mapsolver_SOURCES) \
+        $(mineobfusc_SOURCES) $(mines_SOURCES) $(net_SOURCES) \
+        $(netslide_SOURCES) $(nullgame_SOURCES) $(obfusc_SOURCES) \
+        $(palisade_SOURCES) $(pattern_SOURCES) \
+        $(patternpicture_SOURCES) $(patternsolver_SOURCES) \
+        $(pearl_SOURCES) $(pearlbench_SOURCES) $(pegs_SOURCES) \
+        $(range_SOURCES) $(rect_SOURCES) $(samegame_SOURCES) \
+        $(signpost_SOURCES) $(signpostsolver_SOURCES) \
+        $(singles_SOURCES) $(singlessolver_SOURCES) $(sixteen_SOURCES) \
+        $(slant_SOURCES) $(slantsolver_SOURCES) $(solo_SOURCES) \
+        $(solosolver_SOURCES) $(tents_SOURCES) $(tentssolver_SOURCES) \
+        $(towers_SOURCES) $(towerssolver_SOURCES) $(tracks_SOURCES) \
+        $(twiddle_SOURCES) $(undead_SOURCES) $(unequal_SOURCES) \
+        $(unequalsolver_SOURCES) $(unruly_SOURCES) \
+        $(unrulysolver_SOURCES) $(untangle_SOURCES)
+DIST_SOURCES = $(libfifteen2_a_SOURCES) $(libfilling2_a_SOURCES) \
+        $(libgalaxie2_a_SOURCES) $(libgalaxie4_a_SOURCES) \
+        $(libkeen2_a_SOURCES) $(liblatin6_a_SOURCES) \
+        $(liblatin8_a_SOURCES) $(liblightup2_a_SOURCES) \
+        $(libloopy2_a_SOURCES) $(libmagnets2_a_SOURCES) \
+        $(libmap2_a_SOURCES) $(libmines2_a_SOURCES) \
+        $(libpattern2_a_SOURCES) $(libpattern4_a_SOURCES) \
+        $(libpearl2_a_SOURCES) $(libsignpos2_a_SOURCES) \
+        $(libsingles3_a_SOURCES) $(libslant2_a_SOURCES) \
+        $(libsolo2_a_SOURCES) $(libtents3_a_SOURCES) \
+        $(libtowers2_a_SOURCES) $(libunequal2_a_SOURCES) \
+        $(libunruly2_a_SOURCES) $(blackbox_SOURCES) $(bridges_SOURCES) \
+        $(cube_SOURCES) $(dominosa_SOURCES) $(fifteen_SOURCES) \
+        $(fifteensolver_SOURCES) $(filling_SOURCES) \
+        $(fillingsolver_SOURCES) $(flip_SOURCES) $(flood_SOURCES) \
+        $(galaxies_SOURCES) $(galaxiespicture_SOURCES) \
+        $(galaxiessolver_SOURCES) $(guess_SOURCES) $(inertia_SOURCES) \
+        $(keen_SOURCES) $(keensolver_SOURCES) $(latincheck_SOURCES) \
+        $(lightup_SOURCES) $(lightupsolver_SOURCES) $(loopy_SOURCES) \
+        $(loopysolver_SOURCES) $(magnets_SOURCES) \
+        $(magnetssolver_SOURCES) $(map_SOURCES) $(mapsolver_SOURCES) \
+        $(mineobfusc_SOURCES) $(mines_SOURCES) $(net_SOURCES) \
+        $(netslide_SOURCES) $(nullgame_SOURCES) $(obfusc_SOURCES) \
+        $(palisade_SOURCES) $(pattern_SOURCES) \
+        $(patternpicture_SOURCES) $(patternsolver_SOURCES) \
+        $(pearl_SOURCES) $(pearlbench_SOURCES) $(pegs_SOURCES) \
+        $(range_SOURCES) $(rect_SOURCES) $(samegame_SOURCES) \
+        $(signpost_SOURCES) $(signpostsolver_SOURCES) \
+        $(singles_SOURCES) $(singlessolver_SOURCES) $(sixteen_SOURCES) \
+        $(slant_SOURCES) $(slantsolver_SOURCES) $(solo_SOURCES) \
+        $(solosolver_SOURCES) $(tents_SOURCES) $(tentssolver_SOURCES) \
+        $(towers_SOURCES) $(towerssolver_SOURCES) $(tracks_SOURCES) \
+        $(twiddle_SOURCES) $(undead_SOURCES) $(unequal_SOURCES) \
+        $(unequalsolver_SOURCES) $(unruly_SOURCES) \
+        $(unrulysolver_SOURCES) $(untangle_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+AM_RECURSIVE_TARGETS = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in README compile depcomp \
+        install-sh missing
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EXEEXT = @EXEEXT@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+GAMES = blackbox bridges cube dominosa fifteen filling flip flood \
+        galaxies guess inertia keen lightup loopy magnets map mines \
+        net netslide palisade pattern pearl pegs range rect samegame \
+        signpost singles sixteen slant solo tents towers tracks \
+        twiddle undead unequal unruly untangle
+AUTOMAKE_OPTIONS = subdir-objects
+allsources = ./blackbox.c ./bridges.c ./combi.c ./cube.c ./divvy.c \
+                ./dominosa.c ./drawing.c ./dsf.c ./fifteen.c ./filling.c \
+                ./findloop.c ./flip.c ./flood.c ./galaxies.c ./grid.c \
+                ./grid.h ./gtk.c ./guess.c ./inertia.c ./keen.c ./latin.c \
+                ./latin.h ./laydomino.c ./lightup.c ./list.c ./loopgen.c \
+                ./loopgen.h ./loopy.c ./magnets.c ./malloc.c ./map.c \
+                ./maxflow.c ./maxflow.h ./midend.c ./mines.c ./misc.c \
+                ./net.c ./netslide.c ./no-icon.c ./nullfe.c ./nullgame.c \
+                ./obfusc.c ./osx.m ./palisade.c ./pattern.c ./pearl.c \
+                ./pegs.c ./penrose.c ./penrose.h ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./range.c ./rect.c ./resource.h \
+                ./samegame.c ./signpost.c ./singles.c ./sixteen.c ./slant.c \
+                ./solo.c ./tdq.c ./tents.c ./towers.c ./tracks.c ./tree234.c \
+                ./tree234.h ./twiddle.c ./undead.c ./unequal.c ./unruly.c \
+                ./untangle.c ./version.c ./version.h ./windows.c
+
+AM_CPPFLAGS = -I$(srcdir)/./ -I$(srcdir)/icons/ 
+AM_CFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)
+blackbox_SOURCES = ./blackbox.c ./drawing.c ./gtk.c ./malloc.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+
+blackbox_LDADD = $(GTK_LIBS) -lm
+bridges_SOURCES = ./bridges.c ./drawing.c ./dsf.c ./findloop.c ./gtk.c \
+                ./malloc.c ./midend.c ./misc.c ./no-icon.c ./printing.c \
+                ./ps.c ./puzzles.h ./random.c ./version.c ./version.h
+
+bridges_LDADD = $(GTK_LIBS) -lm
+cube_SOURCES = ./cube.c ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./version.c ./version.h
+
+cube_LDADD = $(GTK_LIBS) -lm
+dominosa_SOURCES = ./dominosa.c ./drawing.c ./gtk.c ./laydomino.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./version.c ./version.h
+
+dominosa_LDADD = $(GTK_LIBS) -lm
+fifteen_SOURCES = ./drawing.c ./fifteen.c ./gtk.c ./malloc.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+
+fifteen_LDADD = $(GTK_LIBS) -lm
+fifteensolver_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+
+fifteensolver_LDADD = libfifteen2_a-fifteen.$(OBJEXT) -lm
+filling_SOURCES = ./drawing.c ./dsf.c ./filling.c ./gtk.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./version.c ./version.h
+
+filling_LDADD = $(GTK_LIBS) -lm
+fillingsolver_SOURCES = ./dsf.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+
+fillingsolver_LDADD = libfilling2_a-filling.$(OBJEXT) -lm
+flip_SOURCES = ./drawing.c ./flip.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h ./version.c ./version.h
+
+flip_LDADD = $(GTK_LIBS) -lm
+flood_SOURCES = ./drawing.c ./flood.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./version.c ./version.h
+
+flood_LDADD = $(GTK_LIBS) -lm
+galaxies_SOURCES = ./drawing.c ./dsf.c ./galaxies.c ./gtk.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./version.c ./version.h
+
+galaxies_LDADD = $(GTK_LIBS) -lm
+galaxiespicture_SOURCES = ./dsf.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+
+galaxiespicture_LDADD = libgalaxie4_a-galaxies.$(OBJEXT) -lm
+galaxiessolver_SOURCES = ./dsf.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+
+galaxiessolver_LDADD = libgalaxie2_a-galaxies.$(OBJEXT) -lm
+guess_SOURCES = ./drawing.c ./gtk.c ./guess.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./version.c ./version.h
+
+guess_LDADD = $(GTK_LIBS) -lm
+inertia_SOURCES = ./drawing.c ./gtk.c ./inertia.c ./malloc.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+
+inertia_LDADD = $(GTK_LIBS) -lm
+keen_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./keen.c ./latin.c ./latin.h \
+                ./malloc.c ./maxflow.c ./maxflow.h ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h ./version.c ./version.h
+
+keen_LDADD = $(GTK_LIBS) -lm
+keensolver_SOURCES = ./dsf.c ./malloc.c ./maxflow.c ./maxflow.h ./misc.c \
+                ./nullfe.c ./puzzles.h ./random.c ./tree234.c ./tree234.h
+
+keensolver_LDADD = libkeen2_a-keen.$(OBJEXT) liblatin6_a-latin.$(OBJEXT) -lm
+latincheck_SOURCES = ./malloc.c ./maxflow.c ./maxflow.h ./misc.c ./nullfe.c \
+                ./puzzles.h ./random.c ./tree234.c ./tree234.h
+
+latincheck_LDADD = liblatin8_a-latin.$(OBJEXT) -lm
+lightup_SOURCES = ./combi.c ./drawing.c ./gtk.c ./lightup.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./version.c ./version.h
+
+lightup_LDADD = $(GTK_LIBS) -lm
+lightupsolver_SOURCES = ./combi.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+
+lightupsolver_LDADD = liblightup2_a-lightup.$(OBJEXT) -lm
+loopy_SOURCES = ./drawing.c ./dsf.c ./grid.c ./grid.h ./gtk.c ./loopgen.c \
+                ./loopgen.h ./loopy.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./penrose.c ./penrose.h ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./tree234.c ./tree234.h ./version.c \
+                ./version.h
+
+loopy_LDADD = $(GTK_LIBS) -lm
+loopysolver_SOURCES = ./dsf.c ./grid.c ./grid.h ./loopgen.c ./loopgen.h \
+                ./malloc.c ./misc.c ./nullfe.c ./penrose.c ./penrose.h \
+                ./puzzles.h ./random.c ./tree234.c ./tree234.h
+
+loopysolver_LDADD = libloopy2_a-loopy.$(OBJEXT) -lm
+magnets_SOURCES = ./drawing.c ./gtk.c ./laydomino.c ./magnets.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./version.c ./version.h
+
+magnets_LDADD = $(GTK_LIBS) -lm
+magnetssolver_SOURCES = ./laydomino.c ./malloc.c ./misc.c ./nullfe.c \
+                ./puzzles.h ./random.c
+
+magnetssolver_LDADD = libmagnets2_a-magnets.$(OBJEXT) -lm
+map_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./malloc.c ./map.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+
+map_LDADD = $(GTK_LIBS) -lm
+mapsolver_SOURCES = ./dsf.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+
+mapsolver_LDADD = libmap2_a-map.$(OBJEXT) -lm
+mineobfusc_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h
+
+mineobfusc_LDADD = libmines2_a-mines.$(OBJEXT) -lm
+mines_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./mines.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h ./version.c ./version.h
+
+mines_LDADD = $(GTK_LIBS) -lm
+net_SOURCES = ./drawing.c ./dsf.c ./findloop.c ./gtk.c ./malloc.c ./midend.c \
+                ./misc.c ./net.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./tree234.c ./tree234.h ./version.c ./version.h
+
+net_LDADD = $(GTK_LIBS) -lm
+netslide_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./netslide.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./tree234.c ./tree234.h ./version.c ./version.h
+
+netslide_LDADD = $(GTK_LIBS) -lm
+nullgame_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./nullgame.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+
+nullgame_LDADD = $(GTK_LIBS) -lm
+obfusc_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./obfusc.c ./puzzles.h \
+                ./random.c
+
+obfusc_LDADD = -lm
+palisade_SOURCES = ./divvy.c ./drawing.c ./dsf.c ./gtk.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./palisade.c ./printing.c \
+                ./ps.c ./puzzles.h ./random.c ./version.c ./version.h
+
+palisade_LDADD = $(GTK_LIBS) -lm
+pattern_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./pattern.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./version.c ./version.h
+
+pattern_LDADD = $(GTK_LIBS) -lm
+patternpicture_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+
+patternpicture_LDADD = libpattern4_a-pattern.$(OBJEXT) -lm
+patternsolver_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+
+patternsolver_LDADD = libpattern2_a-pattern.$(OBJEXT) -lm
+pearl_SOURCES = ./drawing.c ./dsf.c ./grid.c ./grid.h ./gtk.c ./loopgen.c \
+                ./loopgen.h ./malloc.c ./midend.c ./misc.c ./no-icon.c \
+                ./pearl.c ./penrose.c ./penrose.h ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./tdq.c ./tree234.c ./tree234.h \
+                ./version.c ./version.h
+
+pearl_LDADD = $(GTK_LIBS) -lm
+pearlbench_SOURCES = ./dsf.c ./grid.c ./grid.h ./loopgen.c ./loopgen.h \
+                ./malloc.c ./misc.c ./nullfe.c ./penrose.c ./penrose.h \
+                ./puzzles.h ./random.c ./tdq.c ./tree234.c ./tree234.h
+
+pearlbench_LDADD = libpearl2_a-pearl.$(OBJEXT) -lm
+pegs_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./pegs.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./tree234.c ./tree234.h ./version.c ./version.h
+
+pegs_LDADD = $(GTK_LIBS) -lm
+range_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./range.c ./version.c ./version.h
+
+range_LDADD = $(GTK_LIBS) -lm
+rect_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./rect.c ./version.c ./version.h
+
+rect_LDADD = $(GTK_LIBS) -lm
+samegame_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./samegame.c ./version.c ./version.h
+
+samegame_LDADD = $(GTK_LIBS) -lm
+signpost_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./malloc.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./signpost.c ./version.c ./version.h
+
+signpost_LDADD = $(GTK_LIBS) -lm
+signpostsolver_SOURCES = ./dsf.c ./malloc.c ./misc.c ./nullfe.c ./puzzles.h \
+                ./random.c
+
+signpostsolver_LDADD = libsignpos2_a-signpost.$(OBJEXT) -lm
+singles_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./latin.c ./latin.h ./malloc.c \
+                ./maxflow.c ./maxflow.h ./midend.c ./misc.c ./no-icon.c \
+                ./printing.c ./ps.c ./puzzles.h ./random.c ./singles.c \
+                ./tree234.c ./tree234.h ./version.c ./version.h
+
+singles_LDADD = $(GTK_LIBS) -lm
+singlessolver_SOURCES = ./dsf.c ./latin.c ./latin.h ./malloc.c ./maxflow.c \
+                ./maxflow.h ./misc.c ./nullfe.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h
+
+singlessolver_LDADD = libsingles3_a-singles.$(OBJEXT) -lm
+sixteen_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./sixteen.c ./version.c ./version.h
+
+sixteen_LDADD = $(GTK_LIBS) -lm
+slant_SOURCES = ./drawing.c ./dsf.c ./findloop.c ./gtk.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./slant.c ./version.c ./version.h
+
+slant_LDADD = $(GTK_LIBS) -lm
+slantsolver_SOURCES = ./dsf.c ./findloop.c ./malloc.c ./misc.c ./nullfe.c \
+                ./puzzles.h ./random.c
+
+slantsolver_LDADD = libslant2_a-slant.$(OBJEXT) -lm
+solo_SOURCES = ./divvy.c ./drawing.c ./dsf.c ./gtk.c ./malloc.c ./midend.c \
+                ./misc.c ./no-icon.c ./printing.c ./ps.c ./puzzles.h \
+                ./random.c ./solo.c ./version.c ./version.h
+
+solo_LDADD = $(GTK_LIBS) -lm
+solosolver_SOURCES = ./divvy.c ./dsf.c ./malloc.c ./misc.c ./nullfe.c \
+                ./puzzles.h ./random.c
+
+solosolver_LDADD = libsolo2_a-solo.$(OBJEXT) -lm
+tents_SOURCES = ./drawing.c ./dsf.c ./gtk.c ./malloc.c ./maxflow.c \
+                ./maxflow.h ./midend.c ./misc.c ./no-icon.c ./printing.c \
+                ./ps.c ./puzzles.h ./random.c ./tents.c ./version.c \
+                ./version.h
+
+tents_LDADD = $(GTK_LIBS) -lm
+tentssolver_SOURCES = ./dsf.c ./malloc.c ./maxflow.c ./maxflow.h ./misc.c \
+                ./nullfe.c ./puzzles.h ./random.c
+
+tentssolver_LDADD = libtents3_a-tents.$(OBJEXT) -lm
+towers_SOURCES = ./drawing.c ./gtk.c ./latin.c ./latin.h ./malloc.c \
+                ./maxflow.c ./maxflow.h ./midend.c ./misc.c ./no-icon.c \
+                ./printing.c ./ps.c ./puzzles.h ./random.c ./towers.c \
+                ./tree234.c ./tree234.h ./version.c ./version.h
+
+towers_LDADD = $(GTK_LIBS) -lm
+towerssolver_SOURCES = ./malloc.c ./maxflow.c ./maxflow.h ./misc.c \
+                ./nullfe.c ./puzzles.h ./random.c ./tree234.c ./tree234.h
+
+towerssolver_LDADD = liblatin6_a-latin.$(OBJEXT) \
+                libtowers2_a-towers.$(OBJEXT) -lm
+
+tracks_SOURCES = ./drawing.c ./dsf.c ./findloop.c ./gtk.c ./malloc.c \
+                ./midend.c ./misc.c ./no-icon.c ./printing.c ./ps.c \
+                ./puzzles.h ./random.c ./tracks.c ./version.c ./version.h
+
+tracks_LDADD = $(GTK_LIBS) -lm
+twiddle_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./twiddle.c ./version.c ./version.h
+
+twiddle_LDADD = $(GTK_LIBS) -lm
+undead_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./undead.c ./version.c ./version.h
+
+undead_LDADD = $(GTK_LIBS) -lm
+unequal_SOURCES = ./drawing.c ./gtk.c ./latin.c ./latin.h ./malloc.c \
+                ./maxflow.c ./maxflow.h ./midend.c ./misc.c ./no-icon.c \
+                ./printing.c ./ps.c ./puzzles.h ./random.c ./tree234.c \
+                ./tree234.h ./unequal.c ./version.c ./version.h
+
+unequal_LDADD = $(GTK_LIBS) -lm
+unequalsolver_SOURCES = ./malloc.c ./maxflow.c ./maxflow.h ./misc.c \
+                ./nullfe.c ./puzzles.h ./random.c ./tree234.c ./tree234.h
+
+unequalsolver_LDADD = liblatin6_a-latin.$(OBJEXT) \
+                libunequal2_a-unequal.$(OBJEXT) -lm
+
+unruly_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./unruly.c ./version.c ./version.h
+
+unruly_LDADD = $(GTK_LIBS) -lm
+unrulysolver_SOURCES = ./malloc.c ./misc.c ./nullfe.c ./puzzles.h ./random.c
+unrulysolver_LDADD = libunruly2_a-unruly.$(OBJEXT) -lm
+untangle_SOURCES = ./drawing.c ./gtk.c ./malloc.c ./midend.c ./misc.c \
+                ./no-icon.c ./printing.c ./ps.c ./puzzles.h ./random.c \
+                ./tree234.c ./tree234.h ./untangle.c ./version.c ./version.h
+
+untangle_LDADD = $(GTK_LIBS) -lm
+libfifteen2_a_SOURCES = ./fifteen.c ./puzzles.h
+libfifteen2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libfilling2_a_SOURCES = ./filling.c ./puzzles.h
+libfilling2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libgalaxie2_a_SOURCES = ./galaxies.c ./puzzles.h
+libgalaxie2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libgalaxie4_a_SOURCES = ./galaxies.c ./puzzles.h
+libgalaxie4_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  \
+                -DSTANDALONE_PICTURE_GENERATOR
+
+libkeen2_a_SOURCES = ./keen.c ./puzzles.h ./latin.h
+libkeen2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+liblatin6_a_SOURCES = ./latin.c ./puzzles.h ./tree234.h ./maxflow.h \
+                ./latin.h
+
+liblatin6_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+liblatin8_a_SOURCES = ./latin.c ./puzzles.h ./tree234.h ./maxflow.h \
+                ./latin.h
+
+liblatin8_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_LATIN_TEST
+liblightup2_a_SOURCES = ./lightup.c ./puzzles.h
+liblightup2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libloopy2_a_SOURCES = ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+libloopy2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libmagnets2_a_SOURCES = ./magnets.c ./puzzles.h
+libmagnets2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libmap2_a_SOURCES = ./map.c ./puzzles.h
+libmap2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libmines2_a_SOURCES = ./mines.c ./tree234.h ./puzzles.h
+libmines2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_OBFUSCATOR
+libpattern2_a_SOURCES = ./pattern.c ./puzzles.h
+libpattern2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libpattern4_a_SOURCES = ./pattern.c ./puzzles.h
+libpattern4_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  \
+                -DSTANDALONE_PICTURE_GENERATOR
+
+libpearl2_a_SOURCES = ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+libpearl2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libsignpos2_a_SOURCES = ./signpost.c ./puzzles.h
+libsignpos2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libsingles3_a_SOURCES = ./singles.c ./puzzles.h ./latin.h
+libsingles3_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libslant2_a_SOURCES = ./slant.c ./puzzles.h
+libslant2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libsolo2_a_SOURCES = ./solo.c ./puzzles.h
+libsolo2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libtents3_a_SOURCES = ./tents.c ./puzzles.h ./maxflow.h
+libtents3_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libtowers2_a_SOURCES = ./towers.c ./puzzles.h ./latin.h
+libtowers2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libunequal2_a_SOURCES = ./unequal.c ./puzzles.h ./latin.h
+libunequal2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+libunruly2_a_SOURCES = ./unruly.c ./puzzles.h
+libunruly2_a_CPPFLAGS = $(GTK_CFLAGS) $(WARNINGOPTS)  -DSTANDALONE_SOLVER
+noinst_LIBRARIES = libfifteen2.a libfilling2.a libgalaxie2.a libgalaxie4.a \
+                libkeen2.a liblatin6.a liblatin8.a liblightup2.a libloopy2.a \
+                libmagnets2.a libmap2.a libmines2.a libpattern2.a \
+                libpattern4.a libpearl2.a libsignpos2.a libsingles3.a \
+                libslant2.a libsolo2.a libtents3.a libtowers2.a \
+                libunequal2.a libunruly2.a
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+am--refresh: Makefile
+        @:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+        @for dep in $?; do \
+          case '$(am__configure_deps)' in \
+            *$$dep*) \
+              echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+              $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+                && exit 0; \
+              exit 1;; \
+          esac; \
+        done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+        $(am__cd) $(top_srcdir) && \
+          $(AUTOMAKE) --foreign Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+        @case '$?' in \
+          *config.status*) \
+            echo ' $(SHELL) ./config.status'; \
+            $(SHELL) ./config.status;; \
+          *) \
+            echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+            cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+        esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+        $(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+        $(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+clean-noinstLIBRARIES:
+        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+./$(am__dirstamp):
+        @$(MKDIR_P) .
+        @: > ./$(am__dirstamp)
+$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) ./$(DEPDIR)
+        @: > $(DEPDIR)/$(am__dirstamp)
+./libfifteen2_a-fifteen.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libfifteen2.a: $(libfifteen2_a_OBJECTS) $(libfifteen2_a_DEPENDENCIES) $(EXTRA_libfifteen2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libfifteen2.a
+        $(AM_V_AR)$(libfifteen2_a_AR) libfifteen2.a $(libfifteen2_a_OBJECTS) $(libfifteen2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libfifteen2.a
+./libfilling2_a-filling.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libfilling2.a: $(libfilling2_a_OBJECTS) $(libfilling2_a_DEPENDENCIES) $(EXTRA_libfilling2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libfilling2.a
+        $(AM_V_AR)$(libfilling2_a_AR) libfilling2.a $(libfilling2_a_OBJECTS) $(libfilling2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libfilling2.a
+./libgalaxie2_a-galaxies.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libgalaxie2.a: $(libgalaxie2_a_OBJECTS) $(libgalaxie2_a_DEPENDENCIES) $(EXTRA_libgalaxie2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libgalaxie2.a
+        $(AM_V_AR)$(libgalaxie2_a_AR) libgalaxie2.a $(libgalaxie2_a_OBJECTS) $(libgalaxie2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libgalaxie2.a
+./libgalaxie4_a-galaxies.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libgalaxie4.a: $(libgalaxie4_a_OBJECTS) $(libgalaxie4_a_DEPENDENCIES) $(EXTRA_libgalaxie4_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libgalaxie4.a
+        $(AM_V_AR)$(libgalaxie4_a_AR) libgalaxie4.a $(libgalaxie4_a_OBJECTS) $(libgalaxie4_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libgalaxie4.a
+./libkeen2_a-keen.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libkeen2.a: $(libkeen2_a_OBJECTS) $(libkeen2_a_DEPENDENCIES) $(EXTRA_libkeen2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libkeen2.a
+        $(AM_V_AR)$(libkeen2_a_AR) libkeen2.a $(libkeen2_a_OBJECTS) $(libkeen2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libkeen2.a
+./liblatin6_a-latin.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+liblatin6.a: $(liblatin6_a_OBJECTS) $(liblatin6_a_DEPENDENCIES) $(EXTRA_liblatin6_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f liblatin6.a
+        $(AM_V_AR)$(liblatin6_a_AR) liblatin6.a $(liblatin6_a_OBJECTS) $(liblatin6_a_LIBADD)
+        $(AM_V_at)$(RANLIB) liblatin6.a
+./liblatin8_a-latin.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+liblatin8.a: $(liblatin8_a_OBJECTS) $(liblatin8_a_DEPENDENCIES) $(EXTRA_liblatin8_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f liblatin8.a
+        $(AM_V_AR)$(liblatin8_a_AR) liblatin8.a $(liblatin8_a_OBJECTS) $(liblatin8_a_LIBADD)
+        $(AM_V_at)$(RANLIB) liblatin8.a
+./liblightup2_a-lightup.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+liblightup2.a: $(liblightup2_a_OBJECTS) $(liblightup2_a_DEPENDENCIES) $(EXTRA_liblightup2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f liblightup2.a
+        $(AM_V_AR)$(liblightup2_a_AR) liblightup2.a $(liblightup2_a_OBJECTS) $(liblightup2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) liblightup2.a
+./libloopy2_a-loopy.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libloopy2.a: $(libloopy2_a_OBJECTS) $(libloopy2_a_DEPENDENCIES) $(EXTRA_libloopy2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libloopy2.a
+        $(AM_V_AR)$(libloopy2_a_AR) libloopy2.a $(libloopy2_a_OBJECTS) $(libloopy2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libloopy2.a
+./libmagnets2_a-magnets.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libmagnets2.a: $(libmagnets2_a_OBJECTS) $(libmagnets2_a_DEPENDENCIES) $(EXTRA_libmagnets2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libmagnets2.a
+        $(AM_V_AR)$(libmagnets2_a_AR) libmagnets2.a $(libmagnets2_a_OBJECTS) $(libmagnets2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libmagnets2.a
+./libmap2_a-map.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+libmap2.a: $(libmap2_a_OBJECTS) $(libmap2_a_DEPENDENCIES) $(EXTRA_libmap2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libmap2.a
+        $(AM_V_AR)$(libmap2_a_AR) libmap2.a $(libmap2_a_OBJECTS) $(libmap2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libmap2.a
+./libmines2_a-mines.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libmines2.a: $(libmines2_a_OBJECTS) $(libmines2_a_DEPENDENCIES) $(EXTRA_libmines2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libmines2.a
+        $(AM_V_AR)$(libmines2_a_AR) libmines2.a $(libmines2_a_OBJECTS) $(libmines2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libmines2.a
+./libpattern2_a-pattern.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libpattern2.a: $(libpattern2_a_OBJECTS) $(libpattern2_a_DEPENDENCIES) $(EXTRA_libpattern2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libpattern2.a
+        $(AM_V_AR)$(libpattern2_a_AR) libpattern2.a $(libpattern2_a_OBJECTS) $(libpattern2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libpattern2.a
+./libpattern4_a-pattern.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libpattern4.a: $(libpattern4_a_OBJECTS) $(libpattern4_a_DEPENDENCIES) $(EXTRA_libpattern4_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libpattern4.a
+        $(AM_V_AR)$(libpattern4_a_AR) libpattern4.a $(libpattern4_a_OBJECTS) $(libpattern4_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libpattern4.a
+./libpearl2_a-pearl.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libpearl2.a: $(libpearl2_a_OBJECTS) $(libpearl2_a_DEPENDENCIES) $(EXTRA_libpearl2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libpearl2.a
+        $(AM_V_AR)$(libpearl2_a_AR) libpearl2.a $(libpearl2_a_OBJECTS) $(libpearl2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libpearl2.a
+./libsignpos2_a-signpost.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libsignpos2.a: $(libsignpos2_a_OBJECTS) $(libsignpos2_a_DEPENDENCIES) $(EXTRA_libsignpos2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libsignpos2.a
+        $(AM_V_AR)$(libsignpos2_a_AR) libsignpos2.a $(libsignpos2_a_OBJECTS) $(libsignpos2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libsignpos2.a
+./libsingles3_a-singles.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libsingles3.a: $(libsingles3_a_OBJECTS) $(libsingles3_a_DEPENDENCIES) $(EXTRA_libsingles3_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libsingles3.a
+        $(AM_V_AR)$(libsingles3_a_AR) libsingles3.a $(libsingles3_a_OBJECTS) $(libsingles3_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libsingles3.a
+./libslant2_a-slant.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libslant2.a: $(libslant2_a_OBJECTS) $(libslant2_a_DEPENDENCIES) $(EXTRA_libslant2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libslant2.a
+        $(AM_V_AR)$(libslant2_a_AR) libslant2.a $(libslant2_a_OBJECTS) $(libslant2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libslant2.a
+./libsolo2_a-solo.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libsolo2.a: $(libsolo2_a_OBJECTS) $(libsolo2_a_DEPENDENCIES) $(EXTRA_libsolo2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libsolo2.a
+        $(AM_V_AR)$(libsolo2_a_AR) libsolo2.a $(libsolo2_a_OBJECTS) $(libsolo2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libsolo2.a
+./libtents3_a-tents.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libtents3.a: $(libtents3_a_OBJECTS) $(libtents3_a_DEPENDENCIES) $(EXTRA_libtents3_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libtents3.a
+        $(AM_V_AR)$(libtents3_a_AR) libtents3.a $(libtents3_a_OBJECTS) $(libtents3_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libtents3.a
+./libtowers2_a-towers.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libtowers2.a: $(libtowers2_a_OBJECTS) $(libtowers2_a_DEPENDENCIES) $(EXTRA_libtowers2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libtowers2.a
+        $(AM_V_AR)$(libtowers2_a_AR) libtowers2.a $(libtowers2_a_OBJECTS) $(libtowers2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libtowers2.a
+./libunequal2_a-unequal.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libunequal2.a: $(libunequal2_a_OBJECTS) $(libunequal2_a_DEPENDENCIES) $(EXTRA_libunequal2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libunequal2.a
+        $(AM_V_AR)$(libunequal2_a_AR) libunequal2.a $(libunequal2_a_OBJECTS) $(libunequal2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libunequal2.a
+./libunruly2_a-unruly.$(OBJEXT): ./$(am__dirstamp) \
+        $(DEPDIR)/$(am__dirstamp)
+
+libunruly2.a: $(libunruly2_a_OBJECTS) $(libunruly2_a_DEPENDENCIES) $(EXTRA_libunruly2_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libunruly2.a
+        $(AM_V_AR)$(libunruly2_a_AR) libunruly2.a $(libunruly2_a_OBJECTS) $(libunruly2_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libunruly2.a
+install-binPROGRAMS: $(bin_PROGRAMS)
+        @$(NORMAL_INSTALL)
+        @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+        if test -n "$$list"; then \
+          echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+          $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+        fi; \
+        for p in $$list; do echo "$$p $$p"; done | \
+        sed 's/$(EXEEXT)$$//' | \
+        while read p p1; do if test -f $$p \
+          ; then echo "$$p"; echo "$$p"; else :; fi; \
+        done | \
+        sed -e 'p;s,.*/,,;n;h' \
+            -e 's|.*|.|' \
+            -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+        sed 'N;N;N;s,\n, ,g' | \
+        $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+          { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+            if ($$2 == $$4) files[d] = files[d] " " $$1; \
+            else { print "f", $$3 "/" $$4, $$1; } } \
+          END { for (d in files) print "f", d, files[d] }' | \
+        while read type dir files; do \
+            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+            test -z "$$files" || { \
+              echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+              $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+            } \
+        ; done
+
+uninstall-binPROGRAMS:
+        @$(NORMAL_UNINSTALL)
+        @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+        files=`for p in $$list; do echo "$$p"; done | \
+          sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+              -e 's/$$/$(EXEEXT)/' \
+        `; \
+        test -n "$$list" || exit 0; \
+        echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+        cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+        -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+clean-noinstPROGRAMS:
+        -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+./blackbox.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./drawing.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./gtk.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./malloc.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./midend.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./misc.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./no-icon.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./printing.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./ps.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./random.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./version.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+blackbox$(EXEEXT): $(blackbox_OBJECTS) $(blackbox_DEPENDENCIES) $(EXTRA_blackbox_DEPENDENCIES) 
+        @rm -f blackbox$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(blackbox_OBJECTS) $(blackbox_LDADD) $(LIBS)
+./bridges.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./dsf.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./findloop.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+bridges$(EXEEXT): $(bridges_OBJECTS) $(bridges_DEPENDENCIES) $(EXTRA_bridges_DEPENDENCIES) 
+        @rm -f bridges$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(bridges_OBJECTS) $(bridges_LDADD) $(LIBS)
+./cube.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+cube$(EXEEXT): $(cube_OBJECTS) $(cube_DEPENDENCIES) $(EXTRA_cube_DEPENDENCIES) 
+        @rm -f cube$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(cube_OBJECTS) $(cube_LDADD) $(LIBS)
+./dominosa.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./laydomino.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+dominosa$(EXEEXT): $(dominosa_OBJECTS) $(dominosa_DEPENDENCIES) $(EXTRA_dominosa_DEPENDENCIES) 
+        @rm -f dominosa$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(dominosa_OBJECTS) $(dominosa_LDADD) $(LIBS)
+./fifteen.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+fifteen$(EXEEXT): $(fifteen_OBJECTS) $(fifteen_DEPENDENCIES) $(EXTRA_fifteen_DEPENDENCIES) 
+        @rm -f fifteen$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(fifteen_OBJECTS) $(fifteen_LDADD) $(LIBS)
+./nullfe.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+fifteensolver$(EXEEXT): $(fifteensolver_OBJECTS) $(fifteensolver_DEPENDENCIES) $(EXTRA_fifteensolver_DEPENDENCIES) 
+        @rm -f fifteensolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(fifteensolver_OBJECTS) $(fifteensolver_LDADD) $(LIBS)
+./filling.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+filling$(EXEEXT): $(filling_OBJECTS) $(filling_DEPENDENCIES) $(EXTRA_filling_DEPENDENCIES) 
+        @rm -f filling$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(filling_OBJECTS) $(filling_LDADD) $(LIBS)
+
+fillingsolver$(EXEEXT): $(fillingsolver_OBJECTS) $(fillingsolver_DEPENDENCIES) $(EXTRA_fillingsolver_DEPENDENCIES) 
+        @rm -f fillingsolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(fillingsolver_OBJECTS) $(fillingsolver_LDADD) $(LIBS)
+./flip.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./tree234.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+flip$(EXEEXT): $(flip_OBJECTS) $(flip_DEPENDENCIES) $(EXTRA_flip_DEPENDENCIES) 
+        @rm -f flip$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(flip_OBJECTS) $(flip_LDADD) $(LIBS)
+./flood.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+flood$(EXEEXT): $(flood_OBJECTS) $(flood_DEPENDENCIES) $(EXTRA_flood_DEPENDENCIES) 
+        @rm -f flood$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(flood_OBJECTS) $(flood_LDADD) $(LIBS)
+./galaxies.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+galaxies$(EXEEXT): $(galaxies_OBJECTS) $(galaxies_DEPENDENCIES) $(EXTRA_galaxies_DEPENDENCIES) 
+        @rm -f galaxies$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(galaxies_OBJECTS) $(galaxies_LDADD) $(LIBS)
+
+galaxiespicture$(EXEEXT): $(galaxiespicture_OBJECTS) $(galaxiespicture_DEPENDENCIES) $(EXTRA_galaxiespicture_DEPENDENCIES) 
+        @rm -f galaxiespicture$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(galaxiespicture_OBJECTS) $(galaxiespicture_LDADD) $(LIBS)
+
+galaxiessolver$(EXEEXT): $(galaxiessolver_OBJECTS) $(galaxiessolver_DEPENDENCIES) $(EXTRA_galaxiessolver_DEPENDENCIES) 
+        @rm -f galaxiessolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(galaxiessolver_OBJECTS) $(galaxiessolver_LDADD) $(LIBS)
+./guess.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+guess$(EXEEXT): $(guess_OBJECTS) $(guess_DEPENDENCIES) $(EXTRA_guess_DEPENDENCIES) 
+        @rm -f guess$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(guess_OBJECTS) $(guess_LDADD) $(LIBS)
+./inertia.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+inertia$(EXEEXT): $(inertia_OBJECTS) $(inertia_DEPENDENCIES) $(EXTRA_inertia_DEPENDENCIES) 
+        @rm -f inertia$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(inertia_OBJECTS) $(inertia_LDADD) $(LIBS)
+./keen.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./latin.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./maxflow.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+keen$(EXEEXT): $(keen_OBJECTS) $(keen_DEPENDENCIES) $(EXTRA_keen_DEPENDENCIES) 
+        @rm -f keen$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(keen_OBJECTS) $(keen_LDADD) $(LIBS)
+
+keensolver$(EXEEXT): $(keensolver_OBJECTS) $(keensolver_DEPENDENCIES) $(EXTRA_keensolver_DEPENDENCIES) 
+        @rm -f keensolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(keensolver_OBJECTS) $(keensolver_LDADD) $(LIBS)
+
+latincheck$(EXEEXT): $(latincheck_OBJECTS) $(latincheck_DEPENDENCIES) $(EXTRA_latincheck_DEPENDENCIES) 
+        @rm -f latincheck$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(latincheck_OBJECTS) $(latincheck_LDADD) $(LIBS)
+./combi.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./lightup.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+lightup$(EXEEXT): $(lightup_OBJECTS) $(lightup_DEPENDENCIES) $(EXTRA_lightup_DEPENDENCIES) 
+        @rm -f lightup$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(lightup_OBJECTS) $(lightup_LDADD) $(LIBS)
+
+lightupsolver$(EXEEXT): $(lightupsolver_OBJECTS) $(lightupsolver_DEPENDENCIES) $(EXTRA_lightupsolver_DEPENDENCIES) 
+        @rm -f lightupsolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(lightupsolver_OBJECTS) $(lightupsolver_LDADD) $(LIBS)
+./grid.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./loopgen.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./loopy.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./penrose.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+loopy$(EXEEXT): $(loopy_OBJECTS) $(loopy_DEPENDENCIES) $(EXTRA_loopy_DEPENDENCIES) 
+        @rm -f loopy$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(loopy_OBJECTS) $(loopy_LDADD) $(LIBS)
+
+loopysolver$(EXEEXT): $(loopysolver_OBJECTS) $(loopysolver_DEPENDENCIES) $(EXTRA_loopysolver_DEPENDENCIES) 
+        @rm -f loopysolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(loopysolver_OBJECTS) $(loopysolver_LDADD) $(LIBS)
+./magnets.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+magnets$(EXEEXT): $(magnets_OBJECTS) $(magnets_DEPENDENCIES) $(EXTRA_magnets_DEPENDENCIES) 
+        @rm -f magnets$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(magnets_OBJECTS) $(magnets_LDADD) $(LIBS)
+
+magnetssolver$(EXEEXT): $(magnetssolver_OBJECTS) $(magnetssolver_DEPENDENCIES) $(EXTRA_magnetssolver_DEPENDENCIES) 
+        @rm -f magnetssolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(magnetssolver_OBJECTS) $(magnetssolver_LDADD) $(LIBS)
+./map.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+map$(EXEEXT): $(map_OBJECTS) $(map_DEPENDENCIES) $(EXTRA_map_DEPENDENCIES) 
+        @rm -f map$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(map_OBJECTS) $(map_LDADD) $(LIBS)
+
+mapsolver$(EXEEXT): $(mapsolver_OBJECTS) $(mapsolver_DEPENDENCIES) $(EXTRA_mapsolver_DEPENDENCIES) 
+        @rm -f mapsolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(mapsolver_OBJECTS) $(mapsolver_LDADD) $(LIBS)
+
+mineobfusc$(EXEEXT): $(mineobfusc_OBJECTS) $(mineobfusc_DEPENDENCIES) $(EXTRA_mineobfusc_DEPENDENCIES) 
+        @rm -f mineobfusc$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(mineobfusc_OBJECTS) $(mineobfusc_LDADD) $(LIBS)
+./mines.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+mines$(EXEEXT): $(mines_OBJECTS) $(mines_DEPENDENCIES) $(EXTRA_mines_DEPENDENCIES) 
+        @rm -f mines$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(mines_OBJECTS) $(mines_LDADD) $(LIBS)
+./net.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+net$(EXEEXT): $(net_OBJECTS) $(net_DEPENDENCIES) $(EXTRA_net_DEPENDENCIES) 
+        @rm -f net$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(net_OBJECTS) $(net_LDADD) $(LIBS)
+./netslide.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+netslide$(EXEEXT): $(netslide_OBJECTS) $(netslide_DEPENDENCIES) $(EXTRA_netslide_DEPENDENCIES) 
+        @rm -f netslide$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(netslide_OBJECTS) $(netslide_LDADD) $(LIBS)
+./nullgame.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+nullgame$(EXEEXT): $(nullgame_OBJECTS) $(nullgame_DEPENDENCIES) $(EXTRA_nullgame_DEPENDENCIES) 
+        @rm -f nullgame$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(nullgame_OBJECTS) $(nullgame_LDADD) $(LIBS)
+./obfusc.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+obfusc$(EXEEXT): $(obfusc_OBJECTS) $(obfusc_DEPENDENCIES) $(EXTRA_obfusc_DEPENDENCIES) 
+        @rm -f obfusc$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(obfusc_OBJECTS) $(obfusc_LDADD) $(LIBS)
+./divvy.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./palisade.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+palisade$(EXEEXT): $(palisade_OBJECTS) $(palisade_DEPENDENCIES) $(EXTRA_palisade_DEPENDENCIES) 
+        @rm -f palisade$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(palisade_OBJECTS) $(palisade_LDADD) $(LIBS)
+./pattern.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+pattern$(EXEEXT): $(pattern_OBJECTS) $(pattern_DEPENDENCIES) $(EXTRA_pattern_DEPENDENCIES) 
+        @rm -f pattern$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(pattern_OBJECTS) $(pattern_LDADD) $(LIBS)
+
+patternpicture$(EXEEXT): $(patternpicture_OBJECTS) $(patternpicture_DEPENDENCIES) $(EXTRA_patternpicture_DEPENDENCIES) 
+        @rm -f patternpicture$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(patternpicture_OBJECTS) $(patternpicture_LDADD) $(LIBS)
+
+patternsolver$(EXEEXT): $(patternsolver_OBJECTS) $(patternsolver_DEPENDENCIES) $(EXTRA_patternsolver_DEPENDENCIES) 
+        @rm -f patternsolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(patternsolver_OBJECTS) $(patternsolver_LDADD) $(LIBS)
+./pearl.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+./tdq.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+pearl$(EXEEXT): $(pearl_OBJECTS) $(pearl_DEPENDENCIES) $(EXTRA_pearl_DEPENDENCIES) 
+        @rm -f pearl$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(pearl_OBJECTS) $(pearl_LDADD) $(LIBS)
+
+pearlbench$(EXEEXT): $(pearlbench_OBJECTS) $(pearlbench_DEPENDENCIES) $(EXTRA_pearlbench_DEPENDENCIES) 
+        @rm -f pearlbench$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(pearlbench_OBJECTS) $(pearlbench_LDADD) $(LIBS)
+./pegs.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+pegs$(EXEEXT): $(pegs_OBJECTS) $(pegs_DEPENDENCIES) $(EXTRA_pegs_DEPENDENCIES) 
+        @rm -f pegs$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(pegs_OBJECTS) $(pegs_LDADD) $(LIBS)
+./range.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+range$(EXEEXT): $(range_OBJECTS) $(range_DEPENDENCIES) $(EXTRA_range_DEPENDENCIES) 
+        @rm -f range$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(range_OBJECTS) $(range_LDADD) $(LIBS)
+./rect.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+rect$(EXEEXT): $(rect_OBJECTS) $(rect_DEPENDENCIES) $(EXTRA_rect_DEPENDENCIES) 
+        @rm -f rect$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(rect_OBJECTS) $(rect_LDADD) $(LIBS)
+./samegame.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+samegame$(EXEEXT): $(samegame_OBJECTS) $(samegame_DEPENDENCIES) $(EXTRA_samegame_DEPENDENCIES) 
+        @rm -f samegame$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(samegame_OBJECTS) $(samegame_LDADD) $(LIBS)
+./signpost.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+signpost$(EXEEXT): $(signpost_OBJECTS) $(signpost_DEPENDENCIES) $(EXTRA_signpost_DEPENDENCIES) 
+        @rm -f signpost$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(signpost_OBJECTS) $(signpost_LDADD) $(LIBS)
+
+signpostsolver$(EXEEXT): $(signpostsolver_OBJECTS) $(signpostsolver_DEPENDENCIES) $(EXTRA_signpostsolver_DEPENDENCIES) 
+        @rm -f signpostsolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(signpostsolver_OBJECTS) $(signpostsolver_LDADD) $(LIBS)
+./singles.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+singles$(EXEEXT): $(singles_OBJECTS) $(singles_DEPENDENCIES) $(EXTRA_singles_DEPENDENCIES) 
+        @rm -f singles$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(singles_OBJECTS) $(singles_LDADD) $(LIBS)
+
+singlessolver$(EXEEXT): $(singlessolver_OBJECTS) $(singlessolver_DEPENDENCIES) $(EXTRA_singlessolver_DEPENDENCIES) 
+        @rm -f singlessolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(singlessolver_OBJECTS) $(singlessolver_LDADD) $(LIBS)
+./sixteen.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+sixteen$(EXEEXT): $(sixteen_OBJECTS) $(sixteen_DEPENDENCIES) $(EXTRA_sixteen_DEPENDENCIES) 
+        @rm -f sixteen$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(sixteen_OBJECTS) $(sixteen_LDADD) $(LIBS)
+./slant.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+slant$(EXEEXT): $(slant_OBJECTS) $(slant_DEPENDENCIES) $(EXTRA_slant_DEPENDENCIES) 
+        @rm -f slant$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(slant_OBJECTS) $(slant_LDADD) $(LIBS)
+
+slantsolver$(EXEEXT): $(slantsolver_OBJECTS) $(slantsolver_DEPENDENCIES) $(EXTRA_slantsolver_DEPENDENCIES) 
+        @rm -f slantsolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(slantsolver_OBJECTS) $(slantsolver_LDADD) $(LIBS)
+./solo.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+solo$(EXEEXT): $(solo_OBJECTS) $(solo_DEPENDENCIES) $(EXTRA_solo_DEPENDENCIES) 
+        @rm -f solo$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(solo_OBJECTS) $(solo_LDADD) $(LIBS)
+
+solosolver$(EXEEXT): $(solosolver_OBJECTS) $(solosolver_DEPENDENCIES) $(EXTRA_solosolver_DEPENDENCIES) 
+        @rm -f solosolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(solosolver_OBJECTS) $(solosolver_LDADD) $(LIBS)
+./tents.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+tents$(EXEEXT): $(tents_OBJECTS) $(tents_DEPENDENCIES) $(EXTRA_tents_DEPENDENCIES) 
+        @rm -f tents$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(tents_OBJECTS) $(tents_LDADD) $(LIBS)
+
+tentssolver$(EXEEXT): $(tentssolver_OBJECTS) $(tentssolver_DEPENDENCIES) $(EXTRA_tentssolver_DEPENDENCIES) 
+        @rm -f tentssolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(tentssolver_OBJECTS) $(tentssolver_LDADD) $(LIBS)
+./towers.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+towers$(EXEEXT): $(towers_OBJECTS) $(towers_DEPENDENCIES) $(EXTRA_towers_DEPENDENCIES) 
+        @rm -f towers$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(towers_OBJECTS) $(towers_LDADD) $(LIBS)
+
+towerssolver$(EXEEXT): $(towerssolver_OBJECTS) $(towerssolver_DEPENDENCIES) $(EXTRA_towerssolver_DEPENDENCIES) 
+        @rm -f towerssolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(towerssolver_OBJECTS) $(towerssolver_LDADD) $(LIBS)
+./tracks.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+tracks$(EXEEXT): $(tracks_OBJECTS) $(tracks_DEPENDENCIES) $(EXTRA_tracks_DEPENDENCIES) 
+        @rm -f tracks$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(tracks_OBJECTS) $(tracks_LDADD) $(LIBS)
+./twiddle.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+twiddle$(EXEEXT): $(twiddle_OBJECTS) $(twiddle_DEPENDENCIES) $(EXTRA_twiddle_DEPENDENCIES) 
+        @rm -f twiddle$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(twiddle_OBJECTS) $(twiddle_LDADD) $(LIBS)
+./undead.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+undead$(EXEEXT): $(undead_OBJECTS) $(undead_DEPENDENCIES) $(EXTRA_undead_DEPENDENCIES) 
+        @rm -f undead$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(undead_OBJECTS) $(undead_LDADD) $(LIBS)
+./unequal.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+unequal$(EXEEXT): $(unequal_OBJECTS) $(unequal_DEPENDENCIES) $(EXTRA_unequal_DEPENDENCIES) 
+        @rm -f unequal$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(unequal_OBJECTS) $(unequal_LDADD) $(LIBS)
+
+unequalsolver$(EXEEXT): $(unequalsolver_OBJECTS) $(unequalsolver_DEPENDENCIES) $(EXTRA_unequalsolver_DEPENDENCIES) 
+        @rm -f unequalsolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(unequalsolver_OBJECTS) $(unequalsolver_LDADD) $(LIBS)
+./unruly.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+unruly$(EXEEXT): $(unruly_OBJECTS) $(unruly_DEPENDENCIES) $(EXTRA_unruly_DEPENDENCIES) 
+        @rm -f unruly$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(unruly_OBJECTS) $(unruly_LDADD) $(LIBS)
+
+unrulysolver$(EXEEXT): $(unrulysolver_OBJECTS) $(unrulysolver_DEPENDENCIES) $(EXTRA_unrulysolver_DEPENDENCIES) 
+        @rm -f unrulysolver$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(unrulysolver_OBJECTS) $(unrulysolver_LDADD) $(LIBS)
+./untangle.$(OBJEXT): ./$(am__dirstamp) $(DEPDIR)/$(am__dirstamp)
+
+untangle$(EXEEXT): $(untangle_OBJECTS) $(untangle_DEPENDENCIES) $(EXTRA_untangle_DEPENDENCIES) 
+        @rm -f untangle$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(untangle_OBJECTS) $(untangle_LDADD) $(LIBS)
+
+mostlyclean-compile:
+        -rm -f *.$(OBJEXT)
+        -rm -f ./*.$(OBJEXT)
+
+distclean-compile:
+        -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blackbox.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bridges.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cube.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/divvy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dominosa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawing.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fifteen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filling.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/findloop.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flip.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flood.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/galaxies.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/guess.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inertia.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/latin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laydomino.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfifteen2_a-fifteen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfilling2_a-filling.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgalaxie2_a-galaxies.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgalaxie4_a-galaxies.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeen2_a-keen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblatin6_a-latin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblatin8_a-latin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblightup2_a-lightup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libloopy2_a-loopy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmagnets2_a-magnets.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmap2_a-map.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmines2_a-mines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpattern2_a-pattern.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpattern4_a-pattern.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpearl2_a-pearl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsignpos2_a-signpost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsingles3_a-singles.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libslant2_a-slant.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsolo2_a-solo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtents3_a-tents.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtowers2_a-towers.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunequal2_a-unequal.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunruly2_a-unruly.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lightup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loopgen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loopy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/magnets.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maxflow.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midend.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netslide.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/no-icon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nullfe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nullgame.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obfusc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palisade.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pearl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pegs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/penrose.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printing.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ps.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/range.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rect.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/samegame.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signpost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singles.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sixteen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slant.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tdq.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tents.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/towers.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tracks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tree234.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/twiddle.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/undead.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unequal.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unruly.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/untangle.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+./libfifteen2_a-fifteen.o: ./fifteen.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfifteen2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libfifteen2_a-fifteen.o -MD -MP -MF $(DEPDIR)/libfifteen2_a-fifteen.Tpo -c -o ./libfifteen2_a-fifteen.o `test -f './fifteen.c' || echo '$(srcdir)/'`./fifteen.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libfifteen2_a-fifteen.Tpo $(DEPDIR)/libfifteen2_a-fifteen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./fifteen.c' object='./libfifteen2_a-fifteen.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfifteen2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libfifteen2_a-fifteen.o `test -f './fifteen.c' || echo '$(srcdir)/'`./fifteen.c
+
+./libfifteen2_a-fifteen.obj: ./fifteen.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfifteen2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libfifteen2_a-fifteen.obj -MD -MP -MF $(DEPDIR)/libfifteen2_a-fifteen.Tpo -c -o ./libfifteen2_a-fifteen.obj `if test -f './fifteen.c'; then $(CYGPATH_W) './fifteen.c'; else $(CYGPATH_W) '$(srcdir)/./fifteen.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libfifteen2_a-fifteen.Tpo $(DEPDIR)/libfifteen2_a-fifteen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./fifteen.c' object='./libfifteen2_a-fifteen.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfifteen2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libfifteen2_a-fifteen.obj `if test -f './fifteen.c'; then $(CYGPATH_W) './fifteen.c'; else $(CYGPATH_W) '$(srcdir)/./fifteen.c'; fi`
+
+./libfilling2_a-filling.o: ./filling.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfilling2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libfilling2_a-filling.o -MD -MP -MF $(DEPDIR)/libfilling2_a-filling.Tpo -c -o ./libfilling2_a-filling.o `test -f './filling.c' || echo '$(srcdir)/'`./filling.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libfilling2_a-filling.Tpo $(DEPDIR)/libfilling2_a-filling.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./filling.c' object='./libfilling2_a-filling.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfilling2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libfilling2_a-filling.o `test -f './filling.c' || echo '$(srcdir)/'`./filling.c
+
+./libfilling2_a-filling.obj: ./filling.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfilling2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libfilling2_a-filling.obj -MD -MP -MF $(DEPDIR)/libfilling2_a-filling.Tpo -c -o ./libfilling2_a-filling.obj `if test -f './filling.c'; then $(CYGPATH_W) './filling.c'; else $(CYGPATH_W) '$(srcdir)/./filling.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libfilling2_a-filling.Tpo $(DEPDIR)/libfilling2_a-filling.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./filling.c' object='./libfilling2_a-filling.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfilling2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libfilling2_a-filling.obj `if test -f './filling.c'; then $(CYGPATH_W) './filling.c'; else $(CYGPATH_W) '$(srcdir)/./filling.c'; fi`
+
+./libgalaxie2_a-galaxies.o: ./galaxies.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgalaxie2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libgalaxie2_a-galaxies.o -MD -MP -MF $(DEPDIR)/libgalaxie2_a-galaxies.Tpo -c -o ./libgalaxie2_a-galaxies.o `test -f './galaxies.c' || echo '$(srcdir)/'`./galaxies.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libgalaxie2_a-galaxies.Tpo $(DEPDIR)/libgalaxie2_a-galaxies.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./galaxies.c' object='./libgalaxie2_a-galaxies.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgalaxie2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libgalaxie2_a-galaxies.o `test -f './galaxies.c' || echo '$(srcdir)/'`./galaxies.c
+
+./libgalaxie2_a-galaxies.obj: ./galaxies.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgalaxie2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libgalaxie2_a-galaxies.obj -MD -MP -MF $(DEPDIR)/libgalaxie2_a-galaxies.Tpo -c -o ./libgalaxie2_a-galaxies.obj `if test -f './galaxies.c'; then $(CYGPATH_W) './galaxies.c'; else $(CYGPATH_W) '$(srcdir)/./galaxies.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libgalaxie2_a-galaxies.Tpo $(DEPDIR)/libgalaxie2_a-galaxies.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./galaxies.c' object='./libgalaxie2_a-galaxies.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgalaxie2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libgalaxie2_a-galaxies.obj `if test -f './galaxies.c'; then $(CYGPATH_W) './galaxies.c'; else $(CYGPATH_W) '$(srcdir)/./galaxies.c'; fi`
+
+./libgalaxie4_a-galaxies.o: ./galaxies.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgalaxie4_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libgalaxie4_a-galaxies.o -MD -MP -MF $(DEPDIR)/libgalaxie4_a-galaxies.Tpo -c -o ./libgalaxie4_a-galaxies.o `test -f './galaxies.c' || echo '$(srcdir)/'`./galaxies.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libgalaxie4_a-galaxies.Tpo $(DEPDIR)/libgalaxie4_a-galaxies.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./galaxies.c' object='./libgalaxie4_a-galaxies.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgalaxie4_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libgalaxie4_a-galaxies.o `test -f './galaxies.c' || echo '$(srcdir)/'`./galaxies.c
+
+./libgalaxie4_a-galaxies.obj: ./galaxies.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgalaxie4_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libgalaxie4_a-galaxies.obj -MD -MP -MF $(DEPDIR)/libgalaxie4_a-galaxies.Tpo -c -o ./libgalaxie4_a-galaxies.obj `if test -f './galaxies.c'; then $(CYGPATH_W) './galaxies.c'; else $(CYGPATH_W) '$(srcdir)/./galaxies.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libgalaxie4_a-galaxies.Tpo $(DEPDIR)/libgalaxie4_a-galaxies.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./galaxies.c' object='./libgalaxie4_a-galaxies.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgalaxie4_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libgalaxie4_a-galaxies.obj `if test -f './galaxies.c'; then $(CYGPATH_W) './galaxies.c'; else $(CYGPATH_W) '$(srcdir)/./galaxies.c'; fi`
+
+./libkeen2_a-keen.o: ./keen.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeen2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libkeen2_a-keen.o -MD -MP -MF $(DEPDIR)/libkeen2_a-keen.Tpo -c -o ./libkeen2_a-keen.o `test -f './keen.c' || echo '$(srcdir)/'`./keen.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libkeen2_a-keen.Tpo $(DEPDIR)/libkeen2_a-keen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./keen.c' object='./libkeen2_a-keen.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeen2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libkeen2_a-keen.o `test -f './keen.c' || echo '$(srcdir)/'`./keen.c
+
+./libkeen2_a-keen.obj: ./keen.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeen2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libkeen2_a-keen.obj -MD -MP -MF $(DEPDIR)/libkeen2_a-keen.Tpo -c -o ./libkeen2_a-keen.obj `if test -f './keen.c'; then $(CYGPATH_W) './keen.c'; else $(CYGPATH_W) '$(srcdir)/./keen.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libkeen2_a-keen.Tpo $(DEPDIR)/libkeen2_a-keen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./keen.c' object='./libkeen2_a-keen.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeen2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libkeen2_a-keen.obj `if test -f './keen.c'; then $(CYGPATH_W) './keen.c'; else $(CYGPATH_W) '$(srcdir)/./keen.c'; fi`
+
+./liblatin6_a-latin.o: ./latin.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblatin6_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./liblatin6_a-latin.o -MD -MP -MF $(DEPDIR)/liblatin6_a-latin.Tpo -c -o ./liblatin6_a-latin.o `test -f './latin.c' || echo '$(srcdir)/'`./latin.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/liblatin6_a-latin.Tpo $(DEPDIR)/liblatin6_a-latin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./latin.c' object='./liblatin6_a-latin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblatin6_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./liblatin6_a-latin.o `test -f './latin.c' || echo '$(srcdir)/'`./latin.c
+
+./liblatin6_a-latin.obj: ./latin.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblatin6_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./liblatin6_a-latin.obj -MD -MP -MF $(DEPDIR)/liblatin6_a-latin.Tpo -c -o ./liblatin6_a-latin.obj `if test -f './latin.c'; then $(CYGPATH_W) './latin.c'; else $(CYGPATH_W) '$(srcdir)/./latin.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/liblatin6_a-latin.Tpo $(DEPDIR)/liblatin6_a-latin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./latin.c' object='./liblatin6_a-latin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblatin6_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./liblatin6_a-latin.obj `if test -f './latin.c'; then $(CYGPATH_W) './latin.c'; else $(CYGPATH_W) '$(srcdir)/./latin.c'; fi`
+
+./liblatin8_a-latin.o: ./latin.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblatin8_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./liblatin8_a-latin.o -MD -MP -MF $(DEPDIR)/liblatin8_a-latin.Tpo -c -o ./liblatin8_a-latin.o `test -f './latin.c' || echo '$(srcdir)/'`./latin.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/liblatin8_a-latin.Tpo $(DEPDIR)/liblatin8_a-latin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./latin.c' object='./liblatin8_a-latin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblatin8_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./liblatin8_a-latin.o `test -f './latin.c' || echo '$(srcdir)/'`./latin.c
+
+./liblatin8_a-latin.obj: ./latin.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblatin8_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./liblatin8_a-latin.obj -MD -MP -MF $(DEPDIR)/liblatin8_a-latin.Tpo -c -o ./liblatin8_a-latin.obj `if test -f './latin.c'; then $(CYGPATH_W) './latin.c'; else $(CYGPATH_W) '$(srcdir)/./latin.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/liblatin8_a-latin.Tpo $(DEPDIR)/liblatin8_a-latin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./latin.c' object='./liblatin8_a-latin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblatin8_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./liblatin8_a-latin.obj `if test -f './latin.c'; then $(CYGPATH_W) './latin.c'; else $(CYGPATH_W) '$(srcdir)/./latin.c'; fi`
+
+./liblightup2_a-lightup.o: ./lightup.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblightup2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./liblightup2_a-lightup.o -MD -MP -MF $(DEPDIR)/liblightup2_a-lightup.Tpo -c -o ./liblightup2_a-lightup.o `test -f './lightup.c' || echo '$(srcdir)/'`./lightup.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/liblightup2_a-lightup.Tpo $(DEPDIR)/liblightup2_a-lightup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./lightup.c' object='./liblightup2_a-lightup.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblightup2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./liblightup2_a-lightup.o `test -f './lightup.c' || echo '$(srcdir)/'`./lightup.c
+
+./liblightup2_a-lightup.obj: ./lightup.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblightup2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./liblightup2_a-lightup.obj -MD -MP -MF $(DEPDIR)/liblightup2_a-lightup.Tpo -c -o ./liblightup2_a-lightup.obj `if test -f './lightup.c'; then $(CYGPATH_W) './lightup.c'; else $(CYGPATH_W) '$(srcdir)/./lightup.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/liblightup2_a-lightup.Tpo $(DEPDIR)/liblightup2_a-lightup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./lightup.c' object='./liblightup2_a-lightup.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblightup2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./liblightup2_a-lightup.obj `if test -f './lightup.c'; then $(CYGPATH_W) './lightup.c'; else $(CYGPATH_W) '$(srcdir)/./lightup.c'; fi`
+
+./libloopy2_a-loopy.o: ./loopy.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libloopy2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libloopy2_a-loopy.o -MD -MP -MF $(DEPDIR)/libloopy2_a-loopy.Tpo -c -o ./libloopy2_a-loopy.o `test -f './loopy.c' || echo '$(srcdir)/'`./loopy.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libloopy2_a-loopy.Tpo $(DEPDIR)/libloopy2_a-loopy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./loopy.c' object='./libloopy2_a-loopy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libloopy2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libloopy2_a-loopy.o `test -f './loopy.c' || echo '$(srcdir)/'`./loopy.c
+
+./libloopy2_a-loopy.obj: ./loopy.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libloopy2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libloopy2_a-loopy.obj -MD -MP -MF $(DEPDIR)/libloopy2_a-loopy.Tpo -c -o ./libloopy2_a-loopy.obj `if test -f './loopy.c'; then $(CYGPATH_W) './loopy.c'; else $(CYGPATH_W) '$(srcdir)/./loopy.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libloopy2_a-loopy.Tpo $(DEPDIR)/libloopy2_a-loopy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./loopy.c' object='./libloopy2_a-loopy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libloopy2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libloopy2_a-loopy.obj `if test -f './loopy.c'; then $(CYGPATH_W) './loopy.c'; else $(CYGPATH_W) '$(srcdir)/./loopy.c'; fi`
+
+./libmagnets2_a-magnets.o: ./magnets.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmagnets2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libmagnets2_a-magnets.o -MD -MP -MF $(DEPDIR)/libmagnets2_a-magnets.Tpo -c -o ./libmagnets2_a-magnets.o `test -f './magnets.c' || echo '$(srcdir)/'`./magnets.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libmagnets2_a-magnets.Tpo $(DEPDIR)/libmagnets2_a-magnets.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./magnets.c' object='./libmagnets2_a-magnets.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmagnets2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libmagnets2_a-magnets.o `test -f './magnets.c' || echo '$(srcdir)/'`./magnets.c
+
+./libmagnets2_a-magnets.obj: ./magnets.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmagnets2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libmagnets2_a-magnets.obj -MD -MP -MF $(DEPDIR)/libmagnets2_a-magnets.Tpo -c -o ./libmagnets2_a-magnets.obj `if test -f './magnets.c'; then $(CYGPATH_W) './magnets.c'; else $(CYGPATH_W) '$(srcdir)/./magnets.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libmagnets2_a-magnets.Tpo $(DEPDIR)/libmagnets2_a-magnets.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./magnets.c' object='./libmagnets2_a-magnets.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmagnets2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libmagnets2_a-magnets.obj `if test -f './magnets.c'; then $(CYGPATH_W) './magnets.c'; else $(CYGPATH_W) '$(srcdir)/./magnets.c'; fi`
+
+./libmap2_a-map.o: ./map.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmap2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libmap2_a-map.o -MD -MP -MF $(DEPDIR)/libmap2_a-map.Tpo -c -o ./libmap2_a-map.o `test -f './map.c' || echo '$(srcdir)/'`./map.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libmap2_a-map.Tpo $(DEPDIR)/libmap2_a-map.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./map.c' object='./libmap2_a-map.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmap2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libmap2_a-map.o `test -f './map.c' || echo '$(srcdir)/'`./map.c
+
+./libmap2_a-map.obj: ./map.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmap2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libmap2_a-map.obj -MD -MP -MF $(DEPDIR)/libmap2_a-map.Tpo -c -o ./libmap2_a-map.obj `if test -f './map.c'; then $(CYGPATH_W) './map.c'; else $(CYGPATH_W) '$(srcdir)/./map.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libmap2_a-map.Tpo $(DEPDIR)/libmap2_a-map.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./map.c' object='./libmap2_a-map.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmap2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libmap2_a-map.obj `if test -f './map.c'; then $(CYGPATH_W) './map.c'; else $(CYGPATH_W) '$(srcdir)/./map.c'; fi`
+
+./libmines2_a-mines.o: ./mines.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmines2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libmines2_a-mines.o -MD -MP -MF $(DEPDIR)/libmines2_a-mines.Tpo -c -o ./libmines2_a-mines.o `test -f './mines.c' || echo '$(srcdir)/'`./mines.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libmines2_a-mines.Tpo $(DEPDIR)/libmines2_a-mines.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./mines.c' object='./libmines2_a-mines.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmines2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libmines2_a-mines.o `test -f './mines.c' || echo '$(srcdir)/'`./mines.c
+
+./libmines2_a-mines.obj: ./mines.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmines2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libmines2_a-mines.obj -MD -MP -MF $(DEPDIR)/libmines2_a-mines.Tpo -c -o ./libmines2_a-mines.obj `if test -f './mines.c'; then $(CYGPATH_W) './mines.c'; else $(CYGPATH_W) '$(srcdir)/./mines.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libmines2_a-mines.Tpo $(DEPDIR)/libmines2_a-mines.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./mines.c' object='./libmines2_a-mines.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmines2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libmines2_a-mines.obj `if test -f './mines.c'; then $(CYGPATH_W) './mines.c'; else $(CYGPATH_W) '$(srcdir)/./mines.c'; fi`
+
+./libpattern2_a-pattern.o: ./pattern.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpattern2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libpattern2_a-pattern.o -MD -MP -MF $(DEPDIR)/libpattern2_a-pattern.Tpo -c -o ./libpattern2_a-pattern.o `test -f './pattern.c' || echo '$(srcdir)/'`./pattern.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libpattern2_a-pattern.Tpo $(DEPDIR)/libpattern2_a-pattern.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./pattern.c' object='./libpattern2_a-pattern.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpattern2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libpattern2_a-pattern.o `test -f './pattern.c' || echo '$(srcdir)/'`./pattern.c
+
+./libpattern2_a-pattern.obj: ./pattern.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpattern2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libpattern2_a-pattern.obj -MD -MP -MF $(DEPDIR)/libpattern2_a-pattern.Tpo -c -o ./libpattern2_a-pattern.obj `if test -f './pattern.c'; then $(CYGPATH_W) './pattern.c'; else $(CYGPATH_W) '$(srcdir)/./pattern.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libpattern2_a-pattern.Tpo $(DEPDIR)/libpattern2_a-pattern.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./pattern.c' object='./libpattern2_a-pattern.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpattern2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libpattern2_a-pattern.obj `if test -f './pattern.c'; then $(CYGPATH_W) './pattern.c'; else $(CYGPATH_W) '$(srcdir)/./pattern.c'; fi`
+
+./libpattern4_a-pattern.o: ./pattern.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpattern4_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libpattern4_a-pattern.o -MD -MP -MF $(DEPDIR)/libpattern4_a-pattern.Tpo -c -o ./libpattern4_a-pattern.o `test -f './pattern.c' || echo '$(srcdir)/'`./pattern.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libpattern4_a-pattern.Tpo $(DEPDIR)/libpattern4_a-pattern.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./pattern.c' object='./libpattern4_a-pattern.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpattern4_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libpattern4_a-pattern.o `test -f './pattern.c' || echo '$(srcdir)/'`./pattern.c
+
+./libpattern4_a-pattern.obj: ./pattern.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpattern4_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libpattern4_a-pattern.obj -MD -MP -MF $(DEPDIR)/libpattern4_a-pattern.Tpo -c -o ./libpattern4_a-pattern.obj `if test -f './pattern.c'; then $(CYGPATH_W) './pattern.c'; else $(CYGPATH_W) '$(srcdir)/./pattern.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libpattern4_a-pattern.Tpo $(DEPDIR)/libpattern4_a-pattern.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./pattern.c' object='./libpattern4_a-pattern.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpattern4_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libpattern4_a-pattern.obj `if test -f './pattern.c'; then $(CYGPATH_W) './pattern.c'; else $(CYGPATH_W) '$(srcdir)/./pattern.c'; fi`
+
+./libpearl2_a-pearl.o: ./pearl.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpearl2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libpearl2_a-pearl.o -MD -MP -MF $(DEPDIR)/libpearl2_a-pearl.Tpo -c -o ./libpearl2_a-pearl.o `test -f './pearl.c' || echo '$(srcdir)/'`./pearl.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libpearl2_a-pearl.Tpo $(DEPDIR)/libpearl2_a-pearl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./pearl.c' object='./libpearl2_a-pearl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpearl2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libpearl2_a-pearl.o `test -f './pearl.c' || echo '$(srcdir)/'`./pearl.c
+
+./libpearl2_a-pearl.obj: ./pearl.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpearl2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libpearl2_a-pearl.obj -MD -MP -MF $(DEPDIR)/libpearl2_a-pearl.Tpo -c -o ./libpearl2_a-pearl.obj `if test -f './pearl.c'; then $(CYGPATH_W) './pearl.c'; else $(CYGPATH_W) '$(srcdir)/./pearl.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libpearl2_a-pearl.Tpo $(DEPDIR)/libpearl2_a-pearl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./pearl.c' object='./libpearl2_a-pearl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpearl2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libpearl2_a-pearl.obj `if test -f './pearl.c'; then $(CYGPATH_W) './pearl.c'; else $(CYGPATH_W) '$(srcdir)/./pearl.c'; fi`
+
+./libsignpos2_a-signpost.o: ./signpost.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsignpos2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libsignpos2_a-signpost.o -MD -MP -MF $(DEPDIR)/libsignpos2_a-signpost.Tpo -c -o ./libsignpos2_a-signpost.o `test -f './signpost.c' || echo '$(srcdir)/'`./signpost.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libsignpos2_a-signpost.Tpo $(DEPDIR)/libsignpos2_a-signpost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./signpost.c' object='./libsignpos2_a-signpost.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsignpos2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libsignpos2_a-signpost.o `test -f './signpost.c' || echo '$(srcdir)/'`./signpost.c
+
+./libsignpos2_a-signpost.obj: ./signpost.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsignpos2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libsignpos2_a-signpost.obj -MD -MP -MF $(DEPDIR)/libsignpos2_a-signpost.Tpo -c -o ./libsignpos2_a-signpost.obj `if test -f './signpost.c'; then $(CYGPATH_W) './signpost.c'; else $(CYGPATH_W) '$(srcdir)/./signpost.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libsignpos2_a-signpost.Tpo $(DEPDIR)/libsignpos2_a-signpost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./signpost.c' object='./libsignpos2_a-signpost.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsignpos2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libsignpos2_a-signpost.obj `if test -f './signpost.c'; then $(CYGPATH_W) './signpost.c'; else $(CYGPATH_W) '$(srcdir)/./signpost.c'; fi`
+
+./libsingles3_a-singles.o: ./singles.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsingles3_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libsingles3_a-singles.o -MD -MP -MF $(DEPDIR)/libsingles3_a-singles.Tpo -c -o ./libsingles3_a-singles.o `test -f './singles.c' || echo '$(srcdir)/'`./singles.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libsingles3_a-singles.Tpo $(DEPDIR)/libsingles3_a-singles.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./singles.c' object='./libsingles3_a-singles.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsingles3_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libsingles3_a-singles.o `test -f './singles.c' || echo '$(srcdir)/'`./singles.c
+
+./libsingles3_a-singles.obj: ./singles.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsingles3_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libsingles3_a-singles.obj -MD -MP -MF $(DEPDIR)/libsingles3_a-singles.Tpo -c -o ./libsingles3_a-singles.obj `if test -f './singles.c'; then $(CYGPATH_W) './singles.c'; else $(CYGPATH_W) '$(srcdir)/./singles.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libsingles3_a-singles.Tpo $(DEPDIR)/libsingles3_a-singles.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./singles.c' object='./libsingles3_a-singles.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsingles3_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libsingles3_a-singles.obj `if test -f './singles.c'; then $(CYGPATH_W) './singles.c'; else $(CYGPATH_W) '$(srcdir)/./singles.c'; fi`
+
+./libslant2_a-slant.o: ./slant.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslant2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libslant2_a-slant.o -MD -MP -MF $(DEPDIR)/libslant2_a-slant.Tpo -c -o ./libslant2_a-slant.o `test -f './slant.c' || echo '$(srcdir)/'`./slant.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libslant2_a-slant.Tpo $(DEPDIR)/libslant2_a-slant.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./slant.c' object='./libslant2_a-slant.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslant2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libslant2_a-slant.o `test -f './slant.c' || echo '$(srcdir)/'`./slant.c
+
+./libslant2_a-slant.obj: ./slant.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslant2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libslant2_a-slant.obj -MD -MP -MF $(DEPDIR)/libslant2_a-slant.Tpo -c -o ./libslant2_a-slant.obj `if test -f './slant.c'; then $(CYGPATH_W) './slant.c'; else $(CYGPATH_W) '$(srcdir)/./slant.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libslant2_a-slant.Tpo $(DEPDIR)/libslant2_a-slant.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./slant.c' object='./libslant2_a-slant.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslant2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libslant2_a-slant.obj `if test -f './slant.c'; then $(CYGPATH_W) './slant.c'; else $(CYGPATH_W) '$(srcdir)/./slant.c'; fi`
+
+./libsolo2_a-solo.o: ./solo.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsolo2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libsolo2_a-solo.o -MD -MP -MF $(DEPDIR)/libsolo2_a-solo.Tpo -c -o ./libsolo2_a-solo.o `test -f './solo.c' || echo '$(srcdir)/'`./solo.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libsolo2_a-solo.Tpo $(DEPDIR)/libsolo2_a-solo.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./solo.c' object='./libsolo2_a-solo.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsolo2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libsolo2_a-solo.o `test -f './solo.c' || echo '$(srcdir)/'`./solo.c
+
+./libsolo2_a-solo.obj: ./solo.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsolo2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libsolo2_a-solo.obj -MD -MP -MF $(DEPDIR)/libsolo2_a-solo.Tpo -c -o ./libsolo2_a-solo.obj `if test -f './solo.c'; then $(CYGPATH_W) './solo.c'; else $(CYGPATH_W) '$(srcdir)/./solo.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libsolo2_a-solo.Tpo $(DEPDIR)/libsolo2_a-solo.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./solo.c' object='./libsolo2_a-solo.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsolo2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libsolo2_a-solo.obj `if test -f './solo.c'; then $(CYGPATH_W) './solo.c'; else $(CYGPATH_W) '$(srcdir)/./solo.c'; fi`
+
+./libtents3_a-tents.o: ./tents.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtents3_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libtents3_a-tents.o -MD -MP -MF $(DEPDIR)/libtents3_a-tents.Tpo -c -o ./libtents3_a-tents.o `test -f './tents.c' || echo '$(srcdir)/'`./tents.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libtents3_a-tents.Tpo $(DEPDIR)/libtents3_a-tents.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./tents.c' object='./libtents3_a-tents.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtents3_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libtents3_a-tents.o `test -f './tents.c' || echo '$(srcdir)/'`./tents.c
+
+./libtents3_a-tents.obj: ./tents.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtents3_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libtents3_a-tents.obj -MD -MP -MF $(DEPDIR)/libtents3_a-tents.Tpo -c -o ./libtents3_a-tents.obj `if test -f './tents.c'; then $(CYGPATH_W) './tents.c'; else $(CYGPATH_W) '$(srcdir)/./tents.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libtents3_a-tents.Tpo $(DEPDIR)/libtents3_a-tents.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./tents.c' object='./libtents3_a-tents.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtents3_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libtents3_a-tents.obj `if test -f './tents.c'; then $(CYGPATH_W) './tents.c'; else $(CYGPATH_W) '$(srcdir)/./tents.c'; fi`
+
+./libtowers2_a-towers.o: ./towers.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtowers2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libtowers2_a-towers.o -MD -MP -MF $(DEPDIR)/libtowers2_a-towers.Tpo -c -o ./libtowers2_a-towers.o `test -f './towers.c' || echo '$(srcdir)/'`./towers.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libtowers2_a-towers.Tpo $(DEPDIR)/libtowers2_a-towers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./towers.c' object='./libtowers2_a-towers.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtowers2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libtowers2_a-towers.o `test -f './towers.c' || echo '$(srcdir)/'`./towers.c
+
+./libtowers2_a-towers.obj: ./towers.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtowers2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libtowers2_a-towers.obj -MD -MP -MF $(DEPDIR)/libtowers2_a-towers.Tpo -c -o ./libtowers2_a-towers.obj `if test -f './towers.c'; then $(CYGPATH_W) './towers.c'; else $(CYGPATH_W) '$(srcdir)/./towers.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libtowers2_a-towers.Tpo $(DEPDIR)/libtowers2_a-towers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./towers.c' object='./libtowers2_a-towers.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtowers2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libtowers2_a-towers.obj `if test -f './towers.c'; then $(CYGPATH_W) './towers.c'; else $(CYGPATH_W) '$(srcdir)/./towers.c'; fi`
+
+./libunequal2_a-unequal.o: ./unequal.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunequal2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libunequal2_a-unequal.o -MD -MP -MF $(DEPDIR)/libunequal2_a-unequal.Tpo -c -o ./libunequal2_a-unequal.o `test -f './unequal.c' || echo '$(srcdir)/'`./unequal.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libunequal2_a-unequal.Tpo $(DEPDIR)/libunequal2_a-unequal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./unequal.c' object='./libunequal2_a-unequal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunequal2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libunequal2_a-unequal.o `test -f './unequal.c' || echo '$(srcdir)/'`./unequal.c
+
+./libunequal2_a-unequal.obj: ./unequal.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunequal2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libunequal2_a-unequal.obj -MD -MP -MF $(DEPDIR)/libunequal2_a-unequal.Tpo -c -o ./libunequal2_a-unequal.obj `if test -f './unequal.c'; then $(CYGPATH_W) './unequal.c'; else $(CYGPATH_W) '$(srcdir)/./unequal.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libunequal2_a-unequal.Tpo $(DEPDIR)/libunequal2_a-unequal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./unequal.c' object='./libunequal2_a-unequal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunequal2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libunequal2_a-unequal.obj `if test -f './unequal.c'; then $(CYGPATH_W) './unequal.c'; else $(CYGPATH_W) '$(srcdir)/./unequal.c'; fi`
+
+./libunruly2_a-unruly.o: ./unruly.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunruly2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libunruly2_a-unruly.o -MD -MP -MF $(DEPDIR)/libunruly2_a-unruly.Tpo -c -o ./libunruly2_a-unruly.o `test -f './unruly.c' || echo '$(srcdir)/'`./unruly.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libunruly2_a-unruly.Tpo $(DEPDIR)/libunruly2_a-unruly.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./unruly.c' object='./libunruly2_a-unruly.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunruly2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libunruly2_a-unruly.o `test -f './unruly.c' || echo '$(srcdir)/'`./unruly.c
+
+./libunruly2_a-unruly.obj: ./unruly.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunruly2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ./libunruly2_a-unruly.obj -MD -MP -MF $(DEPDIR)/libunruly2_a-unruly.Tpo -c -o ./libunruly2_a-unruly.obj `if test -f './unruly.c'; then $(CYGPATH_W) './unruly.c'; else $(CYGPATH_W) '$(srcdir)/./unruly.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libunruly2_a-unruly.Tpo $(DEPDIR)/libunruly2_a-unruly.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='./unruly.c' object='./libunruly2_a-unruly.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunruly2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ./libunruly2_a-unruly.obj `if test -f './unruly.c'; then $(CYGPATH_W) './unruly.c'; else $(CYGPATH_W) '$(srcdir)/./unruly.c'; fi`
+
+ID: $(am__tagged_files)
+        $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+        set x; \
+        here=`pwd`; \
+        $(am__define_uniq_tagged_files); \
+        shift; \
+        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          if test $$# -gt 0; then \
+            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+              "$$@" $$unique; \
+          else \
+            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+              $$unique; \
+          fi; \
+        fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+        $(am__define_uniq_tagged_files); \
+        test -z "$(CTAGS_ARGS)$$unique" \
+          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+             $$unique
+
+GTAGS:
+        here=`$(am__cd) $(top_builddir) && pwd` \
+          && $(am__cd) $(top_srcdir) \
+          && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+        test ! -s cscope.files \
+          || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+        -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+        list='$(am__tagged_files)'; \
+        case "$(srcdir)" in \
+          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+          *) sdir=$(subdir)/$(srcdir) ;; \
+        esac; \
+        for i in $$list; do \
+          if test -f "$$i"; then \
+            echo "$(subdir)/$$i"; \
+          else \
+            echo "$$sdir/$$i"; \
+          fi; \
+        done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+        -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+distdir: $(DISTFILES)
+        $(am__remove_distdir)
+        test -d "$(distdir)" || mkdir "$(distdir)"
+        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+        list='$(DISTFILES)'; \
+          dist_files=`for file in $$list; do echo $$file; done | \
+          sed -e "s|^$$srcdirstrip/||;t" \
+              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+        case $$dist_files in \
+          */*) $(MKDIR_P) `echo "$$dist_files" | \
+                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                           sort -u` ;; \
+        esac; \
+        for file in $$dist_files; do \
+          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+          if test -d $$d/$$file; then \
+            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+            if test -d "$(distdir)/$$file"; then \
+              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+            fi; \
+            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+            fi; \
+            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+          else \
+            test -f "$(distdir)/$$file" \
+            || cp -p $$d/$$file "$(distdir)/$$file" \
+            || exit 1; \
+          fi; \
+        done
+        -test -n "$(am__skip_mode_fix)" \
+        || find "$(distdir)" -type d ! -perm -755 \
+                -exec chmod u+rwx,go+rx {} \; -o \
+          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+          ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+        || chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+        tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+        $(am__post_remove_distdir)
+
+dist-bzip2: distdir
+        tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+        $(am__post_remove_distdir)
+
+dist-lzip: distdir
+        tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+        $(am__post_remove_distdir)
+
+dist-xz: distdir
+        tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+        $(am__post_remove_distdir)
+
+dist-tarZ: distdir
+        @echo WARNING: "Support for distribution archives compressed with" \
+                       "legacy program 'compress' is deprecated." >&2
+        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+        $(am__post_remove_distdir)
+
+dist-shar: distdir
+        @echo WARNING: "Support for shar distribution archives is" \
+                       "deprecated." >&2
+        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+        shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+        $(am__post_remove_distdir)
+
+dist-zip: distdir
+        -rm -f $(distdir).zip
+        zip -rq $(distdir).zip $(distdir)
+        $(am__post_remove_distdir)
+
+dist dist-all:
+        $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+        $(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+        case '$(DIST_ARCHIVES)' in \
+        *.tar.gz*) \
+          eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+        *.tar.bz2*) \
+          bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+        *.tar.lz*) \
+          lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+        *.tar.xz*) \
+          xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+        *.tar.Z*) \
+          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+        *.shar.gz*) \
+          eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+        *.zip*) \
+          unzip $(distdir).zip ;;\
+        esac
+        chmod -R a-w $(distdir)
+        chmod u+w $(distdir)
+        mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+        chmod a-w $(distdir)
+        test -d $(distdir)/_build || exit 0; \
+        dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+          && am__cwd=`pwd` \
+          && $(am__cd) $(distdir)/_build/sub \
+          && ../../configure \
+            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+            $(DISTCHECK_CONFIGURE_FLAGS) \
+            --srcdir=../.. --prefix="$$dc_install_base" \
+          && $(MAKE) $(AM_MAKEFLAGS) \
+          && $(MAKE) $(AM_MAKEFLAGS) dvi \
+          && $(MAKE) $(AM_MAKEFLAGS) check \
+          && $(MAKE) $(AM_MAKEFLAGS) install \
+          && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+          && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+          && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+                distuninstallcheck \
+          && chmod -R a-w "$$dc_install_base" \
+          && ({ \
+               (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+               && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+                    distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+              } || { rm -rf "$$dc_destdir"; exit 1; }) \
+          && rm -rf "$$dc_destdir" \
+          && $(MAKE) $(AM_MAKEFLAGS) dist \
+          && rm -rf $(DIST_ARCHIVES) \
+          && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+          && cd "$$am__cwd" \
+          || exit 1
+        $(am__post_remove_distdir)
+        @(echo "$(distdir) archives ready for distribution: "; \
+          list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+          sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+        @test -n '$(distuninstallcheck_dir)' || { \
+          echo 'ERROR: trying to run $@ with an empty' \
+               '$$(distuninstallcheck_dir)' >&2; \
+          exit 1; \
+        }; \
+        $(am__cd) '$(distuninstallcheck_dir)' || { \
+          echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+          exit 1; \
+        }; \
+        test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+           || { echo "ERROR: files left after uninstall:" ; \
+                if test -n "$(DESTDIR)"; then \
+                  echo "  (check DESTDIR support)"; \
+                fi ; \
+                $(distuninstallcheck_listfiles) ; \
+                exit 1; } >&2
+distcleancheck: distclean
+        @if test '$(srcdir)' = . ; then \
+          echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+          exit 1 ; \
+        fi
+        @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+          || { echo "ERROR: files left in build directory after distclean:" ; \
+               $(distcleancheck_listfiles) ; \
+               exit 1; } >&2
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES) $(PROGRAMS)
+installdirs:
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+        done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+        if test -z '$(STRIP)'; then \
+          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+              install; \
+        else \
+          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+        fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+        -rm -f ./$(am__dirstamp)
+        -test -z "$(DEPDIR)/$(am__dirstamp)" || rm -f $(DEPDIR)/$(am__dirstamp)
+
+maintainer-clean-generic:
+        @echo "This command is intended for maintainers to use"
+        @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
+        clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+        -rm -rf ./$(DEPDIR)
+        -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+        distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+        -rm -rf $(top_srcdir)/autom4te.cache
+        -rm -rf ./$(DEPDIR)
+        -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
+        clean-binPROGRAMS clean-cscope clean-generic \
+        clean-noinstLIBRARIES clean-noinstPROGRAMS cscope \
+        cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+        dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+        distcheck distclean distclean-compile distclean-generic \
+        distclean-tags distcleancheck distdir distuninstallcheck dvi \
+        dvi-am html html-am info info-am install install-am \
+        install-binPROGRAMS install-data install-data-am install-dvi \
+        install-dvi-am install-exec install-exec-am install-html \
+        install-html-am install-info install-info-am install-man \
+        install-pdf install-pdf-am install-ps install-ps-am \
+        install-strip installcheck installcheck-am installdirs \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+        tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
+
+test: benchmark.html benchmark.txt
+
+benchmark.html: benchmark.txt benchmark.pl
+        ./benchmark.pl benchmark.txt > $@
+
+benchmark.txt: benchmark.sh $(GAMES)
+        ./benchmark.sh > $@
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/apps/plugins/puzzles/src/Makefile.nestedvm b/apps/plugins/puzzles/src/Makefile.nestedvm
new file mode 100644
index 0000000000..cf91de2e53
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.nestedvm
@@ -0,0 +1,556 @@
+# Makefile for puzzles under NestedVM.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+
+# This path points at the nestedvm root directory
+NESTEDVM = /opt/nestedvm
+# You can define this path to point at your tools if you need to
+TOOLPATH = $(NESTEDVM)/upstream/install/bin
+CC = $(TOOLPATH)/mips-unknown-elf-gcc
+
+CFLAGS = -O2 -Wall -Werror -DSLOW_SYSTEM -g -I./ -Iicons/
+
+all: blackbox.jar bridges.jar cube.jar dominosa.jar fifteen.jar filling.jar \
+                flip.jar flood.jar galaxies.jar guess.jar inertia.jar \
+                keen.jar lightup.jar loopy.jar magnets.jar map.jar mines.jar \
+                net.jar netslide.jar nullgame.jar palisade.jar pattern.jar \
+                pearl.jar pegs.jar range.jar rect.jar samegame.jar \
+                signpost.jar singles.jar sixteen.jar slant.jar solo.jar \
+                tents.jar towers.jar tracks.jar twiddle.jar undead.jar \
+                unequal.jar unruly.jar untangle.jar
+
+blackbox.mips: blackbox.o drawing.o nestedvm.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ blackbox.o drawing.o nestedvm.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                 -lm
+
+bridges.mips: bridges.o drawing.o dsf.o findloop.o nestedvm.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ bridges.o drawing.o dsf.o findloop.o \
+                nestedvm.o malloc.o midend.o misc.o no-icon.o printing.o \
+                ps.o random.o version.o  -lm
+
+cube.mips: cube.o drawing.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ cube.o drawing.o nestedvm.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                 -lm
+
+dominosa.mips: dominosa.o drawing.o nestedvm.o laydomino.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ dominosa.o drawing.o nestedvm.o laydomino.o \
+                malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                version.o  -lm
+
+fifteen.mips: drawing.o fifteen.o nestedvm.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o fifteen.o nestedvm.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                 -lm
+
+filling.mips: drawing.o dsf.o filling.o nestedvm.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o filling.o nestedvm.o \
+                malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                version.o  -lm
+
+flip.mips: drawing.o flip.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o tree234.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o flip.o nestedvm.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                version.o  -lm
+
+flood.mips: drawing.o flood.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o flood.o nestedvm.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                 -lm
+
+galaxies.mips: drawing.o dsf.o galaxies.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o galaxies.o nestedvm.o \
+                malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                version.o  -lm
+
+guess.mips: drawing.o nestedvm.o guess.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o guess.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                 -lm
+
+inertia.mips: drawing.o nestedvm.o inertia.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o inertia.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                 -lm
+
+keen.mips: drawing.o dsf.o nestedvm.o keen.o latin.o malloc.o maxflow.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o nestedvm.o keen.o latin.o \
+                malloc.o maxflow.o midend.o misc.o no-icon.o printing.o ps.o \
+                random.o tree234.o version.o  -lm
+
+lightup.mips: combi.o drawing.o nestedvm.o lightup.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ combi.o drawing.o nestedvm.o lightup.o \
+                malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                version.o  -lm
+
+loopy.mips: drawing.o dsf.o grid.o nestedvm.o loopgen.o loopy.o malloc.o \
+                midend.o misc.o no-icon.o penrose.o printing.o ps.o random.o \
+                tree234.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o grid.o nestedvm.o loopgen.o \
+                loopy.o malloc.o midend.o misc.o no-icon.o penrose.o \
+                printing.o ps.o random.o tree234.o version.o  -lm
+
+magnets.mips: drawing.o nestedvm.o laydomino.o magnets.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o laydomino.o magnets.o \
+                malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                version.o  -lm
+
+map.mips: drawing.o dsf.o nestedvm.o malloc.o map.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o nestedvm.o malloc.o map.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o version.o \
+                 -lm
+
+mines.mips: drawing.o nestedvm.o malloc.o midend.o mines.o misc.o no-icon.o \
+                printing.o ps.o random.o tree234.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                mines.o misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                version.o  -lm
+
+net.mips: drawing.o dsf.o findloop.o nestedvm.o malloc.o midend.o misc.o \
+                net.o no-icon.o printing.o ps.o random.o tree234.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o findloop.o nestedvm.o \
+                malloc.o midend.o misc.o net.o no-icon.o printing.o ps.o \
+                random.o tree234.o version.o  -lm
+
+netslide.mips: drawing.o nestedvm.o malloc.o midend.o misc.o netslide.o \
+                no-icon.o printing.o ps.o random.o tree234.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                misc.o netslide.o no-icon.o printing.o ps.o random.o \
+                tree234.o version.o  -lm
+
+nullgame.mips: drawing.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                nullgame.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o nullgame.o printing.o ps.o random.o \
+                version.o  -lm
+
+palisade.mips: divvy.o drawing.o dsf.o nestedvm.o malloc.o midend.o misc.o \
+                no-icon.o palisade.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ divvy.o drawing.o dsf.o nestedvm.o malloc.o \
+                midend.o misc.o no-icon.o palisade.o printing.o ps.o \
+                random.o version.o  -lm
+
+pattern.mips: drawing.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                pattern.o printing.o ps.o random.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o pattern.o printing.o ps.o random.o \
+                version.o  -lm
+
+pearl.mips: drawing.o dsf.o grid.o nestedvm.o loopgen.o malloc.o midend.o \
+                misc.o no-icon.o pearl.o penrose.o printing.o ps.o random.o \
+                tdq.o tree234.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o grid.o nestedvm.o loopgen.o \
+                malloc.o midend.o misc.o no-icon.o pearl.o penrose.o \
+                printing.o ps.o random.o tdq.o tree234.o version.o  -lm
+
+pegs.mips: drawing.o nestedvm.o malloc.o midend.o misc.o no-icon.o pegs.o \
+                printing.o ps.o random.o tree234.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o pegs.o printing.o ps.o random.o tree234.o \
+                version.o  -lm
+
+range.mips: drawing.o dsf.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o range.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o range.o version.o  \
+                -lm
+
+rect.mips: drawing.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o rect.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o rect.o version.o  \
+                -lm
+
+samegame.mips: drawing.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o samegame.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o samegame.o \
+                version.o  -lm
+
+signpost.mips: drawing.o dsf.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o signpost.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o signpost.o \
+                version.o  -lm
+
+singles.mips: drawing.o dsf.o nestedvm.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o singles.o \
+                tree234.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o nestedvm.o latin.o malloc.o \
+                maxflow.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                singles.o tree234.o version.o  -lm
+
+sixteen.mips: drawing.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o sixteen.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o sixteen.o \
+                version.o  -lm
+
+slant.mips: drawing.o dsf.o findloop.o nestedvm.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o slant.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o findloop.o nestedvm.o \
+                malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                slant.o version.o  -lm
+
+solo.mips: divvy.o drawing.o dsf.o nestedvm.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o solo.o version.o
+        $(CC) $(XLDFLAGS) -o $@ divvy.o drawing.o dsf.o nestedvm.o malloc.o \
+                midend.o misc.o no-icon.o printing.o ps.o random.o solo.o \
+                version.o  -lm
+
+tents.mips: drawing.o dsf.o nestedvm.o malloc.o maxflow.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o tents.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o nestedvm.o malloc.o \
+                maxflow.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                tents.o version.o  -lm
+
+towers.mips: drawing.o nestedvm.o latin.o malloc.o maxflow.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o towers.o tree234.o \
+                version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o latin.o malloc.o \
+                maxflow.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                towers.o tree234.o version.o  -lm
+
+tracks.mips: drawing.o dsf.o findloop.o nestedvm.o malloc.o midend.o misc.o \
+                no-icon.o printing.o ps.o random.o tracks.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o dsf.o findloop.o nestedvm.o \
+                malloc.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                tracks.o version.o  -lm
+
+twiddle.mips: drawing.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o twiddle.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o twiddle.o \
+                version.o  -lm
+
+undead.mips: drawing.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o undead.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o undead.o version.o \
+                 -lm
+
+unequal.mips: drawing.o nestedvm.o latin.o malloc.o maxflow.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                unequal.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o latin.o malloc.o \
+                maxflow.o midend.o misc.o no-icon.o printing.o ps.o random.o \
+                tree234.o unequal.o version.o  -lm
+
+unruly.mips: drawing.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o unruly.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o unruly.o version.o \
+                 -lm
+
+untangle.mips: drawing.o nestedvm.o malloc.o midend.o misc.o no-icon.o \
+                printing.o ps.o random.o tree234.o untangle.o version.o
+        $(CC) $(XLDFLAGS) -o $@ drawing.o nestedvm.o malloc.o midend.o \
+                misc.o no-icon.o printing.o ps.o random.o tree234.o \
+                untangle.o version.o  -lm
+
+blackbox.o: ./blackbox.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+blackbo3.o: ./blackbox.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+bridges.o: ./bridges.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+bridges3.o: ./bridges.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+combi.o: ./combi.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube.o: ./cube.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube3.o: ./cube.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+divvy.o: ./divvy.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominosa.o: ./dominosa.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominos3.o: ./dominosa.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+drawing.o: ./drawing.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dsf.o: ./dsf.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen5.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+fifteen2.o: ./fifteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+filling.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+filling5.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+filling2.o: ./filling.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+findloop.o: ./findloop.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip3.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+flood.o: ./flood.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flood3.o: ./flood.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxies.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+galaxie7.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxie4.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+galaxie2.o: ./galaxies.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+grid.o: ./grid.c ./puzzles.h ./tree234.h ./grid.h ./penrose.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nestedvm.o: ./nestedvm.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess.o: ./guess.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess3.o: ./guess.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+inertia.o: ./inertia.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+inertia3.o: ./inertia.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+keen5.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen2.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+latin.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+latin8.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_LATIN_TEST -c $< -o $@
+latin6.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+laydomino.o: ./laydomino.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup5.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+lightup2.o: ./lightup.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+list.o: ./list.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopgen.o: ./loopgen.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy5.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+loopy2.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+magnets.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+magnets5.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+magnets2.o: ./magnets.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+malloc.o: ./malloc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map5.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+map2.o: ./map.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+maxflow.o: ./maxflow.c ./maxflow.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+midend.o: ./midend.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines5.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+mines2.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_OBFUSCATOR -c $< -o $@
+misc.o: ./misc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net3.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+netslide.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+netslid3.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+no-icon.o: ./no-icon.c
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullfe.o: ./nullfe.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullgame.o: ./nullgame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+obfusc.o: ./obfusc.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+osx.o: ./osx.m ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisade.o: ./palisade.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisad3.o: ./palisade.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pattern7.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern4.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+pattern2.o: ./pattern.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pearl.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pearl5.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pearl2.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pegs.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pegs3.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+penrose.o: ./penrose.c ./puzzles.h ./penrose.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+printing.o: ./printing.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+ps.o: ./ps.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+random.o: ./random.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range.o: ./range.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range3.o: ./range.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+rect.o: ./rect.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+rect3.o: ./rect.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+samegame.o: ./samegame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+samegam3.o: ./samegame.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpost.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+signpos5.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpos2.o: ./signpost.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+singles.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+singles5.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+singles3.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+sixteen.o: ./sixteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+sixteen3.o: ./sixteen.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+slant5.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant2.o: ./slant.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+solo.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+solo5.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+solo2.o: ./solo.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tdq.o: ./tdq.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents5.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tents3.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+towers.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+towers5.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+towers2.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tracks.o: ./tracks.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tracks3.o: ./tracks.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tree234.o: ./tree234.c ./tree234.h ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle.o: ./twiddle.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle3.o: ./twiddle.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+undead.o: ./undead.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+undead3.o: ./undead.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unequal5.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal2.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+unruly.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unruly5.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unruly2.o: ./unruly.c ./puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+untangle.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+untangl3.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+version.o: ./version.c ./version.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows1.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+
+.PRECIOUS: %.class
+%.class: %.mips
+        java -cp $(NESTEDVM)/build:$(NESTEDVM)/upstream/build/classgen/build \
+                org.ibex.nestedvm.Compiler -outformat class -d . \
+                PuzzleEngine $<
+                mv PuzzleEngine.class $@
+
+org:
+        mkdir -p org/ibex/nestedvm/util
+        cp $(NESTEDVM)/build/org/ibex/nestedvm/Registers.class org/ibex/nestedvm
+        cp $(NESTEDVM)/build/org/ibex/nestedvm/UsermodeConstants.class org/ibex/nestedvm
+        cp $(NESTEDVM)/build/org/ibex/nestedvm/Runtime*.class org/ibex/nestedvm
+        cp $(NESTEDVM)/build/org/ibex/nestedvm/util/Platform*.class org/ibex/nestedvm/util
+        cp $(NESTEDVM)/build/org/ibex/nestedvm/util/Seekable*.class org/ibex/nestedvm/util
+        echo "Main-Class: PuzzleApplet" >applet.manifest
+
+PuzzleApplet.class: PuzzleApplet.java org
+        javac -source 1.3 -target 1.3 PuzzleApplet.java
+
+%.jar: %.class PuzzleApplet.class org
+        mv $< PuzzleEngine.class
+        jar cfm $@ applet.manifest PuzzleEngine.class PuzzleApplet*.class org
+        echo '<applet archive="'$@'" code="PuzzleApplet" width="700" height="500"></applet>' >$*.html
+        mv PuzzleEngine.class $<
+
+clean:
+        rm -rf *.o *.mips *.class *.html *.jar org applet.manifest
diff --git a/apps/plugins/puzzles/src/Makefile.osx b/apps/plugins/puzzles/src/Makefile.osx
new file mode 100644
index 0000000000..5d607d88e3
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.osx
@@ -0,0 +1,574 @@
+# Makefile for puzzles under Mac OS X.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+CC = $(TOOLPATH)gcc
+LIPO = $(TOOLPATH)lipo
+
+CFLAGS = -O2 -Wall -Werror -g -I./ -Iicons/
+LDFLAGS = -framework Cocoa
+all: Puzzles fifteensolver fillingsolver galaxiespicture galaxiessolver \
+                keensolver latincheck lightupsolver loopysolver \
+                magnetssolver mapsolver mineobfusc obfusc patternpicture \
+                patternsolver pearlbench signpostsolver singlessolver \
+                slantsolver solosolver tentssolver towerssolver \
+                unequalsolver unrulysolver
+Puzzles_extra = Puzzles.app/Contents/Resources/Help/index.html
+Puzzles.app/Contents/Resources/Help/index.html: \
+        Puzzles.app/Contents/Resources/Help osx-help.but puzzles.but
+        cd Puzzles.app/Contents/Resources/Help; \
+                halibut --html ../../../../osx-help.but ../../../../puzzles.but
+Puzzles.app/Contents/Resources/Help: Puzzles.app/Contents/Resources
+        mkdir -p Puzzles.app/Contents/Resources/Help
+
+release: Puzzles.dmg
+Puzzles.dmg: Puzzles
+        rm -f raw.dmg
+        hdiutil create -megabytes 5 -layout NONE raw.dmg
+        hdid -nomount raw.dmg > devicename
+        newfs_hfs -v "Simon Tatham's Puzzle Collection" `cat devicename`
+        hdiutil eject `cat devicename`
+        hdid raw.dmg | cut -f1 -d' ' > devicename
+        cp -R Puzzles.app /Volumes/"Simon Tatham's Puzzle Collection"
+        hdiutil eject `cat devicename`
+        rm -f Puzzles.dmg
+        hdiutil convert -format UDCO raw.dmg -o Puzzles.dmg
+        rm -f raw.dmg devicename
+
+.SUFFIXES: .o .c .m
+
+
+
+Puzzles.app:
+        mkdir -p $@
+Puzzles.app/Contents: Puzzles.app
+        mkdir -p $@
+Puzzles.app/Contents/MacOS: Puzzles.app/Contents
+        mkdir -p $@
+Puzzles.app/Contents/Resources: Puzzles.app/Contents
+        mkdir -p $@
+Puzzles.app/Contents/Resources/Puzzles.icns: Puzzles.app/Contents/Resources osx.icns
+        cp osx.icns $@
+Puzzles.app/Contents/Info.plist: Puzzles.app/Contents/Resources osx-info.plist
+        cp osx-info.plist $@
+Puzzles: Puzzles.app/Contents/MacOS/Puzzles \
+                Puzzles.app/Contents/Resources/Puzzles.icns \
+                Puzzles.app/Contents/Info.plist $(Puzzles_extra)
+
+Puzzles.i386.bin: blackbo3.i386.o bridges3.i386.o combi.i386.o cube3.i386.o \
+                divvy.i386.o dominos3.i386.o drawing.i386.o dsf.i386.o \
+                fifteen5.i386.o filling5.i386.o findloop.i386.o flip3.i386.o \
+                flood3.i386.o galaxie7.i386.o grid.i386.o guess3.i386.o \
+                inertia3.i386.o keen5.i386.o latin.i386.o laydomino.i386.o \
+                lightup5.i386.o list.i386.o loopgen.i386.o loopy5.i386.o \
+                magnets5.i386.o malloc.i386.o map5.i386.o maxflow.i386.o \
+                midend.i386.o mines5.i386.o misc.i386.o net3.i386.o \
+                netslid3.i386.o osx.i386.o palisad3.i386.o pattern7.i386.o \
+                pearl5.i386.o pegs3.i386.o penrose.i386.o random.i386.o \
+                range3.i386.o rect3.i386.o samegam3.i386.o signpos5.i386.o \
+                singles5.i386.o sixteen3.i386.o slant5.i386.o solo5.i386.o \
+                tdq.i386.o tents5.i386.o towers5.i386.o tracks3.i386.o \
+                tree234.i386.o twiddle3.i386.o undead3.i386.o \
+                unequal5.i386.o unruly5.i386.o untangl3.i386.o \
+                version.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(LDFLAGS) -o $@ \
+                blackbo3.i386.o bridges3.i386.o combi.i386.o cube3.i386.o \
+                divvy.i386.o dominos3.i386.o drawing.i386.o dsf.i386.o \
+                fifteen5.i386.o filling5.i386.o findloop.i386.o flip3.i386.o \
+                flood3.i386.o galaxie7.i386.o grid.i386.o guess3.i386.o \
+                inertia3.i386.o keen5.i386.o latin.i386.o laydomino.i386.o \
+                lightup5.i386.o list.i386.o loopgen.i386.o loopy5.i386.o \
+                magnets5.i386.o malloc.i386.o map5.i386.o maxflow.i386.o \
+                midend.i386.o mines5.i386.o misc.i386.o net3.i386.o \
+                netslid3.i386.o osx.i386.o palisad3.i386.o pattern7.i386.o \
+                pearl5.i386.o pegs3.i386.o penrose.i386.o random.i386.o \
+                range3.i386.o rect3.i386.o samegam3.i386.o signpos5.i386.o \
+                singles5.i386.o sixteen3.i386.o slant5.i386.o solo5.i386.o \
+                tdq.i386.o tents5.i386.o towers5.i386.o tracks3.i386.o \
+                tree234.i386.o twiddle3.i386.o undead3.i386.o \
+                unequal5.i386.o unruly5.i386.o untangl3.i386.o \
+                version.i386.o 
+
+Puzzles.app/Contents/MacOS/Puzzles: Puzzles.app/Contents/MacOS \
+                Puzzles.i386.bin
+        $(LIPO) -create  Puzzles.i386.bin -output $@
+
+fifteensolver.i386: fifteen2.i386.o malloc.i386.o misc.i386.o nullfe.i386.o \
+                random.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                fifteen2.i386.o malloc.i386.o misc.i386.o nullfe.i386.o \
+                random.i386.o 
+
+fifteensolver: fifteensolver.i386
+        $(LIPO) -create  fifteensolver.i386 -output $@
+
+fillingsolver.i386: dsf.i386.o filling2.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                dsf.i386.o filling2.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o 
+
+fillingsolver: fillingsolver.i386
+        $(LIPO) -create  fillingsolver.i386 -output $@
+
+galaxiespicture.i386: dsf.i386.o galaxie4.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                dsf.i386.o galaxie4.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o -lm
+
+galaxiespicture: galaxiespicture.i386
+        $(LIPO) -create  galaxiespicture.i386 -output $@
+
+galaxiessolver.i386: dsf.i386.o galaxie2.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                dsf.i386.o galaxie2.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o -lm
+
+galaxiessolver: galaxiessolver.i386
+        $(LIPO) -create  galaxiessolver.i386 -output $@
+
+keensolver.i386: dsf.i386.o keen2.i386.o latin6.i386.o malloc.i386.o \
+                maxflow.i386.o misc.i386.o nullfe.i386.o random.i386.o \
+                tree234.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                dsf.i386.o keen2.i386.o latin6.i386.o malloc.i386.o \
+                maxflow.i386.o misc.i386.o nullfe.i386.o random.i386.o \
+                tree234.i386.o 
+
+keensolver: keensolver.i386
+        $(LIPO) -create  keensolver.i386 -output $@
+
+latincheck.i386: latin8.i386.o malloc.i386.o maxflow.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o tree234.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                latin8.i386.o malloc.i386.o maxflow.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o tree234.i386.o 
+
+latincheck: latincheck.i386
+        $(LIPO) -create  latincheck.i386 -output $@
+
+lightupsolver.i386: combi.i386.o lightup2.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                combi.i386.o lightup2.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o 
+
+lightupsolver: lightupsolver.i386
+        $(LIPO) -create  lightupsolver.i386 -output $@
+
+loopysolver.i386: dsf.i386.o grid.i386.o loopgen.i386.o loopy2.i386.o \
+                malloc.i386.o misc.i386.o nullfe.i386.o penrose.i386.o \
+                random.i386.o tree234.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                dsf.i386.o grid.i386.o loopgen.i386.o loopy2.i386.o \
+                malloc.i386.o misc.i386.o nullfe.i386.o penrose.i386.o \
+                random.i386.o tree234.i386.o -lm
+
+loopysolver: loopysolver.i386
+        $(LIPO) -create  loopysolver.i386 -output $@
+
+magnetssolver.i386: laydomino.i386.o magnets2.i386.o malloc.i386.o \
+                misc.i386.o nullfe.i386.o random.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                laydomino.i386.o magnets2.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o -lm
+
+magnetssolver: magnetssolver.i386
+        $(LIPO) -create  magnetssolver.i386 -output $@
+
+mapsolver.i386: dsf.i386.o malloc.i386.o map2.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                dsf.i386.o malloc.i386.o map2.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o -lm
+
+mapsolver: mapsolver.i386
+        $(LIPO) -create  mapsolver.i386 -output $@
+
+mineobfusc.i386: malloc.i386.o mines2.i386.o misc.i386.o nullfe.i386.o \
+                random.i386.o tree234.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                malloc.i386.o mines2.i386.o misc.i386.o nullfe.i386.o \
+                random.i386.o tree234.i386.o 
+
+mineobfusc: mineobfusc.i386
+        $(LIPO) -create  mineobfusc.i386 -output $@
+
+obfusc.i386: malloc.i386.o misc.i386.o nullfe.i386.o obfusc.i386.o \
+                random.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                malloc.i386.o misc.i386.o nullfe.i386.o obfusc.i386.o \
+                random.i386.o 
+
+obfusc: obfusc.i386
+        $(LIPO) -create  obfusc.i386 -output $@
+
+patternpicture.i386: malloc.i386.o misc.i386.o nullfe.i386.o pattern4.i386.o \
+                random.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                malloc.i386.o misc.i386.o nullfe.i386.o pattern4.i386.o \
+                random.i386.o 
+
+patternpicture: patternpicture.i386
+        $(LIPO) -create  patternpicture.i386 -output $@
+
+patternsolver.i386: malloc.i386.o misc.i386.o nullfe.i386.o pattern2.i386.o \
+                random.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                malloc.i386.o misc.i386.o nullfe.i386.o pattern2.i386.o \
+                random.i386.o 
+
+patternsolver: patternsolver.i386
+        $(LIPO) -create  patternsolver.i386 -output $@
+
+pearlbench.i386: dsf.i386.o grid.i386.o loopgen.i386.o malloc.i386.o \
+                misc.i386.o nullfe.i386.o pearl2.i386.o penrose.i386.o \
+                random.i386.o tdq.i386.o tree234.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                dsf.i386.o grid.i386.o loopgen.i386.o malloc.i386.o \
+                misc.i386.o nullfe.i386.o pearl2.i386.o penrose.i386.o \
+                random.i386.o tdq.i386.o tree234.i386.o -lm
+
+pearlbench: pearlbench.i386
+        $(LIPO) -create  pearlbench.i386 -output $@
+
+signpostsolver.i386: dsf.i386.o malloc.i386.o misc.i386.o nullfe.i386.o \
+                random.i386.o signpos2.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                dsf.i386.o malloc.i386.o misc.i386.o nullfe.i386.o \
+                random.i386.o signpos2.i386.o -lm
+
+signpostsolver: signpostsolver.i386
+        $(LIPO) -create  signpostsolver.i386 -output $@
+
+singlessolver.i386: dsf.i386.o latin.i386.o malloc.i386.o maxflow.i386.o \
+                misc.i386.o nullfe.i386.o random.i386.o singles3.i386.o \
+                tree234.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                dsf.i386.o latin.i386.o malloc.i386.o maxflow.i386.o \
+                misc.i386.o nullfe.i386.o random.i386.o singles3.i386.o \
+                tree234.i386.o 
+
+singlessolver: singlessolver.i386
+        $(LIPO) -create  singlessolver.i386 -output $@
+
+slantsolver.i386: dsf.i386.o findloop.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o slant2.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                dsf.i386.o findloop.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o slant2.i386.o 
+
+slantsolver: slantsolver.i386
+        $(LIPO) -create  slantsolver.i386 -output $@
+
+solosolver.i386: divvy.i386.o dsf.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o solo2.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                divvy.i386.o dsf.i386.o malloc.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o solo2.i386.o 
+
+solosolver: solosolver.i386
+        $(LIPO) -create  solosolver.i386 -output $@
+
+tentssolver.i386: dsf.i386.o malloc.i386.o maxflow.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o tents3.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                dsf.i386.o malloc.i386.o maxflow.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o tents3.i386.o 
+
+tentssolver: tentssolver.i386
+        $(LIPO) -create  tentssolver.i386 -output $@
+
+towerssolver.i386: latin6.i386.o malloc.i386.o maxflow.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o towers2.i386.o tree234.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                latin6.i386.o malloc.i386.o maxflow.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o towers2.i386.o tree234.i386.o 
+
+towerssolver: towerssolver.i386
+        $(LIPO) -create  towerssolver.i386 -output $@
+
+unequalsolver.i386: latin6.i386.o malloc.i386.o maxflow.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o tree234.i386.o unequal2.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                latin6.i386.o malloc.i386.o maxflow.i386.o misc.i386.o \
+                nullfe.i386.o random.i386.o tree234.i386.o unequal2.i386.o 
+
+unequalsolver: unequalsolver.i386
+        $(LIPO) -create  unequalsolver.i386 -output $@
+
+unrulysolver.i386: malloc.i386.o misc.i386.o nullfe.i386.o random.i386.o \
+                unruly2.i386.o
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(ULDFLAGS) -o $@ \
+                malloc.i386.o misc.i386.o nullfe.i386.o random.i386.o \
+                unruly2.i386.o 
+
+unrulysolver: unrulysolver.i386
+        $(LIPO) -create  unrulysolver.i386 -output $@
+
+blackbox.i386.o: ./blackbox.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+blackbo3.i386.o: ./blackbox.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+bridges.i386.o: ./bridges.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+bridges3.i386.o: ./bridges.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+combi.i386.o: ./combi.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube.i386.o: ./cube.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+cube3.i386.o: ./cube.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+divvy.i386.o: ./divvy.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominosa.i386.o: ./dominosa.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dominos3.i386.o: ./dominosa.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+drawing.i386.o: ./drawing.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+dsf.i386.o: ./dsf.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen.i386.o: ./fifteen.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+fifteen5.i386.o: ./fifteen.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+fifteen2.i386.o: ./fifteen.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+filling.i386.o: ./filling.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+filling5.i386.o: ./filling.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+filling2.i386.o: ./filling.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+findloop.i386.o: ./findloop.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip.i386.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flip3.i386.o: ./flip.c ./puzzles.h ./tree234.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+flood.i386.o: ./flood.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+flood3.i386.o: ./flood.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxies.i386.o: ./galaxies.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+galaxie7.i386.o: ./galaxies.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+galaxie4.i386.o: ./galaxies.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+galaxie2.i386.o: ./galaxies.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+grid.i386.o: ./grid.c ./puzzles.h ./tree234.h ./grid.h ./penrose.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+gtk.i386.o: ./gtk.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess.i386.o: ./guess.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+guess3.i386.o: ./guess.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+inertia.i386.o: ./inertia.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+inertia3.i386.o: ./inertia.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen.i386.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+keen5.i386.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+keen2.i386.o: ./keen.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+latin.i386.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+latin8.i386.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_LATIN_TEST -c $< -o $@
+latin6.i386.o: ./latin.c ./puzzles.h ./tree234.h ./maxflow.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+laydomino.i386.o: ./laydomino.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup.i386.o: ./lightup.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+lightup5.i386.o: ./lightup.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+lightup2.i386.o: ./lightup.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+list.i386.o: ./list.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopgen.i386.o: ./loopgen.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy.i386.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+loopy5.i386.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+loopy2.i386.o: ./loopy.c ./puzzles.h ./tree234.h ./grid.h ./loopgen.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+magnets.i386.o: ./magnets.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+magnets5.i386.o: ./magnets.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+magnets2.i386.o: ./magnets.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+malloc.i386.o: ./malloc.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map.i386.o: ./map.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+map5.i386.o: ./map.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+map2.i386.o: ./map.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+maxflow.i386.o: ./maxflow.c ./maxflow.h ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+midend.i386.o: ./midend.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines.i386.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+mines5.i386.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+mines2.i386.o: ./mines.c ./tree234.h ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_OBFUSCATOR -c $< -o $@
+misc.i386.o: ./misc.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net.i386.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+net3.i386.o: ./net.c ./puzzles.h ./tree234.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+netslide.i386.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+netslid3.i386.o: ./netslide.c ./puzzles.h ./tree234.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+no-icon.i386.o: ./no-icon.c
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullfe.i386.o: ./nullfe.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+nullgame.i386.o: ./nullgame.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+obfusc.i386.o: ./obfusc.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+osx.i386.o: ./osx.m ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 -x objective-c $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisade.i386.o: ./palisade.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+palisad3.i386.o: ./palisade.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern.i386.o: ./pattern.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pattern7.i386.o: ./pattern.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pattern4.i386.o: ./pattern.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_PICTURE_GENERATOR -c $< -o $@
+pattern2.i386.o: ./pattern.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pearl.i386.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pearl5.i386.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+pearl2.i386.o: ./pearl.c ./puzzles.h ./grid.h ./loopgen.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+pegs.i386.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+pegs3.i386.o: ./pegs.c ./puzzles.h ./tree234.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+penrose.i386.o: ./penrose.c ./puzzles.h ./penrose.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+printing.i386.o: ./printing.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+ps.i386.o: ./ps.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+random.i386.o: ./random.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range.i386.o: ./range.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+range3.i386.o: ./range.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+rect.i386.o: ./rect.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+rect3.i386.o: ./rect.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+samegame.i386.o: ./samegame.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+samegam3.i386.o: ./samegame.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpost.i386.o: ./signpost.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+signpos5.i386.o: ./signpost.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+signpos2.i386.o: ./signpost.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+singles.i386.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+singles5.i386.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+singles3.i386.o: ./singles.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+sixteen.i386.o: ./sixteen.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+sixteen3.i386.o: ./sixteen.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant.i386.o: ./slant.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+slant5.i386.o: ./slant.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+slant2.i386.o: ./slant.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+solo.i386.o: ./solo.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+solo5.i386.o: ./solo.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+solo2.i386.o: ./solo.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tdq.i386.o: ./tdq.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents.i386.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tents5.i386.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tents3.i386.o: ./tents.c ./puzzles.h ./maxflow.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+towers.i386.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+towers5.i386.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+towers2.i386.o: ./towers.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+tracks.i386.o: ./tracks.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+tracks3.i386.o: ./tracks.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+tree234.i386.o: ./tree234.c ./tree234.h ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle.i386.o: ./twiddle.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+twiddle3.i386.o: ./twiddle.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+undead.i386.o: ./undead.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+undead3.i386.o: ./undead.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal.i386.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unequal5.i386.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unequal2.i386.o: ./unequal.c ./puzzles.h ./latin.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+unruly.i386.o: ./unruly.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+unruly5.i386.o: ./unruly.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+unruly2.i386.o: ./unruly.c ./puzzles.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DSTANDALONE_SOLVER -c $< -o $@
+untangle.i386.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+untangl3.i386.o: ./untangle.c ./puzzles.h ./tree234.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+version.i386.o: ./version.c ./version.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows.i386.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -c $< -o $@
+windows1.i386.o: ./windows.c ./puzzles.h ./resource.h
+        $(CC) -arch i386 -mmacosx-version-min=10.4 $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) -DCOMBINED -c $< -o $@
+
+clean:
+        rm -f *.o *.dmg fifteensolver fifteensolver.i386 fillingsolver fillingsolver.i386 galaxiespicture galaxiespicture.i386 galaxiessolver galaxiessolver.i386 keensolver keensolver.i386 latincheck latincheck.i386 lightupsolver lightupsolver.i386 loopysolver loopysolver.i386 magnetssolver magnetssolver.i386 mapsolver mapsolver.i386 mineobfusc mineobfusc.i386 obfusc obfusc.i386 patternpicture patternpicture.i386 patternsolver patternsolver.i386 pearlbench pearlbench.i386 signpostsolver signpostsolver.i386 singlessolver singlessolver.i386 slantsolver slantsolver.i386 solosolver solosolver.i386 tentssolver tentssolver.i386 towerssolver towerssolver.i386 unequalsolver unequalsolver.i386 unrulysolver unrulysolver.i386
+        rm -rf *.app
diff --git a/apps/plugins/puzzles/src/Makefile.vc b/apps/plugins/puzzles/src/Makefile.vc
new file mode 100644
index 0000000000..45e77a5d8a
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.vc
@@ -0,0 +1,1040 @@
+# Makefile for puzzles under Visual C.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+
+# If you rename this file to `Makefile', you should change this line,
+# so that the .rsp files still depend on the correct makefile.
+MAKEFILE = Makefile.vc
+
+# C compilation flags
+CFLAGS = /nologo /W3 /O1 /D_WINDOWS /D_WIN32_WINDOWS=0x401 /DWINVER=0x401 /I.
+LFLAGS = /incremental:no /fixed
+
+all: blackbox.exe bridges.exe cube.exe dominosa.exe fifteen.exe \
+                fifteensolver.exe filling.exe fillingsolver.exe flip.exe \
+                flood.exe galaxies.exe galaxiespicture.exe \
+                galaxiessolver.exe guess.exe inertia.exe keen.exe \
+                keensolver.exe latincheck.exe lightup.exe lightupsolver.exe \
+                loopy.exe loopysolver.exe magnets.exe magnetssolver.exe \
+                map.exe mapsolver.exe mineobfusc.exe mines.exe netgame.exe \
+                netslide.exe nullgame.exe palisade.exe pattern.exe \
+                patternpicture.exe patternsolver.exe pearl.exe \
+                pearlbench.exe pegs.exe puzzles.exe range.exe rect.exe \
+                samegame.exe signpost.exe signpostsolver.exe singles.exe \
+                singlessolver.exe sixteen.exe slant.exe slantsolver.exe \
+                solo.exe solosolver.exe tents.exe tentssolver.exe towers.exe \
+                towerssolver.exe tracks.exe twiddle.exe undead.exe \
+                unequal.exe unequalsolver.exe unruly.exe unrulysolver.exe \
+                untangle.exe
+
+blackbox.exe: blackbox.obj drawing.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj version.obj windows.obj \
+                blackbox.rsp
+        link $(LFLAGS) -out:blackbox.exe -map:blackbox.map @blackbox.rsp
+
+bridges.exe: bridges.obj drawing.obj dsf.obj findloop.obj malloc.obj \
+                midend.obj misc.obj noicon.res printing.obj random.obj \
+                version.obj windows.obj bridges.rsp
+        link $(LFLAGS) -out:bridges.exe -map:bridges.map @bridges.rsp
+
+cube.exe: cube.obj drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj version.obj windows.obj cube.rsp
+        link $(LFLAGS) -out:cube.exe -map:cube.map @cube.rsp
+
+dominosa.exe: dominosa.obj drawing.obj laydomino.obj malloc.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj version.obj \
+                windows.obj dominosa.rsp
+        link $(LFLAGS) -out:dominosa.exe -map:dominosa.map @dominosa.rsp
+
+fifteen.exe: drawing.obj fifteen.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj version.obj windows.obj \
+                fifteen.rsp
+        link $(LFLAGS) -out:fifteen.exe -map:fifteen.map @fifteen.rsp
+
+fifteensolver.exe: fifteen2.obj malloc.obj misc.obj nullfe.obj random.obj \
+                fifteensolver.rsp
+        link $(LFLAGS) -out:fifteensolver.exe -map:fifteensolver.map @fifteensolver.rsp
+
+filling.exe: drawing.obj dsf.obj filling.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj version.obj windows.obj \
+                filling.rsp
+        link $(LFLAGS) -out:filling.exe -map:filling.map @filling.rsp
+
+fillingsolver.exe: dsf.obj filling2.obj malloc.obj misc.obj nullfe.obj \
+                random.obj fillingsolver.rsp
+        link $(LFLAGS) -out:fillingsolver.exe -map:fillingsolver.map @fillingsolver.rsp
+
+flip.exe: drawing.obj flip.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj tree234.obj version.obj windows.obj \
+                flip.rsp
+        link $(LFLAGS) -out:flip.exe -map:flip.map @flip.rsp
+
+flood.exe: drawing.obj flood.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj version.obj windows.obj flood.rsp
+        link $(LFLAGS) -out:flood.exe -map:flood.map @flood.rsp
+
+galaxies.exe: drawing.obj dsf.obj galaxies.obj malloc.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj version.obj \
+                windows.obj galaxies.rsp
+        link $(LFLAGS) -out:galaxies.exe -map:galaxies.map @galaxies.rsp
+
+galaxiespicture.exe: dsf.obj galaxie4.obj malloc.obj misc.obj nullfe.obj \
+                random.obj galaxiespicture.rsp
+        link $(LFLAGS) -out:galaxiespicture.exe -map:galaxiespicture.map @galaxiespicture.rsp
+
+galaxiessolver.exe: dsf.obj galaxie2.obj malloc.obj misc.obj nullfe.obj \
+                random.obj galaxiessolver.rsp
+        link $(LFLAGS) -out:galaxiessolver.exe -map:galaxiessolver.map @galaxiessolver.rsp
+
+guess.exe: drawing.obj guess.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj version.obj windows.obj guess.rsp
+        link $(LFLAGS) -out:guess.exe -map:guess.map @guess.rsp
+
+inertia.exe: drawing.obj inertia.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj version.obj windows.obj \
+                inertia.rsp
+        link $(LFLAGS) -out:inertia.exe -map:inertia.map @inertia.rsp
+
+keen.exe: drawing.obj dsf.obj keen.obj latin.obj malloc.obj maxflow.obj \
+                midend.obj misc.obj noicon.res printing.obj random.obj \
+                tree234.obj version.obj windows.obj keen.rsp
+        link $(LFLAGS) -out:keen.exe -map:keen.map @keen.rsp
+
+keensolver.exe: dsf.obj keen2.obj latin6.obj malloc.obj maxflow.obj misc.obj \
+                nullfe.obj random.obj tree234.obj keensolver.rsp
+        link $(LFLAGS) -out:keensolver.exe -map:keensolver.map @keensolver.rsp
+
+latincheck.exe: latin8.obj malloc.obj maxflow.obj misc.obj nullfe.obj \
+                random.obj tree234.obj latincheck.rsp
+        link $(LFLAGS) -out:latincheck.exe -map:latincheck.map @latincheck.rsp
+
+lightup.exe: combi.obj drawing.obj lightup.obj malloc.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj version.obj \
+                windows.obj lightup.rsp
+        link $(LFLAGS) -out:lightup.exe -map:lightup.map @lightup.rsp
+
+lightupsolver.exe: combi.obj lightup2.obj malloc.obj misc.obj nullfe.obj \
+                random.obj lightupsolver.rsp
+        link $(LFLAGS) -out:lightupsolver.exe -map:lightupsolver.map @lightupsolver.rsp
+
+loopy.exe: drawing.obj dsf.obj grid.obj loopgen.obj loopy.obj malloc.obj \
+                midend.obj misc.obj noicon.res penrose.obj printing.obj \
+                random.obj tree234.obj version.obj windows.obj loopy.rsp
+        link $(LFLAGS) -out:loopy.exe -map:loopy.map @loopy.rsp
+
+loopysolver.exe: dsf.obj grid.obj loopgen.obj loopy2.obj malloc.obj misc.obj \
+                nullfe.obj penrose.obj random.obj tree234.obj \
+                loopysolver.rsp
+        link $(LFLAGS) -out:loopysolver.exe -map:loopysolver.map @loopysolver.rsp
+
+magnets.exe: drawing.obj laydomino.obj magnets.obj malloc.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj version.obj \
+                windows.obj magnets.rsp
+        link $(LFLAGS) -out:magnets.exe -map:magnets.map @magnets.rsp
+
+magnetssolver.exe: laydomino.obj magnets2.obj malloc.obj misc.obj nullfe.obj \
+                random.obj magnetssolver.rsp
+        link $(LFLAGS) -out:magnetssolver.exe -map:magnetssolver.map @magnetssolver.rsp
+
+map.exe: drawing.obj dsf.obj malloc.obj map.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj version.obj windows.obj \
+                map.rsp
+        link $(LFLAGS) -out:map.exe -map:map.map @map.rsp
+
+mapsolver.exe: dsf.obj malloc.obj map2.obj misc.obj nullfe.obj random.obj \
+                mapsolver.rsp
+        link $(LFLAGS) -out:mapsolver.exe -map:mapsolver.map @mapsolver.rsp
+
+mineobfusc.exe: malloc.obj mines2.obj misc.obj nullfe.obj random.obj \
+                tree234.obj mineobfusc.rsp
+        link $(LFLAGS) -out:mineobfusc.exe -map:mineobfusc.map @mineobfusc.rsp
+
+mines.exe: drawing.obj malloc.obj midend.obj mines.obj misc.obj noicon.res \
+                printing.obj random.obj tree234.obj version.obj windows.obj \
+                mines.rsp
+        link $(LFLAGS) -out:mines.exe -map:mines.map @mines.rsp
+
+netgame.exe: drawing.obj dsf.obj findloop.obj malloc.obj midend.obj misc.obj \
+                net.obj noicon.res printing.obj random.obj tree234.obj \
+                version.obj windows.obj netgame.rsp
+        link $(LFLAGS) -out:netgame.exe -map:netgame.map @netgame.rsp
+
+netslide.exe: drawing.obj malloc.obj midend.obj misc.obj netslide.obj \
+                noicon.res printing.obj random.obj tree234.obj version.obj \
+                windows.obj netslide.rsp
+        link $(LFLAGS) -out:netslide.exe -map:netslide.map @netslide.rsp
+
+nullgame.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                nullgame.obj printing.obj random.obj version.obj windows.obj \
+                nullgame.rsp
+        link $(LFLAGS) -out:nullgame.exe -map:nullgame.map @nullgame.rsp
+
+palisade.exe: divvy.obj drawing.obj dsf.obj malloc.obj midend.obj misc.obj \
+                noicon.res palisade.obj printing.obj random.obj version.obj \
+                windows.obj palisade.rsp
+        link $(LFLAGS) -out:palisade.exe -map:palisade.map @palisade.rsp
+
+pattern.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                pattern.obj printing.obj random.obj version.obj windows.obj \
+                pattern.rsp
+        link $(LFLAGS) -out:pattern.exe -map:pattern.map @pattern.rsp
+
+patternpicture.exe: malloc.obj misc.obj nullfe.obj pattern4.obj random.obj \
+                patternpicture.rsp
+        link $(LFLAGS) -out:patternpicture.exe -map:patternpicture.map @patternpicture.rsp
+
+patternsolver.exe: malloc.obj misc.obj nullfe.obj pattern2.obj random.obj \
+                patternsolver.rsp
+        link $(LFLAGS) -out:patternsolver.exe -map:patternsolver.map @patternsolver.rsp
+
+pearl.exe: drawing.obj dsf.obj grid.obj loopgen.obj malloc.obj midend.obj \
+                misc.obj pearl.obj penrose.obj printing.obj random.obj \
+                tdq.obj tree234.obj version.obj windows.obj pearl.rsp
+        link $(LFLAGS) -out:pearl.exe -map:pearl.map @pearl.rsp
+
+pearlbench.exe: dsf.obj grid.obj loopgen.obj malloc.obj misc.obj nullfe.obj \
+                pearl2.obj penrose.obj random.obj tdq.obj tree234.obj \
+                pearlbench.rsp
+        link $(LFLAGS) -out:pearlbench.exe -map:pearlbench.map @pearlbench.rsp
+
+pegs.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res pegs.obj \
+                printing.obj random.obj tree234.obj version.obj windows.obj \
+                pegs.rsp
+        link $(LFLAGS) -out:pegs.exe -map:pegs.map @pegs.rsp
+
+puzzles.exe: blackbo3.obj bridges3.obj combi.obj cube3.obj divvy.obj \
+                dominos3.obj drawing.obj dsf.obj fifteen5.obj filling5.obj \
+                findloop.obj flip3.obj flood3.obj galaxie7.obj grid.obj \
+                guess3.obj inertia3.obj keen5.obj latin.obj laydomino.obj \
+                lightup5.obj list.obj loopgen.obj loopy5.obj magnets5.obj \
+                malloc.obj map5.obj maxflow.obj midend.obj mines5.obj \
+                misc.obj net3.obj netslid3.obj noicon.res palisad3.obj \
+                pattern7.obj pearl5.obj pegs3.obj penrose.obj printing.obj \
+                random.obj range3.obj rect3.obj samegam3.obj signpos5.obj \
+                singles5.obj sixteen3.obj slant5.obj solo5.obj tdq.obj \
+                tents5.obj towers5.obj tracks3.obj tree234.obj twiddle3.obj \
+                undead3.obj unequal5.obj unruly5.obj untangl3.obj \
+                version.obj windows1.obj puzzles.rsp
+        link $(LFLAGS) -out:puzzles.exe -map:puzzles.map @puzzles.rsp
+
+range.exe: drawing.obj dsf.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj range.obj version.obj windows.obj \
+                range.rsp
+        link $(LFLAGS) -out:range.exe -map:range.map @range.rsp
+
+rect.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res printing.obj \
+                random.obj rect.obj version.obj windows.obj rect.rsp
+        link $(LFLAGS) -out:rect.exe -map:rect.map @rect.rsp
+
+samegame.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj samegame.obj version.obj windows.obj \
+                samegame.rsp
+        link $(LFLAGS) -out:samegame.exe -map:samegame.map @samegame.rsp
+
+signpost.exe: drawing.obj dsf.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj signpost.obj version.obj windows.obj \
+                signpost.rsp
+        link $(LFLAGS) -out:signpost.exe -map:signpost.map @signpost.rsp
+
+signpostsolver.exe: dsf.obj malloc.obj misc.obj nullfe.obj random.obj \
+                signpos2.obj signpostsolver.rsp
+        link $(LFLAGS) -out:signpostsolver.exe -map:signpostsolver.map @signpostsolver.rsp
+
+singles.exe: drawing.obj dsf.obj latin.obj malloc.obj maxflow.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj singles.obj \
+                tree234.obj version.obj windows.obj singles.rsp
+        link $(LFLAGS) -out:singles.exe -map:singles.map @singles.rsp
+
+singlessolver.exe: dsf.obj latin.obj malloc.obj maxflow.obj misc.obj \
+                nullfe.obj random.obj singles3.obj tree234.obj \
+                singlessolver.rsp
+        link $(LFLAGS) -out:singlessolver.exe -map:singlessolver.map @singlessolver.rsp
+
+sixteen.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj sixteen.obj version.obj windows.obj \
+                sixteen.rsp
+        link $(LFLAGS) -out:sixteen.exe -map:sixteen.map @sixteen.rsp
+
+slant.exe: drawing.obj dsf.obj findloop.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj slant.obj version.obj \
+                windows.obj slant.rsp
+        link $(LFLAGS) -out:slant.exe -map:slant.map @slant.rsp
+
+slantsolver.exe: dsf.obj findloop.obj malloc.obj misc.obj nullfe.obj \
+                random.obj slant2.obj slantsolver.rsp
+        link $(LFLAGS) -out:slantsolver.exe -map:slantsolver.map @slantsolver.rsp
+
+solo.exe: divvy.obj drawing.obj dsf.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj solo.obj version.obj \
+                windows.obj solo.rsp
+        link $(LFLAGS) -out:solo.exe -map:solo.map @solo.rsp
+
+solosolver.exe: divvy.obj dsf.obj malloc.obj misc.obj nullfe.obj random.obj \
+                solo2.obj solosolver.rsp
+        link $(LFLAGS) -out:solosolver.exe -map:solosolver.map @solosolver.rsp
+
+tents.exe: drawing.obj dsf.obj malloc.obj maxflow.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj tents.obj version.obj \
+                windows.obj tents.rsp
+        link $(LFLAGS) -out:tents.exe -map:tents.map @tents.rsp
+
+tentssolver.exe: dsf.obj malloc.obj maxflow.obj misc.obj nullfe.obj \
+                random.obj tents3.obj tentssolver.rsp
+        link $(LFLAGS) -out:tentssolver.exe -map:tentssolver.map @tentssolver.rsp
+
+towers.exe: drawing.obj latin.obj malloc.obj maxflow.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj towers.obj tree234.obj \
+                version.obj windows.obj towers.rsp
+        link $(LFLAGS) -out:towers.exe -map:towers.map @towers.rsp
+
+towerssolver.exe: latin6.obj malloc.obj maxflow.obj misc.obj nullfe.obj \
+                random.obj towers2.obj tree234.obj towerssolver.rsp
+        link $(LFLAGS) -out:towerssolver.exe -map:towerssolver.map @towerssolver.rsp
+
+tracks.exe: drawing.obj dsf.obj findloop.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj tracks.obj version.obj \
+                windows.obj tracks.rsp
+        link $(LFLAGS) -out:tracks.exe -map:tracks.map @tracks.rsp
+
+twiddle.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj twiddle.obj version.obj windows.obj \
+                twiddle.rsp
+        link $(LFLAGS) -out:twiddle.exe -map:twiddle.map @twiddle.rsp
+
+undead.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj undead.obj version.obj windows.obj \
+                undead.rsp
+        link $(LFLAGS) -out:undead.exe -map:undead.map @undead.rsp
+
+unequal.exe: drawing.obj latin.obj malloc.obj maxflow.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj tree234.obj \
+                unequal.obj version.obj windows.obj unequal.rsp
+        link $(LFLAGS) -out:unequal.exe -map:unequal.map @unequal.rsp
+
+unequalsolver.exe: latin6.obj malloc.obj maxflow.obj misc.obj nullfe.obj \
+                random.obj tree234.obj unequal2.obj unequalsolver.rsp
+        link $(LFLAGS) -out:unequalsolver.exe -map:unequalsolver.map @unequalsolver.rsp
+
+unruly.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj unruly.obj version.obj windows.obj \
+                unruly.rsp
+        link $(LFLAGS) -out:unruly.exe -map:unruly.map @unruly.rsp
+
+unrulysolver.exe: malloc.obj misc.obj nullfe.obj random.obj unruly2.obj \
+                unrulysolver.rsp
+        link $(LFLAGS) -out:unrulysolver.exe -map:unrulysolver.map @unrulysolver.rsp
+
+untangle.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj tree234.obj untangle.obj version.obj \
+                windows.obj untangle.rsp
+        link $(LFLAGS) -out:untangle.exe -map:untangle.map @untangle.rsp
+
+blackbox.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > blackbox.rsp
+        echo blackbox.obj comctl32.lib comdlg32.lib >> blackbox.rsp
+        echo drawing.obj gdi32.lib malloc.obj midend.obj >> blackbox.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> blackbox.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> blackbox.rsp
+
+bridges.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > bridges.rsp
+        echo bridges.obj comctl32.lib comdlg32.lib drawing.obj >> bridges.rsp
+        echo dsf.obj findloop.obj gdi32.lib malloc.obj >> bridges.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> bridges.rsp
+        echo random.obj user32.lib version.obj windows.obj >> bridges.rsp
+        echo winspool.lib >> bridges.rsp
+
+cube.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > cube.rsp
+        echo comctl32.lib comdlg32.lib cube.obj drawing.obj >> cube.rsp
+        echo gdi32.lib malloc.obj midend.obj misc.obj >> cube.rsp
+        echo noicon.res printing.obj random.obj user32.lib >> cube.rsp
+        echo version.obj windows.obj winspool.lib >> cube.rsp
+
+dominosa.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > dominosa.rsp
+        echo comctl32.lib comdlg32.lib dominosa.obj >> dominosa.rsp
+        echo drawing.obj gdi32.lib laydomino.obj malloc.obj >> dominosa.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> dominosa.rsp
+        echo random.obj user32.lib version.obj windows.obj >> dominosa.rsp
+        echo winspool.lib >> dominosa.rsp
+
+fifteen.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > fifteen.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj fifteen.obj >> fifteen.rsp
+        echo gdi32.lib malloc.obj midend.obj misc.obj >> fifteen.rsp
+        echo noicon.res printing.obj random.obj user32.lib >> fifteen.rsp
+        echo version.obj windows.obj winspool.lib >> fifteen.rsp
+
+fifteensolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > fifteensolver.rsp
+        echo fifteen2.obj malloc.obj misc.obj nullfe.obj >> fifteensolver.rsp
+        echo random.obj >> fifteensolver.rsp
+
+filling.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > filling.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> filling.rsp
+        echo filling.obj gdi32.lib malloc.obj midend.obj >> filling.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> filling.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> filling.rsp
+
+fillingsolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > fillingsolver.rsp
+        echo dsf.obj filling2.obj malloc.obj misc.obj >> fillingsolver.rsp
+        echo nullfe.obj random.obj >> fillingsolver.rsp
+
+flip.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > flip.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj flip.obj >> flip.rsp
+        echo gdi32.lib malloc.obj midend.obj misc.obj >> flip.rsp
+        echo noicon.res printing.obj random.obj tree234.obj >> flip.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> flip.rsp
+
+flood.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > flood.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj flood.obj >> flood.rsp
+        echo gdi32.lib malloc.obj midend.obj misc.obj >> flood.rsp
+        echo noicon.res printing.obj random.obj user32.lib >> flood.rsp
+        echo version.obj windows.obj winspool.lib >> flood.rsp
+
+galaxies.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > galaxies.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> galaxies.rsp
+        echo galaxies.obj gdi32.lib malloc.obj midend.obj >> galaxies.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> galaxies.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> galaxies.rsp
+
+galaxiespicture.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > galaxiespicture.rsp
+        echo dsf.obj galaxie4.obj malloc.obj misc.obj >> galaxiespicture.rsp
+        echo nullfe.obj random.obj >> galaxiespicture.rsp
+
+galaxiessolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > galaxiessolver.rsp
+        echo dsf.obj galaxie2.obj malloc.obj misc.obj >> galaxiessolver.rsp
+        echo nullfe.obj random.obj >> galaxiessolver.rsp
+
+guess.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > guess.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> guess.rsp
+        echo guess.obj malloc.obj midend.obj misc.obj >> guess.rsp
+        echo noicon.res printing.obj random.obj user32.lib >> guess.rsp
+        echo version.obj windows.obj winspool.lib >> guess.rsp
+
+inertia.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > inertia.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> inertia.rsp
+        echo inertia.obj malloc.obj midend.obj misc.obj >> inertia.rsp
+        echo noicon.res printing.obj random.obj user32.lib >> inertia.rsp
+        echo version.obj windows.obj winspool.lib >> inertia.rsp
+
+keen.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > keen.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> keen.rsp
+        echo gdi32.lib keen.obj latin.obj malloc.obj >> keen.rsp
+        echo maxflow.obj midend.obj misc.obj noicon.res >> keen.rsp
+        echo printing.obj random.obj tree234.obj user32.lib >> keen.rsp
+        echo version.obj windows.obj winspool.lib >> keen.rsp
+
+keensolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > keensolver.rsp
+        echo dsf.obj keen2.obj latin6.obj malloc.obj >> keensolver.rsp
+        echo maxflow.obj misc.obj nullfe.obj random.obj >> keensolver.rsp
+        echo tree234.obj >> keensolver.rsp
+
+latincheck.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > latincheck.rsp
+        echo latin8.obj malloc.obj maxflow.obj misc.obj >> latincheck.rsp
+        echo nullfe.obj random.obj tree234.obj >> latincheck.rsp
+
+lightup.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > lightup.rsp
+        echo combi.obj comctl32.lib comdlg32.lib drawing.obj >> lightup.rsp
+        echo gdi32.lib lightup.obj malloc.obj midend.obj >> lightup.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> lightup.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> lightup.rsp
+
+lightupsolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > lightupsolver.rsp
+        echo combi.obj lightup2.obj malloc.obj misc.obj >> lightupsolver.rsp
+        echo nullfe.obj random.obj >> lightupsolver.rsp
+
+loopy.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > loopy.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> loopy.rsp
+        echo gdi32.lib grid.obj loopgen.obj loopy.obj >> loopy.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> loopy.rsp
+        echo penrose.obj printing.obj random.obj tree234.obj >> loopy.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> loopy.rsp
+
+loopysolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > loopysolver.rsp
+        echo dsf.obj grid.obj loopgen.obj loopy2.obj >> loopysolver.rsp
+        echo malloc.obj misc.obj nullfe.obj penrose.obj >> loopysolver.rsp
+        echo random.obj tree234.obj >> loopysolver.rsp
+
+magnets.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > magnets.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> magnets.rsp
+        echo laydomino.obj magnets.obj malloc.obj midend.obj >> magnets.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> magnets.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> magnets.rsp
+
+magnetssolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > magnetssolver.rsp
+        echo laydomino.obj magnets2.obj malloc.obj misc.obj >> magnetssolver.rsp
+        echo nullfe.obj random.obj >> magnetssolver.rsp
+
+map.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > map.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> map.rsp
+        echo gdi32.lib malloc.obj map.obj midend.obj misc.obj >> map.rsp
+        echo noicon.res printing.obj random.obj user32.lib >> map.rsp
+        echo version.obj windows.obj winspool.lib >> map.rsp
+
+mapsolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > mapsolver.rsp
+        echo dsf.obj malloc.obj map2.obj misc.obj nullfe.obj >> mapsolver.rsp
+        echo random.obj >> mapsolver.rsp
+
+mineobfusc.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > mineobfusc.rsp
+        echo malloc.obj mines2.obj misc.obj nullfe.obj >> mineobfusc.rsp
+        echo random.obj tree234.obj >> mineobfusc.rsp
+
+mines.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > mines.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> mines.rsp
+        echo malloc.obj midend.obj mines.obj misc.obj >> mines.rsp
+        echo noicon.res printing.obj random.obj tree234.obj >> mines.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> mines.rsp
+
+netgame.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > netgame.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> netgame.rsp
+        echo findloop.obj gdi32.lib malloc.obj midend.obj >> netgame.rsp
+        echo misc.obj net.obj noicon.res printing.obj >> netgame.rsp
+        echo random.obj tree234.obj user32.lib version.obj >> netgame.rsp
+        echo windows.obj winspool.lib >> netgame.rsp
+
+netslide.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > netslide.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> netslide.rsp
+        echo malloc.obj midend.obj misc.obj netslide.obj >> netslide.rsp
+        echo noicon.res printing.obj random.obj tree234.obj >> netslide.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> netslide.rsp
+
+nullgame.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > nullgame.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> nullgame.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> nullgame.rsp
+        echo nullgame.obj printing.obj random.obj user32.lib >> nullgame.rsp
+        echo version.obj windows.obj winspool.lib >> nullgame.rsp
+
+palisade.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > palisade.rsp
+        echo comctl32.lib comdlg32.lib divvy.obj drawing.obj >> palisade.rsp
+        echo dsf.obj gdi32.lib malloc.obj midend.obj misc.obj >> palisade.rsp
+        echo noicon.res palisade.obj printing.obj random.obj >> palisade.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> palisade.rsp
+
+pattern.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > pattern.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> pattern.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> pattern.rsp
+        echo pattern.obj printing.obj random.obj user32.lib >> pattern.rsp
+        echo version.obj windows.obj winspool.lib >> pattern.rsp
+
+patternpicture.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > patternpicture.rsp
+        echo malloc.obj misc.obj nullfe.obj pattern4.obj >> patternpicture.rsp
+        echo random.obj >> patternpicture.rsp
+
+patternsolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > patternsolver.rsp
+        echo malloc.obj misc.obj nullfe.obj pattern2.obj >> patternsolver.rsp
+        echo random.obj >> patternsolver.rsp
+
+pearl.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > pearl.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> pearl.rsp
+        echo gdi32.lib grid.obj loopgen.obj malloc.obj >> pearl.rsp
+        echo midend.obj misc.obj pearl.obj penrose.obj >> pearl.rsp
+        echo printing.obj random.obj tdq.obj tree234.obj >> pearl.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> pearl.rsp
+
+pearlbench.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > pearlbench.rsp
+        echo dsf.obj grid.obj loopgen.obj malloc.obj misc.obj >> pearlbench.rsp
+        echo nullfe.obj pearl2.obj penrose.obj random.obj >> pearlbench.rsp
+        echo tdq.obj tree234.obj >> pearlbench.rsp
+
+pegs.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > pegs.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> pegs.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> pegs.rsp
+        echo pegs.obj printing.obj random.obj tree234.obj >> pegs.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> pegs.rsp
+
+puzzles.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > puzzles.rsp
+        echo blackbo3.obj bridges3.obj combi.obj comctl32.lib >> puzzles.rsp
+        echo comdlg32.lib cube3.obj divvy.obj dominos3.obj >> puzzles.rsp
+        echo drawing.obj dsf.obj fifteen5.obj filling5.obj >> puzzles.rsp
+        echo findloop.obj flip3.obj flood3.obj galaxie7.obj >> puzzles.rsp
+        echo gdi32.lib grid.obj guess3.obj inertia3.obj >> puzzles.rsp
+        echo keen5.obj latin.obj laydomino.obj lightup5.obj >> puzzles.rsp
+        echo list.obj loopgen.obj loopy5.obj magnets5.obj >> puzzles.rsp
+        echo malloc.obj map5.obj maxflow.obj midend.obj >> puzzles.rsp
+        echo mines5.obj misc.obj net3.obj netslid3.obj >> puzzles.rsp
+        echo noicon.res palisad3.obj pattern7.obj pearl5.obj >> puzzles.rsp
+        echo pegs3.obj penrose.obj printing.obj random.obj >> puzzles.rsp
+        echo range3.obj rect3.obj samegam3.obj signpos5.obj >> puzzles.rsp
+        echo singles5.obj sixteen3.obj slant5.obj solo5.obj >> puzzles.rsp
+        echo tdq.obj tents5.obj towers5.obj tracks3.obj >> puzzles.rsp
+        echo tree234.obj twiddle3.obj undead3.obj unequal5.obj >> puzzles.rsp
+        echo unruly5.obj untangl3.obj user32.lib version.obj >> puzzles.rsp
+        echo windows1.obj winspool.lib >> puzzles.rsp
+
+range.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > range.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> range.rsp
+        echo gdi32.lib malloc.obj midend.obj misc.obj >> range.rsp
+        echo noicon.res printing.obj random.obj range.obj >> range.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> range.rsp
+
+rect.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > rect.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> rect.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> rect.rsp
+        echo printing.obj random.obj rect.obj user32.lib >> rect.rsp
+        echo version.obj windows.obj winspool.lib >> rect.rsp
+
+samegame.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > samegame.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> samegame.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> samegame.rsp
+        echo printing.obj random.obj samegame.obj user32.lib >> samegame.rsp
+        echo version.obj windows.obj winspool.lib >> samegame.rsp
+
+signpost.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > signpost.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> signpost.rsp
+        echo gdi32.lib malloc.obj midend.obj misc.obj >> signpost.rsp
+        echo noicon.res printing.obj random.obj signpost.obj >> signpost.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> signpost.rsp
+
+signpostsolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > signpostsolver.rsp
+        echo dsf.obj malloc.obj misc.obj nullfe.obj random.obj >> signpostsolver.rsp
+        echo signpos2.obj >> signpostsolver.rsp
+
+singles.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > singles.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> singles.rsp
+        echo gdi32.lib latin.obj malloc.obj maxflow.obj >> singles.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> singles.rsp
+        echo random.obj singles.obj tree234.obj user32.lib >> singles.rsp
+        echo version.obj windows.obj winspool.lib >> singles.rsp
+
+singlessolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > singlessolver.rsp
+        echo dsf.obj latin.obj malloc.obj maxflow.obj misc.obj >> singlessolver.rsp
+        echo nullfe.obj random.obj singles3.obj tree234.obj >> singlessolver.rsp
+
+sixteen.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > sixteen.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> sixteen.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> sixteen.rsp
+        echo printing.obj random.obj sixteen.obj user32.lib >> sixteen.rsp
+        echo version.obj windows.obj winspool.lib >> sixteen.rsp
+
+slant.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > slant.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> slant.rsp
+        echo findloop.obj gdi32.lib malloc.obj midend.obj >> slant.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> slant.rsp
+        echo slant.obj user32.lib version.obj windows.obj >> slant.rsp
+        echo winspool.lib >> slant.rsp
+
+slantsolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > slantsolver.rsp
+        echo dsf.obj findloop.obj malloc.obj misc.obj >> slantsolver.rsp
+        echo nullfe.obj random.obj slant2.obj >> slantsolver.rsp
+
+solo.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > solo.rsp
+        echo comctl32.lib comdlg32.lib divvy.obj drawing.obj >> solo.rsp
+        echo dsf.obj gdi32.lib malloc.obj midend.obj misc.obj >> solo.rsp
+        echo noicon.res printing.obj random.obj solo.obj >> solo.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> solo.rsp
+
+solosolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > solosolver.rsp
+        echo divvy.obj dsf.obj malloc.obj misc.obj nullfe.obj >> solosolver.rsp
+        echo random.obj solo2.obj >> solosolver.rsp
+
+tents.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > tents.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> tents.rsp
+        echo gdi32.lib malloc.obj maxflow.obj midend.obj >> tents.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> tents.rsp
+        echo tents.obj user32.lib version.obj windows.obj >> tents.rsp
+        echo winspool.lib >> tents.rsp
+
+tentssolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > tentssolver.rsp
+        echo dsf.obj malloc.obj maxflow.obj misc.obj >> tentssolver.rsp
+        echo nullfe.obj random.obj tents3.obj >> tentssolver.rsp
+
+towers.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > towers.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> towers.rsp
+        echo latin.obj malloc.obj maxflow.obj midend.obj >> towers.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> towers.rsp
+        echo towers.obj tree234.obj user32.lib version.obj >> towers.rsp
+        echo windows.obj winspool.lib >> towers.rsp
+
+towerssolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > towerssolver.rsp
+        echo latin6.obj malloc.obj maxflow.obj misc.obj >> towerssolver.rsp
+        echo nullfe.obj random.obj towers2.obj tree234.obj >> towerssolver.rsp
+
+tracks.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > tracks.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj dsf.obj >> tracks.rsp
+        echo findloop.obj gdi32.lib malloc.obj midend.obj >> tracks.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> tracks.rsp
+        echo tracks.obj user32.lib version.obj windows.obj >> tracks.rsp
+        echo winspool.lib >> tracks.rsp
+
+twiddle.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > twiddle.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> twiddle.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> twiddle.rsp
+        echo printing.obj random.obj twiddle.obj user32.lib >> twiddle.rsp
+        echo version.obj windows.obj winspool.lib >> twiddle.rsp
+
+undead.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > undead.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> undead.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> undead.rsp
+        echo printing.obj random.obj undead.obj user32.lib >> undead.rsp
+        echo version.obj windows.obj winspool.lib >> undead.rsp
+
+unequal.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > unequal.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> unequal.rsp
+        echo latin.obj malloc.obj maxflow.obj midend.obj >> unequal.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> unequal.rsp
+        echo tree234.obj unequal.obj user32.lib version.obj >> unequal.rsp
+        echo windows.obj winspool.lib >> unequal.rsp
+
+unequalsolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > unequalsolver.rsp
+        echo latin6.obj malloc.obj maxflow.obj misc.obj >> unequalsolver.rsp
+        echo nullfe.obj random.obj tree234.obj unequal2.obj >> unequalsolver.rsp
+
+unruly.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > unruly.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> unruly.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> unruly.rsp
+        echo printing.obj random.obj unruly.obj user32.lib >> unruly.rsp
+        echo version.obj windows.obj winspool.lib >> unruly.rsp
+
+unrulysolver.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:console > unrulysolver.rsp
+        echo malloc.obj misc.obj nullfe.obj random.obj >> unrulysolver.rsp
+        echo unruly2.obj >> unrulysolver.rsp
+
+untangle.rsp: $(MAKEFILE)
+        echo /nologo /subsystem:windows > untangle.rsp
+        echo comctl32.lib comdlg32.lib drawing.obj gdi32.lib >> untangle.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> untangle.rsp
+        echo printing.obj random.obj tree234.obj untangle.obj >> untangle.rsp
+        echo user32.lib version.obj windows.obj winspool.lib >> untangle.rsp
+
+blackbox.obj: .\blackbox.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\blackbox.c /Foblackbox.obj
+blackbo3.obj: .\blackbox.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\blackbox.c /Foblackbo3.obj
+bridges.obj: .\bridges.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\bridges.c /Fobridges.obj
+bridges3.obj: .\bridges.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\bridges.c /Fobridges3.obj
+combi.obj: .\combi.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\combi.c /Focombi.obj
+cube.obj: .\cube.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\cube.c /Focube.obj
+cube3.obj: .\cube.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\cube.c /Focube3.obj
+divvy.obj: .\divvy.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\divvy.c /Fodivvy.obj
+dominosa.obj: .\dominosa.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\dominosa.c /Fodominosa.obj
+dominos3.obj: .\dominosa.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\dominosa.c /Fodominos3.obj
+drawing.obj: .\drawing.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\drawing.c /Fodrawing.obj
+dsf.obj: .\dsf.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\dsf.c /Fodsf.obj
+fifteen.obj: .\fifteen.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\fifteen.c /Fofifteen.obj
+fifteen5.obj: .\fifteen.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\fifteen.c /Fofifteen5.obj
+fifteen2.obj: .\fifteen.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\fifteen.c /Fofifteen2.obj
+filling.obj: .\filling.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\filling.c /Fofilling.obj
+filling5.obj: .\filling.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\filling.c /Fofilling5.obj
+filling2.obj: .\filling.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\filling.c /Fofilling2.obj
+findloop.obj: .\findloop.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\findloop.c /Fofindloop.obj
+flip.obj: .\flip.c .\puzzles.h .\tree234.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\flip.c /Foflip.obj
+flip3.obj: .\flip.c .\puzzles.h .\tree234.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\flip.c /Foflip3.obj
+flood.obj: .\flood.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\flood.c /Foflood.obj
+flood3.obj: .\flood.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\flood.c /Foflood3.obj
+galaxies.obj: .\galaxies.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\galaxies.c /Fogalaxies.obj
+galaxie7.obj: .\galaxies.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\galaxies.c /Fogalaxie7.obj
+galaxie4.obj: .\galaxies.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_PICTURE_GENERATOR /c .\galaxies.c /Fogalaxie4.obj
+galaxie2.obj: .\galaxies.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\galaxies.c /Fogalaxie2.obj
+grid.obj: .\grid.c .\puzzles.h .\tree234.h .\grid.h .\penrose.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\grid.c /Fogrid.obj
+gtk.obj: .\gtk.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\gtk.c /Fogtk.obj
+guess.obj: .\guess.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\guess.c /Foguess.obj
+guess3.obj: .\guess.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\guess.c /Foguess3.obj
+inertia.obj: .\inertia.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\inertia.c /Foinertia.obj
+inertia3.obj: .\inertia.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\inertia.c /Foinertia3.obj
+keen.obj: .\keen.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\keen.c /Fokeen.obj
+keen5.obj: .\keen.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\keen.c /Fokeen5.obj
+keen2.obj: .\keen.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\keen.c /Fokeen2.obj
+latin.obj: .\latin.c .\puzzles.h .\tree234.h .\maxflow.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\latin.c /Folatin.obj
+latin8.obj: .\latin.c .\puzzles.h .\tree234.h .\maxflow.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_LATIN_TEST /c .\latin.c /Folatin8.obj
+latin6.obj: .\latin.c .\puzzles.h .\tree234.h .\maxflow.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\latin.c /Folatin6.obj
+laydomino.obj: .\laydomino.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\laydomino.c /Folaydomino.obj
+lightup.obj: .\lightup.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\lightup.c /Folightup.obj
+lightup5.obj: .\lightup.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\lightup.c /Folightup5.obj
+lightup2.obj: .\lightup.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\lightup.c /Folightup2.obj
+list.obj: .\list.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\list.c /Folist.obj
+loopgen.obj: .\loopgen.c .\puzzles.h .\tree234.h .\grid.h .\loopgen.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\loopgen.c /Foloopgen.obj
+loopy.obj: .\loopy.c .\puzzles.h .\tree234.h .\grid.h .\loopgen.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\loopy.c /Foloopy.obj
+loopy5.obj: .\loopy.c .\puzzles.h .\tree234.h .\grid.h .\loopgen.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\loopy.c /Foloopy5.obj
+loopy2.obj: .\loopy.c .\puzzles.h .\tree234.h .\grid.h .\loopgen.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\loopy.c /Foloopy2.obj
+magnets.obj: .\magnets.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\magnets.c /Fomagnets.obj
+magnets5.obj: .\magnets.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\magnets.c /Fomagnets5.obj
+magnets2.obj: .\magnets.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\magnets.c /Fomagnets2.obj
+malloc.obj: .\malloc.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\malloc.c /Fomalloc.obj
+map.obj: .\map.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\map.c /Fomap.obj
+map5.obj: .\map.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\map.c /Fomap5.obj
+map2.obj: .\map.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\map.c /Fomap2.obj
+maxflow.obj: .\maxflow.c .\maxflow.h .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\maxflow.c /Fomaxflow.obj
+midend.obj: .\midend.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\midend.c /Fomidend.obj
+mines.obj: .\mines.c .\tree234.h .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\mines.c /Fomines.obj
+mines5.obj: .\mines.c .\tree234.h .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\mines.c /Fomines5.obj
+mines2.obj: .\mines.c .\tree234.h .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_OBFUSCATOR /c .\mines.c /Fomines2.obj
+misc.obj: .\misc.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\misc.c /Fomisc.obj
+net.obj: .\net.c .\puzzles.h .\tree234.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\net.c /Fonet.obj
+net3.obj: .\net.c .\puzzles.h .\tree234.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\net.c /Fonet3.obj
+netslide.obj: .\netslide.c .\puzzles.h .\tree234.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\netslide.c /Fonetslide.obj
+netslid3.obj: .\netslide.c .\puzzles.h .\tree234.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\netslide.c /Fonetslid3.obj
+no-icon.obj: .\no-icon.c
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\no-icon.c /Fono-icon.obj
+noicon.res: .\noicon.rc .\puzzles.rc2 .\resource.h
+        rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 -fonoicon.res .\noicon.rc
+nullfe.obj: .\nullfe.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\nullfe.c /Fonullfe.obj
+nullgame.obj: .\nullgame.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\nullgame.c /Fonullgame.obj
+obfusc.obj: .\obfusc.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\obfusc.c /Foobfusc.obj
+osx.obj: .\osx.m .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\osx.m /Foosx.obj
+palisade.obj: .\palisade.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\palisade.c /Fopalisade.obj
+palisad3.obj: .\palisade.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\palisade.c /Fopalisad3.obj
+pattern.obj: .\pattern.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\pattern.c /Fopattern.obj
+pattern7.obj: .\pattern.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\pattern.c /Fopattern7.obj
+pattern4.obj: .\pattern.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_PICTURE_GENERATOR /c .\pattern.c /Fopattern4.obj
+pattern2.obj: .\pattern.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\pattern.c /Fopattern2.obj
+pearl.obj: .\pearl.c .\puzzles.h .\grid.h .\loopgen.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\pearl.c /Fopearl.obj
+pearl5.obj: .\pearl.c .\puzzles.h .\grid.h .\loopgen.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\pearl.c /Fopearl5.obj
+pearl2.obj: .\pearl.c .\puzzles.h .\grid.h .\loopgen.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\pearl.c /Fopearl2.obj
+pegs.obj: .\pegs.c .\puzzles.h .\tree234.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\pegs.c /Fopegs.obj
+pegs3.obj: .\pegs.c .\puzzles.h .\tree234.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\pegs.c /Fopegs3.obj
+penrose.obj: .\penrose.c .\puzzles.h .\penrose.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\penrose.c /Fopenrose.obj
+printing.obj: .\printing.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\printing.c /Foprinting.obj
+ps.obj: .\ps.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\ps.c /Fops.obj
+random.obj: .\random.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\random.c /Forandom.obj
+range.obj: .\range.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\range.c /Forange.obj
+range3.obj: .\range.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\range.c /Forange3.obj
+rect.obj: .\rect.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\rect.c /Forect.obj
+rect3.obj: .\rect.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\rect.c /Forect3.obj
+samegame.obj: .\samegame.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\samegame.c /Fosamegame.obj
+samegam3.obj: .\samegame.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\samegame.c /Fosamegam3.obj
+signpost.obj: .\signpost.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\signpost.c /Fosignpost.obj
+signpos5.obj: .\signpost.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\signpost.c /Fosignpos5.obj
+signpos2.obj: .\signpost.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\signpost.c /Fosignpos2.obj
+singles.obj: .\singles.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\singles.c /Fosingles.obj
+singles5.obj: .\singles.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\singles.c /Fosingles5.obj
+singles3.obj: .\singles.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\singles.c /Fosingles3.obj
+sixteen.obj: .\sixteen.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\sixteen.c /Fosixteen.obj
+sixteen3.obj: .\sixteen.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\sixteen.c /Fosixteen3.obj
+slant.obj: .\slant.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\slant.c /Foslant.obj
+slant5.obj: .\slant.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\slant.c /Foslant5.obj
+slant2.obj: .\slant.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\slant.c /Foslant2.obj
+solo.obj: .\solo.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\solo.c /Fosolo.obj
+solo5.obj: .\solo.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\solo.c /Fosolo5.obj
+solo2.obj: .\solo.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\solo.c /Fosolo2.obj
+tdq.obj: .\tdq.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\tdq.c /Fotdq.obj
+tents.obj: .\tents.c .\puzzles.h .\maxflow.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\tents.c /Fotents.obj
+tents5.obj: .\tents.c .\puzzles.h .\maxflow.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\tents.c /Fotents5.obj
+tents3.obj: .\tents.c .\puzzles.h .\maxflow.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\tents.c /Fotents3.obj
+towers.obj: .\towers.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\towers.c /Fotowers.obj
+towers5.obj: .\towers.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\towers.c /Fotowers5.obj
+towers2.obj: .\towers.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\towers.c /Fotowers2.obj
+tracks.obj: .\tracks.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\tracks.c /Fotracks.obj
+tracks3.obj: .\tracks.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\tracks.c /Fotracks3.obj
+tree234.obj: .\tree234.c .\tree234.h .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\tree234.c /Fotree234.obj
+twiddle.obj: .\twiddle.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\twiddle.c /Fotwiddle.obj
+twiddle3.obj: .\twiddle.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\twiddle.c /Fotwiddle3.obj
+undead.obj: .\undead.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\undead.c /Foundead.obj
+undead3.obj: .\undead.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\undead.c /Foundead3.obj
+unequal.obj: .\unequal.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\unequal.c /Founequal.obj
+unequal5.obj: .\unequal.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\unequal.c /Founequal5.obj
+unequal2.obj: .\unequal.c .\puzzles.h .\latin.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\unequal.c /Founequal2.obj
+unruly.obj: .\unruly.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\unruly.c /Founruly.obj
+unruly5.obj: .\unruly.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\unruly.c /Founruly5.obj
+unruly2.obj: .\unruly.c .\puzzles.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\unruly.c /Founruly2.obj
+untangle.obj: .\untangle.c .\puzzles.h .\tree234.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\untangle.c /Fountangle.obj
+untangl3.obj: .\untangle.c .\puzzles.h .\tree234.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\untangle.c /Fountangl3.obj
+version.obj: .\version.c .\version.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\version.c /Foversion.obj
+windows.obj: .\windows.c .\puzzles.h .\resource.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\windows.c /Fowindows.obj
+windows1.obj: .\windows.c .\puzzles.h .\resource.h
+        cl $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\windows.c /Fowindows1.obj
+
+
+clean: tidy
+        -del *.exe
+
+tidy:
+        -del *.obj
+        -del *.res
+        -del *.pch
+        -del *.aps
+        -del *.ilk
+        -del *.pdb
+        -del *.rsp
+        -del *.dsp
+        -del *.dsw
+        -del *.ncb
+        -del *.opt
+        -del *.plg
+        -del *.map
+        -del *.idb
+        -del debug.log
diff --git a/apps/plugins/puzzles/src/Makefile.wce b/apps/plugins/puzzles/src/Makefile.wce
new file mode 100644
index 0000000000..241e30b8df
--- /dev/null
+++ b/apps/plugins/puzzles/src/Makefile.wce
@@ -0,0 +1,808 @@
+# Makefile for puzzles on PocketPC using eMbedded Visual C.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+
+# If you rename this file to `Makefile', you should change this line,
+# so that the .rsp files still depend on the correct makefile.
+MAKEFILE = Makefile.wce
+
+# This makefile expects the environment to have been set up by one
+# of the PocketPC batch files wcearmv4.bat and wceemulator.bat. No
+# other build targets are currently supported, because they would
+# need a section in this if statement.
+!if "$(TARGETCPU)" == "emulator"
+PLATFORM_DEFS=/D "_i386_" /D "i_386_" /D "_X86_" /D "x86"
+CC=cl
+BASELIBS=commctrl.lib coredll.lib corelibc.lib aygshell.lib
+MACHINE=IX86
+!else
+PLATFORM_DEFS=/D "ARM" /D "_ARM_" /D "ARMV4"
+CC=clarm
+BASELIBS=commctrl.lib coredll.lib aygshell.lib
+MACHINE=ARM
+!endif
+
+# C compilation flags
+CFLAGS = /nologo /W3 /O1 /MC /D _WIN32_WCE=420 /D "WIN32_PLATFORM_PSPC=400" /D UNDER_CE=420 \
+         $(PLATFORM_DEFS) \
+         /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "NO_HTMLHELP"
+
+LFLAGS = /nologo /incremental:no \
+         /base:0x00010000 /stack:0x10000,0x1000 /entry:WinMainCRTStartup \
+         /nodefaultlib:libc.lib /nodefaultlib:libcmt.lib /nodefaultlib:msvcrt.lib /nodefaultlib:OLDNAMES.lib \
+         /subsystem:windowsce,4.20 /align:4096 /MACHINE:$(MACHINE)
+
+RCFL = /d UNDER_CE=420 /d _WIN32_WCE=420 /d "WIN32_PLATFORM_PSPC=400" \
+       $(PLATFORM_DEFS) \
+       /d "NDEBUG" /d "UNICODE" /d "_UNICODE"
+
+all: blackbox.exe bridges.exe cube.exe dominosa.exe fifteen.exe filling.exe \
+                flip.exe flood.exe galaxies.exe guess.exe inertia.exe \
+                keen.exe lightup.exe loopy.exe magnets.exe map.exe mines.exe \
+                netgame.exe netslide.exe nullgame.exe palisade.exe \
+                pattern.exe pearl.exe pegs.exe puzzles.exe range.exe \
+                rect.exe samegame.exe signpost.exe singles.exe sixteen.exe \
+                slant.exe solo.exe tents.exe towers.exe tracks.exe \
+                twiddle.exe undead.exe unequal.exe unruly.exe untangle.exe
+
+blackbox.exe: blackbox.obj drawing.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj version.obj windows.obj \
+                blackbox.rsp
+        link $(LFLAGS) -out:blackbox.exe -map:blackbox.map @blackbox.rsp
+
+bridges.exe: bridges.obj drawing.obj dsf.obj findloop.obj malloc.obj \
+                midend.obj misc.obj noicon.res printing.obj random.obj \
+                version.obj windows.obj bridges.rsp
+        link $(LFLAGS) -out:bridges.exe -map:bridges.map @bridges.rsp
+
+cube.exe: cube.obj drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj version.obj windows.obj cube.rsp
+        link $(LFLAGS) -out:cube.exe -map:cube.map @cube.rsp
+
+dominosa.exe: dominosa.obj drawing.obj laydomino.obj malloc.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj version.obj \
+                windows.obj dominosa.rsp
+        link $(LFLAGS) -out:dominosa.exe -map:dominosa.map @dominosa.rsp
+
+fifteen.exe: drawing.obj fifteen.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj version.obj windows.obj \
+                fifteen.rsp
+        link $(LFLAGS) -out:fifteen.exe -map:fifteen.map @fifteen.rsp
+
+filling.exe: drawing.obj dsf.obj filling.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj version.obj windows.obj \
+                filling.rsp
+        link $(LFLAGS) -out:filling.exe -map:filling.map @filling.rsp
+
+flip.exe: drawing.obj flip.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj tree234.obj version.obj windows.obj \
+                flip.rsp
+        link $(LFLAGS) -out:flip.exe -map:flip.map @flip.rsp
+
+flood.exe: drawing.obj flood.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj version.obj windows.obj flood.rsp
+        link $(LFLAGS) -out:flood.exe -map:flood.map @flood.rsp
+
+galaxies.exe: drawing.obj dsf.obj galaxies.obj malloc.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj version.obj \
+                windows.obj galaxies.rsp
+        link $(LFLAGS) -out:galaxies.exe -map:galaxies.map @galaxies.rsp
+
+guess.exe: drawing.obj guess.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj version.obj windows.obj guess.rsp
+        link $(LFLAGS) -out:guess.exe -map:guess.map @guess.rsp
+
+inertia.exe: drawing.obj inertia.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj version.obj windows.obj \
+                inertia.rsp
+        link $(LFLAGS) -out:inertia.exe -map:inertia.map @inertia.rsp
+
+keen.exe: drawing.obj dsf.obj keen.obj latin.obj malloc.obj maxflow.obj \
+                midend.obj misc.obj noicon.res printing.obj random.obj \
+                tree234.obj version.obj windows.obj keen.rsp
+        link $(LFLAGS) -out:keen.exe -map:keen.map @keen.rsp
+
+lightup.exe: combi.obj drawing.obj lightup.obj malloc.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj version.obj \
+                windows.obj lightup.rsp
+        link $(LFLAGS) -out:lightup.exe -map:lightup.map @lightup.rsp
+
+loopy.exe: drawing.obj dsf.obj grid.obj loopgen.obj loopy.obj malloc.obj \
+                midend.obj misc.obj noicon.res penrose.obj printing.obj \
+                random.obj tree234.obj version.obj windows.obj loopy.rsp
+        link $(LFLAGS) -out:loopy.exe -map:loopy.map @loopy.rsp
+
+magnets.exe: drawing.obj laydomino.obj magnets.obj malloc.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj version.obj \
+                windows.obj magnets.rsp
+        link $(LFLAGS) -out:magnets.exe -map:magnets.map @magnets.rsp
+
+map.exe: drawing.obj dsf.obj malloc.obj map.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj version.obj windows.obj \
+                map.rsp
+        link $(LFLAGS) -out:map.exe -map:map.map @map.rsp
+
+mines.exe: drawing.obj malloc.obj midend.obj mines.obj misc.obj noicon.res \
+                printing.obj random.obj tree234.obj version.obj windows.obj \
+                mines.rsp
+        link $(LFLAGS) -out:mines.exe -map:mines.map @mines.rsp
+
+netgame.exe: drawing.obj dsf.obj findloop.obj malloc.obj midend.obj misc.obj \
+                net.obj noicon.res printing.obj random.obj tree234.obj \
+                version.obj windows.obj netgame.rsp
+        link $(LFLAGS) -out:netgame.exe -map:netgame.map @netgame.rsp
+
+netslide.exe: drawing.obj malloc.obj midend.obj misc.obj netslide.obj \
+                noicon.res printing.obj random.obj tree234.obj version.obj \
+                windows.obj netslide.rsp
+        link $(LFLAGS) -out:netslide.exe -map:netslide.map @netslide.rsp
+
+nullgame.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                nullgame.obj printing.obj random.obj version.obj windows.obj \
+                nullgame.rsp
+        link $(LFLAGS) -out:nullgame.exe -map:nullgame.map @nullgame.rsp
+
+palisade.exe: divvy.obj drawing.obj dsf.obj malloc.obj midend.obj misc.obj \
+                noicon.res palisade.obj printing.obj random.obj version.obj \
+                windows.obj palisade.rsp
+        link $(LFLAGS) -out:palisade.exe -map:palisade.map @palisade.rsp
+
+pattern.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                pattern.obj printing.obj random.obj version.obj windows.obj \
+                pattern.rsp
+        link $(LFLAGS) -out:pattern.exe -map:pattern.map @pattern.rsp
+
+pearl.exe: drawing.obj dsf.obj grid.obj loopgen.obj malloc.obj midend.obj \
+                misc.obj pearl.obj penrose.obj printing.obj random.obj \
+                tdq.obj tree234.obj version.obj windows.obj pearl.rsp
+        link $(LFLAGS) -out:pearl.exe -map:pearl.map @pearl.rsp
+
+pegs.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res pegs.obj \
+                printing.obj random.obj tree234.obj version.obj windows.obj \
+                pegs.rsp
+        link $(LFLAGS) -out:pegs.exe -map:pegs.map @pegs.rsp
+
+puzzles.exe: blackbo3.obj bridges3.obj combi.obj cube3.obj divvy.obj \
+                dominos3.obj drawing.obj dsf.obj fifteen5.obj filling5.obj \
+                findloop.obj flip3.obj flood3.obj galaxie7.obj grid.obj \
+                guess3.obj inertia3.obj keen5.obj latin.obj laydomino.obj \
+                lightup5.obj list.obj loopgen.obj loopy5.obj magnets5.obj \
+                malloc.obj map5.obj maxflow.obj midend.obj mines5.obj \
+                misc.obj net3.obj netslid3.obj noicon.res palisad3.obj \
+                pattern7.obj pearl5.obj pegs3.obj penrose.obj printing.obj \
+                random.obj range3.obj rect3.obj samegam3.obj signpos5.obj \
+                singles5.obj sixteen3.obj slant5.obj solo5.obj tdq.obj \
+                tents5.obj towers5.obj tracks3.obj tree234.obj twiddle3.obj \
+                undead3.obj unequal5.obj unruly5.obj untangl3.obj \
+                version.obj windows1.obj puzzles.rsp
+        link $(LFLAGS) -out:puzzles.exe -map:puzzles.map @puzzles.rsp
+
+range.exe: drawing.obj dsf.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj range.obj version.obj windows.obj \
+                range.rsp
+        link $(LFLAGS) -out:range.exe -map:range.map @range.rsp
+
+rect.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res printing.obj \
+                random.obj rect.obj version.obj windows.obj rect.rsp
+        link $(LFLAGS) -out:rect.exe -map:rect.map @rect.rsp
+
+samegame.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj samegame.obj version.obj windows.obj \
+                samegame.rsp
+        link $(LFLAGS) -out:samegame.exe -map:samegame.map @samegame.rsp
+
+signpost.exe: drawing.obj dsf.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj signpost.obj version.obj windows.obj \
+                signpost.rsp
+        link $(LFLAGS) -out:signpost.exe -map:signpost.map @signpost.rsp
+
+singles.exe: drawing.obj dsf.obj latin.obj malloc.obj maxflow.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj singles.obj \
+                tree234.obj version.obj windows.obj singles.rsp
+        link $(LFLAGS) -out:singles.exe -map:singles.map @singles.rsp
+
+sixteen.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj sixteen.obj version.obj windows.obj \
+                sixteen.rsp
+        link $(LFLAGS) -out:sixteen.exe -map:sixteen.map @sixteen.rsp
+
+slant.exe: drawing.obj dsf.obj findloop.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj slant.obj version.obj \
+                windows.obj slant.rsp
+        link $(LFLAGS) -out:slant.exe -map:slant.map @slant.rsp
+
+solo.exe: divvy.obj drawing.obj dsf.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj solo.obj version.obj \
+                windows.obj solo.rsp
+        link $(LFLAGS) -out:solo.exe -map:solo.map @solo.rsp
+
+tents.exe: drawing.obj dsf.obj malloc.obj maxflow.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj tents.obj version.obj \
+                windows.obj tents.rsp
+        link $(LFLAGS) -out:tents.exe -map:tents.map @tents.rsp
+
+towers.exe: drawing.obj latin.obj malloc.obj maxflow.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj towers.obj tree234.obj \
+                version.obj windows.obj towers.rsp
+        link $(LFLAGS) -out:towers.exe -map:towers.map @towers.rsp
+
+tracks.exe: drawing.obj dsf.obj findloop.obj malloc.obj midend.obj misc.obj \
+                noicon.res printing.obj random.obj tracks.obj version.obj \
+                windows.obj tracks.rsp
+        link $(LFLAGS) -out:tracks.exe -map:tracks.map @tracks.rsp
+
+twiddle.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj twiddle.obj version.obj windows.obj \
+                twiddle.rsp
+        link $(LFLAGS) -out:twiddle.exe -map:twiddle.map @twiddle.rsp
+
+undead.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj undead.obj version.obj windows.obj \
+                undead.rsp
+        link $(LFLAGS) -out:undead.exe -map:undead.map @undead.rsp
+
+unequal.exe: drawing.obj latin.obj malloc.obj maxflow.obj midend.obj \
+                misc.obj noicon.res printing.obj random.obj tree234.obj \
+                unequal.obj version.obj windows.obj unequal.rsp
+        link $(LFLAGS) -out:unequal.exe -map:unequal.map @unequal.rsp
+
+unruly.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj unruly.obj version.obj windows.obj \
+                unruly.rsp
+        link $(LFLAGS) -out:unruly.exe -map:unruly.map @unruly.rsp
+
+untangle.exe: drawing.obj malloc.obj midend.obj misc.obj noicon.res \
+                printing.obj random.obj tree234.obj untangle.obj version.obj \
+                windows.obj untangle.rsp
+        link $(LFLAGS) -out:untangle.exe -map:untangle.map @untangle.rsp
+
+blackbox.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > blackbox.rsp
+        echo blackbox.obj drawing.obj malloc.obj midend.obj >> blackbox.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> blackbox.rsp
+        echo version.obj windows.obj >> blackbox.rsp
+
+bridges.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > bridges.rsp
+        echo bridges.obj drawing.obj dsf.obj findloop.obj >> bridges.rsp
+        echo malloc.obj midend.obj misc.obj noicon.res >> bridges.rsp
+        echo printing.obj random.obj version.obj windows.obj >> bridges.rsp
+
+cube.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > cube.rsp
+        echo cube.obj drawing.obj malloc.obj midend.obj >> cube.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> cube.rsp
+        echo version.obj windows.obj >> cube.rsp
+
+dominosa.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > dominosa.rsp
+        echo dominosa.obj drawing.obj laydomino.obj malloc.obj >> dominosa.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> dominosa.rsp
+        echo random.obj version.obj windows.obj >> dominosa.rsp
+
+fifteen.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > fifteen.rsp
+        echo drawing.obj fifteen.obj malloc.obj midend.obj >> fifteen.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> fifteen.rsp
+        echo version.obj windows.obj >> fifteen.rsp
+
+filling.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > filling.rsp
+        echo drawing.obj dsf.obj filling.obj malloc.obj >> filling.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> filling.rsp
+        echo random.obj version.obj windows.obj >> filling.rsp
+
+flip.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > flip.rsp
+        echo drawing.obj flip.obj malloc.obj midend.obj >> flip.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> flip.rsp
+        echo tree234.obj version.obj windows.obj >> flip.rsp
+
+flood.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > flood.rsp
+        echo drawing.obj flood.obj malloc.obj midend.obj >> flood.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> flood.rsp
+        echo version.obj windows.obj >> flood.rsp
+
+galaxies.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > galaxies.rsp
+        echo drawing.obj dsf.obj galaxies.obj malloc.obj >> galaxies.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> galaxies.rsp
+        echo random.obj version.obj windows.obj >> galaxies.rsp
+
+guess.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > guess.rsp
+        echo drawing.obj guess.obj malloc.obj midend.obj >> guess.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> guess.rsp
+        echo version.obj windows.obj >> guess.rsp
+
+inertia.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > inertia.rsp
+        echo drawing.obj inertia.obj malloc.obj midend.obj >> inertia.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> inertia.rsp
+        echo version.obj windows.obj >> inertia.rsp
+
+keen.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > keen.rsp
+        echo drawing.obj dsf.obj keen.obj latin.obj malloc.obj >> keen.rsp
+        echo maxflow.obj midend.obj misc.obj noicon.res >> keen.rsp
+        echo printing.obj random.obj tree234.obj version.obj >> keen.rsp
+        echo windows.obj >> keen.rsp
+
+lightup.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > lightup.rsp
+        echo combi.obj drawing.obj lightup.obj malloc.obj >> lightup.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> lightup.rsp
+        echo random.obj version.obj windows.obj >> lightup.rsp
+
+loopy.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > loopy.rsp
+        echo drawing.obj dsf.obj grid.obj loopgen.obj >> loopy.rsp
+        echo loopy.obj malloc.obj midend.obj misc.obj >> loopy.rsp
+        echo noicon.res penrose.obj printing.obj random.obj >> loopy.rsp
+        echo tree234.obj version.obj windows.obj >> loopy.rsp
+
+magnets.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > magnets.rsp
+        echo drawing.obj laydomino.obj magnets.obj malloc.obj >> magnets.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> magnets.rsp
+        echo random.obj version.obj windows.obj >> magnets.rsp
+
+map.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > map.rsp
+        echo drawing.obj dsf.obj malloc.obj map.obj midend.obj >> map.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> map.rsp
+        echo version.obj windows.obj >> map.rsp
+
+mines.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > mines.rsp
+        echo drawing.obj malloc.obj midend.obj mines.obj >> mines.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> mines.rsp
+        echo tree234.obj version.obj windows.obj >> mines.rsp
+
+netgame.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > netgame.rsp
+        echo drawing.obj dsf.obj findloop.obj malloc.obj >> netgame.rsp
+        echo midend.obj misc.obj net.obj noicon.res >> netgame.rsp
+        echo printing.obj random.obj tree234.obj version.obj >> netgame.rsp
+        echo windows.obj >> netgame.rsp
+
+netslide.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > netslide.rsp
+        echo drawing.obj malloc.obj midend.obj misc.obj >> netslide.rsp
+        echo netslide.obj noicon.res printing.obj random.obj >> netslide.rsp
+        echo tree234.obj version.obj windows.obj >> netslide.rsp
+
+nullgame.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > nullgame.rsp
+        echo drawing.obj malloc.obj midend.obj misc.obj >> nullgame.rsp
+        echo noicon.res nullgame.obj printing.obj random.obj >> nullgame.rsp
+        echo version.obj windows.obj >> nullgame.rsp
+
+palisade.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > palisade.rsp
+        echo divvy.obj drawing.obj dsf.obj malloc.obj >> palisade.rsp
+        echo midend.obj misc.obj noicon.res palisade.obj >> palisade.rsp
+        echo printing.obj random.obj version.obj windows.obj >> palisade.rsp
+
+pattern.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > pattern.rsp
+        echo drawing.obj malloc.obj midend.obj misc.obj >> pattern.rsp
+        echo noicon.res pattern.obj printing.obj random.obj >> pattern.rsp
+        echo version.obj windows.obj >> pattern.rsp
+
+pearl.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > pearl.rsp
+        echo drawing.obj dsf.obj grid.obj loopgen.obj >> pearl.rsp
+        echo malloc.obj midend.obj misc.obj pearl.obj >> pearl.rsp
+        echo penrose.obj printing.obj random.obj tdq.obj >> pearl.rsp
+        echo tree234.obj version.obj windows.obj >> pearl.rsp
+
+pegs.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > pegs.rsp
+        echo drawing.obj malloc.obj midend.obj misc.obj >> pegs.rsp
+        echo noicon.res pegs.obj printing.obj random.obj >> pegs.rsp
+        echo tree234.obj version.obj windows.obj >> pegs.rsp
+
+puzzles.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > puzzles.rsp
+        echo blackbo3.obj bridges3.obj combi.obj cube3.obj >> puzzles.rsp
+        echo divvy.obj dominos3.obj drawing.obj dsf.obj >> puzzles.rsp
+        echo fifteen5.obj filling5.obj findloop.obj flip3.obj >> puzzles.rsp
+        echo flood3.obj galaxie7.obj grid.obj guess3.obj >> puzzles.rsp
+        echo inertia3.obj keen5.obj latin.obj laydomino.obj >> puzzles.rsp
+        echo lightup5.obj list.obj loopgen.obj loopy5.obj >> puzzles.rsp
+        echo magnets5.obj malloc.obj map5.obj maxflow.obj >> puzzles.rsp
+        echo midend.obj mines5.obj misc.obj net3.obj >> puzzles.rsp
+        echo netslid3.obj noicon.res palisad3.obj pattern7.obj >> puzzles.rsp
+        echo pearl5.obj pegs3.obj penrose.obj printing.obj >> puzzles.rsp
+        echo random.obj range3.obj rect3.obj samegam3.obj >> puzzles.rsp
+        echo signpos5.obj singles5.obj sixteen3.obj slant5.obj >> puzzles.rsp
+        echo solo5.obj tdq.obj tents5.obj towers5.obj >> puzzles.rsp
+        echo tracks3.obj tree234.obj twiddle3.obj undead3.obj >> puzzles.rsp
+        echo unequal5.obj unruly5.obj untangl3.obj version.obj >> puzzles.rsp
+        echo windows1.obj >> puzzles.rsp
+
+range.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > range.rsp
+        echo drawing.obj dsf.obj malloc.obj midend.obj >> range.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> range.rsp
+        echo range.obj version.obj windows.obj >> range.rsp
+
+rect.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > rect.rsp
+        echo drawing.obj malloc.obj midend.obj misc.obj >> rect.rsp
+        echo noicon.res printing.obj random.obj rect.obj >> rect.rsp
+        echo version.obj windows.obj >> rect.rsp
+
+samegame.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > samegame.rsp
+        echo drawing.obj malloc.obj midend.obj misc.obj >> samegame.rsp
+        echo noicon.res printing.obj random.obj samegame.obj >> samegame.rsp
+        echo version.obj windows.obj >> samegame.rsp
+
+signpost.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > signpost.rsp
+        echo drawing.obj dsf.obj malloc.obj midend.obj >> signpost.rsp
+        echo misc.obj noicon.res printing.obj random.obj >> signpost.rsp
+        echo signpost.obj version.obj windows.obj >> signpost.rsp
+
+singles.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > singles.rsp
+        echo drawing.obj dsf.obj latin.obj malloc.obj >> singles.rsp
+        echo maxflow.obj midend.obj misc.obj noicon.res >> singles.rsp
+        echo printing.obj random.obj singles.obj tree234.obj >> singles.rsp
+        echo version.obj windows.obj >> singles.rsp
+
+sixteen.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > sixteen.rsp
+        echo drawing.obj malloc.obj midend.obj misc.obj >> sixteen.rsp
+        echo noicon.res printing.obj random.obj sixteen.obj >> sixteen.rsp
+        echo version.obj windows.obj >> sixteen.rsp
+
+slant.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > slant.rsp
+        echo drawing.obj dsf.obj findloop.obj malloc.obj >> slant.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> slant.rsp
+        echo random.obj slant.obj version.obj windows.obj >> slant.rsp
+
+solo.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > solo.rsp
+        echo divvy.obj drawing.obj dsf.obj malloc.obj >> solo.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> solo.rsp
+        echo random.obj solo.obj version.obj windows.obj >> solo.rsp
+
+tents.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > tents.rsp
+        echo drawing.obj dsf.obj malloc.obj maxflow.obj >> tents.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> tents.rsp
+        echo random.obj tents.obj version.obj windows.obj >> tents.rsp
+
+towers.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > towers.rsp
+        echo drawing.obj latin.obj malloc.obj maxflow.obj >> towers.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> towers.rsp
+        echo random.obj towers.obj tree234.obj version.obj >> towers.rsp
+        echo windows.obj >> towers.rsp
+
+tracks.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > tracks.rsp
+        echo drawing.obj dsf.obj findloop.obj malloc.obj >> tracks.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> tracks.rsp
+        echo random.obj tracks.obj version.obj windows.obj >> tracks.rsp
+
+twiddle.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > twiddle.rsp
+        echo drawing.obj malloc.obj midend.obj misc.obj >> twiddle.rsp
+        echo noicon.res printing.obj random.obj twiddle.obj >> twiddle.rsp
+        echo version.obj windows.obj >> twiddle.rsp
+
+undead.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > undead.rsp
+        echo drawing.obj malloc.obj midend.obj misc.obj >> undead.rsp
+        echo noicon.res printing.obj random.obj undead.obj >> undead.rsp
+        echo version.obj windows.obj >> undead.rsp
+
+unequal.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > unequal.rsp
+        echo drawing.obj latin.obj malloc.obj maxflow.obj >> unequal.rsp
+        echo midend.obj misc.obj noicon.res printing.obj >> unequal.rsp
+        echo random.obj tree234.obj unequal.obj version.obj >> unequal.rsp
+        echo windows.obj >> unequal.rsp
+
+unruly.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > unruly.rsp
+        echo drawing.obj malloc.obj midend.obj misc.obj >> unruly.rsp
+        echo noicon.res printing.obj random.obj unruly.obj >> unruly.rsp
+        echo version.obj windows.obj >> unruly.rsp
+
+untangle.rsp: $(MAKEFILE)
+        echo $(BASELIBS) > untangle.rsp
+        echo drawing.obj malloc.obj midend.obj misc.obj >> untangle.rsp
+        echo noicon.res printing.obj random.obj tree234.obj >> untangle.rsp
+        echo untangle.obj version.obj windows.obj >> untangle.rsp
+
+blackbox.obj: .\blackbox.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\blackbox.c /Foblackbox.obj
+blackbo3.obj: .\blackbox.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\blackbox.c /Foblackbo3.obj
+bridges.obj: .\bridges.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\bridges.c /Fobridges.obj
+bridges3.obj: .\bridges.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\bridges.c /Fobridges3.obj
+combi.obj: .\combi.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\combi.c /Focombi.obj
+cube.obj: .\cube.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\cube.c /Focube.obj
+cube3.obj: .\cube.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\cube.c /Focube3.obj
+divvy.obj: .\divvy.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\divvy.c /Fodivvy.obj
+dominosa.obj: .\dominosa.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\dominosa.c /Fodominosa.obj
+dominos3.obj: .\dominosa.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\dominosa.c /Fodominos3.obj
+drawing.obj: .\drawing.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\drawing.c /Fodrawing.obj
+dsf.obj: .\dsf.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\dsf.c /Fodsf.obj
+fifteen.obj: .\fifteen.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\fifteen.c /Fofifteen.obj
+fifteen5.obj: .\fifteen.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\fifteen.c /Fofifteen5.obj
+fifteen2.obj: .\fifteen.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\fifteen.c /Fofifteen2.obj
+filling.obj: .\filling.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\filling.c /Fofilling.obj
+filling5.obj: .\filling.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\filling.c /Fofilling5.obj
+filling2.obj: .\filling.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\filling.c /Fofilling2.obj
+findloop.obj: .\findloop.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\findloop.c /Fofindloop.obj
+flip.obj: .\flip.c .\puzzles.h .\tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\flip.c /Foflip.obj
+flip3.obj: .\flip.c .\puzzles.h .\tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\flip.c /Foflip3.obj
+flood.obj: .\flood.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\flood.c /Foflood.obj
+flood3.obj: .\flood.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\flood.c /Foflood3.obj
+galaxies.obj: .\galaxies.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\galaxies.c /Fogalaxies.obj
+galaxie7.obj: .\galaxies.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\galaxies.c /Fogalaxie7.obj
+galaxie4.obj: .\galaxies.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_PICTURE_GENERATOR /c .\galaxies.c /Fogalaxie4.obj
+galaxie2.obj: .\galaxies.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\galaxies.c /Fogalaxie2.obj
+grid.obj: .\grid.c .\puzzles.h .\tree234.h .\grid.h .\penrose.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\grid.c /Fogrid.obj
+gtk.obj: .\gtk.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\gtk.c /Fogtk.obj
+guess.obj: .\guess.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\guess.c /Foguess.obj
+guess3.obj: .\guess.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\guess.c /Foguess3.obj
+inertia.obj: .\inertia.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\inertia.c /Foinertia.obj
+inertia3.obj: .\inertia.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\inertia.c /Foinertia3.obj
+keen.obj: .\keen.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\keen.c /Fokeen.obj
+keen5.obj: .\keen.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\keen.c /Fokeen5.obj
+keen2.obj: .\keen.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\keen.c /Fokeen2.obj
+latin.obj: .\latin.c .\puzzles.h .\tree234.h .\maxflow.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\latin.c /Folatin.obj
+latin8.obj: .\latin.c .\puzzles.h .\tree234.h .\maxflow.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_LATIN_TEST /c .\latin.c /Folatin8.obj
+latin6.obj: .\latin.c .\puzzles.h .\tree234.h .\maxflow.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\latin.c /Folatin6.obj
+laydomino.obj: .\laydomino.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\laydomino.c /Folaydomino.obj
+lightup.obj: .\lightup.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\lightup.c /Folightup.obj
+lightup5.obj: .\lightup.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\lightup.c /Folightup5.obj
+lightup2.obj: .\lightup.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\lightup.c /Folightup2.obj
+list.obj: .\list.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\list.c /Folist.obj
+loopgen.obj: .\loopgen.c .\puzzles.h .\tree234.h .\grid.h .\loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\loopgen.c /Foloopgen.obj
+loopy.obj: .\loopy.c .\puzzles.h .\tree234.h .\grid.h .\loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\loopy.c /Foloopy.obj
+loopy5.obj: .\loopy.c .\puzzles.h .\tree234.h .\grid.h .\loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\loopy.c /Foloopy5.obj
+loopy2.obj: .\loopy.c .\puzzles.h .\tree234.h .\grid.h .\loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\loopy.c /Foloopy2.obj
+magnets.obj: .\magnets.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\magnets.c /Fomagnets.obj
+magnets5.obj: .\magnets.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\magnets.c /Fomagnets5.obj
+magnets2.obj: .\magnets.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\magnets.c /Fomagnets2.obj
+malloc.obj: .\malloc.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\malloc.c /Fomalloc.obj
+map.obj: .\map.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\map.c /Fomap.obj
+map5.obj: .\map.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\map.c /Fomap5.obj
+map2.obj: .\map.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\map.c /Fomap2.obj
+maxflow.obj: .\maxflow.c .\maxflow.h .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\maxflow.c /Fomaxflow.obj
+midend.obj: .\midend.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\midend.c /Fomidend.obj
+mines.obj: .\mines.c .\tree234.h .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\mines.c /Fomines.obj
+mines5.obj: .\mines.c .\tree234.h .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\mines.c /Fomines5.obj
+mines2.obj: .\mines.c .\tree234.h .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_OBFUSCATOR /c .\mines.c /Fomines2.obj
+misc.obj: .\misc.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\misc.c /Fomisc.obj
+net.obj: .\net.c .\puzzles.h .\tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\net.c /Fonet.obj
+net3.obj: .\net.c .\puzzles.h .\tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\net.c /Fonet3.obj
+netslide.obj: .\netslide.c .\puzzles.h .\tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\netslide.c /Fonetslide.obj
+netslid3.obj: .\netslide.c .\puzzles.h .\tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\netslide.c /Fonetslid3.obj
+no-icon.obj: .\no-icon.c
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\no-icon.c /Fono-icon.obj
+noicon.res: .\noicon.rc .\puzzles.rc2 .\resource.h
+        rc $(FWHACK) $(RCFL) -r -fonoicon.res .\noicon.rc
+nullfe.obj: .\nullfe.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\nullfe.c /Fonullfe.obj
+nullgame.obj: .\nullgame.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\nullgame.c /Fonullgame.obj
+obfusc.obj: .\obfusc.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\obfusc.c /Foobfusc.obj
+osx.obj: .\osx.m .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\osx.m /Foosx.obj
+palisade.obj: .\palisade.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\palisade.c /Fopalisade.obj
+palisad3.obj: .\palisade.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\palisade.c /Fopalisad3.obj
+pattern.obj: .\pattern.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\pattern.c /Fopattern.obj
+pattern7.obj: .\pattern.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\pattern.c /Fopattern7.obj
+pattern4.obj: .\pattern.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_PICTURE_GENERATOR /c .\pattern.c /Fopattern4.obj
+pattern2.obj: .\pattern.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\pattern.c /Fopattern2.obj
+pearl.obj: .\pearl.c .\puzzles.h .\grid.h .\loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\pearl.c /Fopearl.obj
+pearl5.obj: .\pearl.c .\puzzles.h .\grid.h .\loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\pearl.c /Fopearl5.obj
+pearl2.obj: .\pearl.c .\puzzles.h .\grid.h .\loopgen.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\pearl.c /Fopearl2.obj
+pegs.obj: .\pegs.c .\puzzles.h .\tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\pegs.c /Fopegs.obj
+pegs3.obj: .\pegs.c .\puzzles.h .\tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\pegs.c /Fopegs3.obj
+penrose.obj: .\penrose.c .\puzzles.h .\penrose.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\penrose.c /Fopenrose.obj
+printing.obj: .\printing.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\printing.c /Foprinting.obj
+ps.obj: .\ps.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\ps.c /Fops.obj
+random.obj: .\random.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\random.c /Forandom.obj
+range.obj: .\range.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\range.c /Forange.obj
+range3.obj: .\range.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\range.c /Forange3.obj
+rect.obj: .\rect.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\rect.c /Forect.obj
+rect3.obj: .\rect.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\rect.c /Forect3.obj
+samegame.obj: .\samegame.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\samegame.c /Fosamegame.obj
+samegam3.obj: .\samegame.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\samegame.c /Fosamegam3.obj
+signpost.obj: .\signpost.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\signpost.c /Fosignpost.obj
+signpos5.obj: .\signpost.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\signpost.c /Fosignpos5.obj
+signpos2.obj: .\signpost.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\signpost.c /Fosignpos2.obj
+singles.obj: .\singles.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\singles.c /Fosingles.obj
+singles5.obj: .\singles.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\singles.c /Fosingles5.obj
+singles3.obj: .\singles.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\singles.c /Fosingles3.obj
+sixteen.obj: .\sixteen.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\sixteen.c /Fosixteen.obj
+sixteen3.obj: .\sixteen.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\sixteen.c /Fosixteen3.obj
+slant.obj: .\slant.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\slant.c /Foslant.obj
+slant5.obj: .\slant.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\slant.c /Foslant5.obj
+slant2.obj: .\slant.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\slant.c /Foslant2.obj
+solo.obj: .\solo.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\solo.c /Fosolo.obj
+solo5.obj: .\solo.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\solo.c /Fosolo5.obj
+solo2.obj: .\solo.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\solo.c /Fosolo2.obj
+tdq.obj: .\tdq.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\tdq.c /Fotdq.obj
+tents.obj: .\tents.c .\puzzles.h .\maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\tents.c /Fotents.obj
+tents5.obj: .\tents.c .\puzzles.h .\maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\tents.c /Fotents5.obj
+tents3.obj: .\tents.c .\puzzles.h .\maxflow.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\tents.c /Fotents3.obj
+towers.obj: .\towers.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\towers.c /Fotowers.obj
+towers5.obj: .\towers.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\towers.c /Fotowers5.obj
+towers2.obj: .\towers.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\towers.c /Fotowers2.obj
+tracks.obj: .\tracks.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\tracks.c /Fotracks.obj
+tracks3.obj: .\tracks.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\tracks.c /Fotracks3.obj
+tree234.obj: .\tree234.c .\tree234.h .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\tree234.c /Fotree234.obj
+twiddle.obj: .\twiddle.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\twiddle.c /Fotwiddle.obj
+twiddle3.obj: .\twiddle.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\twiddle.c /Fotwiddle3.obj
+undead.obj: .\undead.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\undead.c /Foundead.obj
+undead3.obj: .\undead.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\undead.c /Foundead3.obj
+unequal.obj: .\unequal.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\unequal.c /Founequal.obj
+unequal5.obj: .\unequal.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\unequal.c /Founequal5.obj
+unequal2.obj: .\unequal.c .\puzzles.h .\latin.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\unequal.c /Founequal2.obj
+unruly.obj: .\unruly.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\unruly.c /Founruly.obj
+unruly5.obj: .\unruly.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\unruly.c /Founruly5.obj
+unruly2.obj: .\unruly.c .\puzzles.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DSTANDALONE_SOLVER /c .\unruly.c /Founruly2.obj
+untangle.obj: .\untangle.c .\puzzles.h .\tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\untangle.c /Fountangle.obj
+untangl3.obj: .\untangle.c .\puzzles.h .\tree234.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\untangle.c /Fountangl3.obj
+version.obj: .\version.c .\version.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\version.c /Foversion.obj
+windows.obj: .\windows.c .\puzzles.h .\resource.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /c .\windows.c /Fowindows.obj
+windows1.obj: .\windows.c .\puzzles.h .\resource.h
+        $(CC) $(COMPAT) $(FWHACK) $(CFLAGS) $(XFLAGS) /DCOMBINED /c .\windows.c /Fowindows1.obj
+
+
+clean: tidy
+        -del *.exe
+
+tidy:
+        -del *.obj
+        -del *.res
+        -del *.pch
+        -del *.aps
+        -del *.ilk
+        -del *.pdb
+        -del *.rsp
+        -del *.dsp
+        -del *.dsw
+        -del *.ncb
+        -del *.opt
+        -del *.plg
+        -del *.map
+        -del *.idb
+        -del debug.log
diff --git a/apps/plugins/puzzles/PuzzleApplet.java b/apps/plugins/puzzles/src/PuzzleApplet.java
index 0b0648ce9b..512aede580 100644
--- a/apps/plugins/puzzles/PuzzleApplet.java
+++ b/apps/plugins/puzzles/src/PuzzleApplet.java
@@ -28,6 +28,9 @@ public class PuzzleApplet extends JApplet implements Runtime.CallJavaCB {
     private JFrame mainWindow;
 
     private JMenu typeMenu;
+    private JMenuItem[] typeMenuItems;
+    private int customMenuItemIndex;
+
     private JMenuItem solveCommand;
     private Color[] colors;
     private JLabel statusBar;
@@ -219,17 +222,17 @@ public class PuzzleApplet extends JApplet implements Runtime.CallJavaCB {
     }
 
     private JMenuItem addMenuItemCallback(JMenu jm, String name, final String callback, final int arg) {
-        return addMenuItemCallback(jm, name, callback, new int[] {arg});
+        return addMenuItemCallback(jm, name, callback, new int[] {arg}, false);
     }
 
     private JMenuItem addMenuItemCallback(JMenu jm, String name, final String callback) {
-        return addMenuItemCallback(jm, name, callback, new int[0]);
+        return addMenuItemCallback(jm, name, callback, new int[0], false);
     }
 
-    private JMenuItem addMenuItemCallback(JMenu jm, String name, final String callback, final int[] args) {
+    private JMenuItem addMenuItemCallback(JMenu jm, String name, final String callback, final int[] args, boolean checkbox) {
         JMenuItem jmi;
-        if (jm == typeMenu)
-            typeMenu.add(jmi = new JCheckBoxMenuItem(name));
+        if (checkbox)
+            jm.add(jmi = new JCheckBoxMenuItem(name));
         else
         jm.add(jmi = new JMenuItem(name));
         jmi.addActionListener(new ActionListener() {
@@ -261,12 +264,29 @@ public class PuzzleApplet extends JApplet implements Runtime.CallJavaCB {
         } else {
             typeMenu.setVisible(true);
         }
-        addMenuItemCallback(typeMenu, "Custom...", "jcallback_config_event", CFG_SETTINGS);
+        typeMenuItems[customMenuItemIndex] =
+            addMenuItemCallback(typeMenu, "Custom...",
+                                "jcallback_config_event",
+                                new int[] {CFG_SETTINGS}, true);
     }
 
-    private void addTypeItem(String name, final int ptrGameParams) {
+    private void addTypeItem
+        (JMenu targetMenu, String name, int newId, final int ptrGameParams) {
+
         typeMenu.setVisible(true);
-        addMenuItemCallback(typeMenu, name, "jcallback_preset_event", ptrGameParams);
+        typeMenuItems[newId] =
+            addMenuItemCallback(targetMenu, name,
+                                "jcallback_preset_event",
+                                new int[] {ptrGameParams}, true);
+    }
+
+    private void addTypeSubmenu
+        (JMenu targetMenu, String name, int newId) {
+
+        JMenu newMenu = new JMenu(name);
+        newMenu.setVisible(true);
+        typeMenuItems[newId] = newMenu;
+        targetMenu.add(newMenu);
     }
 
     public int call(int cmd, int arg1, int arg2, int arg3) {
@@ -279,8 +299,20 @@ public class PuzzleApplet extends JApplet implements Runtime.CallJavaCB {
                 if ((arg2 & 4) != 0) solveCommand.setEnabled(true);
                 colors = new Color[arg3];
                 return 0;
-            case 1: // Type menu item
-                addTypeItem(runtime.cstring(arg1), arg2);
+            case 1: // configure Type menu
+                if (arg1 == 0) {
+                    // preliminary setup
+                    typeMenuItems = new JMenuItem[arg2 + 2];
+                    typeMenuItems[arg2] = typeMenu;
+                    customMenuItemIndex = arg2 + 1;
+                    return arg2;
+                } else if (xarg1 != 0) {
+                    addTypeItem((JMenu)typeMenuItems[arg2],
+                                runtime.cstring(arg1), arg3, xarg1);
+                } else {
+                    addTypeSubmenu((JMenu)typeMenuItems[arg2],
+                                   runtime.cstring(arg1), arg3);
+                }
                 return 0;
             case 2: // MessageBox
                 JOptionPane.showMessageDialog(this, runtime.cstring(arg2), runtime.cstring(arg1), arg3 == 0 ? JOptionPane.INFORMATION_MESSAGE : JOptionPane.ERROR_MESSAGE);
@@ -432,10 +464,11 @@ public class PuzzleApplet extends JApplet implements Runtime.CallJavaCB {
                 dlg = null;
                 return 0;
             case 13: // tick a menu item
-                if (arg1 < 0) arg1 = typeMenu.getItemCount() - 1;
-                for (int i = 0; i < typeMenu.getItemCount(); i++) {
-                    if (typeMenu.getMenuComponent(i) instanceof JCheckBoxMenuItem) {
-                        ((JCheckBoxMenuItem)typeMenu.getMenuComponent(i)).setSelected(arg1 == i);
+                if (arg1 < 0) arg1 = customMenuItemIndex;
+                for (int i = 0; i < typeMenuItems.length; i++) {
+                    if (typeMenuItems[i] instanceof JCheckBoxMenuItem) {
+                        ((JCheckBoxMenuItem)typeMenuItems[i]).setSelected
+                            (arg1 == i);
                     }
                 }
                 return 0;
diff --git a/apps/plugins/puzzles/README b/apps/plugins/puzzles/src/README
index 890db56771..890db56771 100644
--- a/apps/plugins/puzzles/README
+++ b/apps/plugins/puzzles/src/README
diff --git a/apps/plugins/puzzles/Recipe b/apps/plugins/puzzles/src/Recipe
index ba8317f51a..ba8317f51a 100644
--- a/apps/plugins/puzzles/Recipe
+++ b/apps/plugins/puzzles/src/Recipe
diff --git a/apps/plugins/puzzles/src/aclocal.m4 b/apps/plugins/puzzles/src/aclocal.m4
new file mode 100644
index 0000000000..6e4efedfb6
--- /dev/null
+++ b/apps/plugins/puzzles/src/aclocal.m4
@@ -0,0 +1,1832 @@
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+
+# Configure paths for GTK+
+# Owen Taylor     1997-2001
+
+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
+dnl pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GTK_2_0],
+[dnl 
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
+                    , enable_gtktest=yes)
+
+  pkg_config_args=gtk+-2.0
+  for module in . $4
+  do
+      case "$module" in
+         gthread) 
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  no_gtk=""
+
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+  PKG_PROG_PKG_CONFIG([0.7])
+
+  min_gtk_version=ifelse([$1], ,2.0.0,$1)
+  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+          echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+          enable_gtktest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+          :
+    else
+          no_gtk=yes
+    fi
+  fi
+
+  if test x"$no_gtk" = x ; then
+    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  fclose (fopen ("conf.gtktest", "w"));
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+           (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+               major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://pkgconfig.sourceforge.net"
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK+ test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
+          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+          echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
+])
+
+# Configure paths for GTK+
+# Owen Taylor     1997-2001
+
+dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
+dnl pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GTK_3_0],
+[m4_warn([obsolete], [AM_PATH_GTK_3_0 is deprecated, use PKG_CHECK_MODULES([GTK], [gtk+-3.0]) instead])
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
+                    , enable_gtktest=yes)
+  min_gtk_version=ifelse([$1], [], [3.0.0], [$1])
+
+  pkg_config_args="gtk+-3.0 >= $min_gtk_version"
+  for module in . $4
+  do
+      case "$module" in
+         gthread)
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  no_gtk=""
+
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+  if test x$PKG_CONFIG != xno ; then
+    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
+      :
+    else
+      echo "*** pkg-config too old; version 0.7 or better required."
+      no_gtk=yes
+      PKG_CONFIG=no
+    fi
+  else
+    no_gtk=yes
+  fi
+
+  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+          echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+          enable_gtktest=no
+    fi
+
+    if $PKG_CONFIG $pkg_config_args; then
+          :
+    else
+          no_gtk=yes
+    fi
+  fi
+
+  if test x"$no_gtk" = x ; then
+    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  unsigned int major, minor, micro;
+
+  fclose (fopen ("conf.gtktest", "w"));
+
+  if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+           (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n",
+               major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
+     ifelse([$2], , :, [$2])
+  else
+     AC_MSG_RESULT(no)
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://pkgconfig.sourceforge.net"
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK+ test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
+          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+          echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
+])
+
+dnl GTK_CHECK_BACKEND(BACKEND-NAME [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl   Tests for BACKEND-NAME in the GTK targets list
+dnl
+AC_DEFUN([GTK_CHECK_BACKEND],
+[m4_warn([obsolete], [GTK_CHECK_BACKEND is deprecated, use PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-3.0]) or similar instead])
+  pkg_config_args=ifelse([$1],,gtk+-3.0, gtk+-$1-3.0)
+  min_gtk_version=ifelse([$2],,3.0.0,$2)
+  pkg_config_args="$pkg_config_args >= $min_gtk_version"
+
+  AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])])
+
+  if $PKG_CONFIG $pkg_config_args ; then
+    target_found=yes
+  else
+    target_found=no
+  fi
+
+  if test "x$target_found" = "xno"; then
+    ifelse([$4],,[AC_MSG_ERROR([Backend $backend not found.])],[$4])
+  else
+    ifelse([$3],,[:],[$3])
+  fi
+])
+
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+        AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+        _pkg_min_version=m4_default([$1], [0.9.0])
+        AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+                AC_MSG_RESULT([yes])
+        else
+                AC_MSG_RESULT([no])
+                PKG_CONFIG=""
+        fi
+fi[]dnl
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+                      test "x$?" != "x0" && pkg_failed=yes ],
+                     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+        m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+        AC_MSG_RESULT([no])
+        m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+        $3
+fi[]dnl
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
+
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.15'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.15], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.15])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+        continue
+      else
+        break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.65])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+                             [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES([CC])],
+                  [m4_define([AC_PROG_CC],
+                             m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES([CXX])],
+                  [m4_define([AC_PROG_CXX],
+                             m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES([OBJC])],
+                  [m4_define([AC_PROG_OBJC],
+                             m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+                  [_AM_DEPENDENCIES([OBJCXX])],
+                  [m4_define([AC_PROG_OBJCXX],
+                             m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\     *)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Check to see how 'make' treats includes.                  -*- Autoconf -*-
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+        @echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\     *)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \    ]]*)
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+        # -L didn't work.
+        set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+        && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+        # If neither matched, then we have a broken ls.  This can happen
+        # if, for instance, CONFIG_SHELL is bash and it inherits a
+        # broken ls alias from the environment.  This has actually
+        # happened.  Such a system could not be considered "sane".
+        AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+        @$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
diff --git a/apps/plugins/puzzles/benchmark.pl b/apps/plugins/puzzles/src/benchmark.pl
index 98763859e8..98763859e8 100755
--- a/apps/plugins/puzzles/benchmark.pl
+++ b/apps/plugins/puzzles/src/benchmark.pl
diff --git a/apps/plugins/puzzles/benchmark.sh b/apps/plugins/puzzles/src/benchmark.sh
index b3af27765e..b3af27765e 100755
--- a/apps/plugins/puzzles/benchmark.sh
+++ b/apps/plugins/puzzles/src/benchmark.sh
diff --git a/apps/plugins/puzzles/blackbox.R b/apps/plugins/puzzles/src/blackbox.R
index 116225206d..116225206d 100644
--- a/apps/plugins/puzzles/blackbox.R
+++ b/apps/plugins/puzzles/src/blackbox.R
diff --git a/apps/plugins/puzzles/blackbox.c b/apps/plugins/puzzles/src/blackbox.c
index a4875e49d7..b334cf7117 100644
--- a/apps/plugins/puzzles/blackbox.c
+++ b/apps/plugins/puzzles/src/blackbox.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1505,7 +1505,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Black Box", "games.blackbox", "blackbox",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/blackbox.html b/apps/plugins/puzzles/src/blackbox.html
new file mode 100644
index 0000000000..f7bb340f41
--- /dev/null
+++ b/apps/plugins/puzzles/src/blackbox.html
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Black Box</title>
+<link rel="previous" href="untangle.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="slant.html">
+</head>
+<body>
+<p><a href="untangle.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="slant.html">Next</a></p>
+<h1><a name="C19"></a>Chapter 19: <a name="i0"></a>Black Box</h1>
+<p>
+A number of balls are hidden in a rectangular arena. You have to deduce the positions of the balls by firing lasers positioned at the edges of the arena and observing how their beams are deflected.
+</p>
+<p>
+Beams will travel straight from their origin until they hit the opposite side of the arena (at which point they emerge), unless affected by balls in one of the following ways:
+</p>
+<ul><li>
+A beam that hits a ball head-on is absorbed and will never re-emerge. This includes beams that meet a ball on the first rank of the arena.
+</li>
+<li>
+A beam with a ball in its front-left square and no ball ahead of it gets deflected 90 degrees to the right.
+</li>
+<li>
+A beam with a ball in its front-right square and no ball ahead of it gets similarly deflected to the left.
+</li>
+<li>
+A beam that would re-emerge from its entry location is considered to be &#8216;reflected&#8217;.
+</li>
+<li>
+A beam which would get deflected before entering the arena by a ball to the front-left or front-right of its entry point is also considered to be &#8216;reflected&#8217;.
+</li>
+</ul>
+<p>
+Beams that are reflected appear as a &#8216;R&#8217;; beams that hit balls head-on appear as &#8216;H&#8217;. Otherwise, a number appears at the firing point and the location where the beam emerges (this number is unique to that shot).
+</p>
+<p>
+You can place guesses as to the location of the balls, based on the entry and exit patterns of the beams; once you have placed enough balls a button appears enabling you to have your guesses checked.
+</p>
+<p>
+Here is a diagram showing how the positions of balls can create each of the beam behaviours shown above:
+</p>
+<pre><code> 1RHR---- 
+|..O.O...|
+2........3
+|........|
+|........|
+3........|
+|......O.|
+H........|
+|.....O..|
+ 12-RR---
+</code></pre>
+<p>
+As shown, it is possible for a beam to receive multiple reflections before re-emerging (see turn 3). Similarly, a beam may be reflected (possibly more than once) before receiving a hit (the &#8216;H&#8217; on the left side of the example).
+</p>
+<p>
+Note that any layout with more than 4 balls may have a non-unique solution. The following diagram illustrates this; if you know the board contains 5 balls, it is impossible to determine where the fifth ball is (possible positions marked with an <code>x</code>):
+</p>
+<pre><code> -------- 
+|........|
+|........|
+|..O..O..|
+|...xx...|
+|...xx...|
+|..O..O..|
+|........|
+|........|
+ --------
+</code></pre>
+<p>
+For this reason, when you have your guesses checked, the game will check that your solution <em>produces the same results</em> as the computer's, rather than that your solution is identical to the computer's. So in the above example, you could put the fifth ball at <em>any</em> of the locations marked with an <code>x</code>, and you would still win.
+</p>
+<p>
+Black Box was contributed to this collection by James Harvey.
+</p>
+<h2><a name="S19.1"></a>19.1 <a name="i1"></a>Black Box controls</h2>
+<p>
+To fire a laser beam, left-click in a square around the edge of the arena. The results will be displayed immediately. Clicking or holding the left button on one of these squares will highlight the current go (or a previous go) to confirm the exit point for that laser, if applicable.
+</p>
+<p>
+To guess the location of a ball, left-click within the arena and a black circle will appear marking the guess; click again to remove the guessed ball.
+</p>
+<p>
+Locations in the arena may be locked against modification by right-clicking; whole rows and columns may be similarly locked by right-clicking in the laser square above/below that column, or to the left/right of that row.
+</p>
+<p>
+The cursor keys may also be used to move around the grid. Pressing the Enter key will fire a laser or add a new ball-location guess, and pressing Space will lock a cell, row, or column.
+</p>
+<p>
+When an appropriate number of balls have been guessed, a button will appear at the top-left corner of the grid; clicking that (with mouse or cursor) will check your guesses.
+</p>
+<p>
+If you click the &#8216;check&#8217; button and your guesses are not correct, the game will show you the minimum information necessary to demonstrate this to you, so you can try again. If your ball positions are not consistent with the beam paths you already know about, one beam path will be circled to indicate that it proves you wrong. If your positions match all the existing beam paths but are still wrong, one new beam path will be revealed (written in red) which is not consistent with your current guesses.
+</p>
+<p>
+If you decide to give up completely, you can select Solve to reveal the actual ball positions. At this point, correctly-placed balls will be displayed as filled black circles, incorrectly-placed balls as filled black circles with red crosses, and missing balls as filled red circles. In addition, a red circle marks any laser you had already fired which is not consistent with your ball layout (just as when you press the &#8216;check&#8217; button), and red text marks any laser you <em>could</em> have fired in order to distinguish your ball layout from the correct one.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S19.2"></a>19.2 <a name="i2"></a>Black Box parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares. There are 2 &#215; <em>Width</em> &#215; <em>Height</em> lasers per grid, two per row and two per column.
+</dd>
+<dt>
+<em>No. of balls</em>
+</dt>
+<dd>
+Number of balls to place in the grid. This can be a single number, or a range (separated with a hyphen, like &#8216;2-6&#8217;), and determines the number of balls to place on the grid. The &#8216;reveal&#8217; button is only enabled if you have guessed an appropriate number of balls; a guess using a different number to the original solution is still acceptable, if all the beam inputs and outputs match.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/bridges.R b/apps/plugins/puzzles/src/bridges.R
index 75df309152..75df309152 100644
--- a/apps/plugins/puzzles/bridges.R
+++ b/apps/plugins/puzzles/src/bridges.R
diff --git a/apps/plugins/puzzles/bridges.c b/apps/plugins/puzzles/src/bridges.c
index 05a9b16823..6975208fd6 100644
--- a/apps/plugins/puzzles/bridges.c
+++ b/apps/plugins/puzzles/src/bridges.c
@@ -70,7 +70,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -3224,7 +3224,7 @@ static void game_print(drawing *dr, const game_state *state, int ts)
 const struct game thegame = {
     "Bridges", "games.bridges", "bridges",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/bridges.html b/apps/plugins/puzzles/src/bridges.html
new file mode 100644
index 0000000000..74a8a130cd
--- /dev/null
+++ b/apps/plugins/puzzles/src/bridges.html
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Bridges</title>
+<link rel="previous" href="tents.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="unequal.html">
+</head>
+<body>
+<p><a href="tents.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="unequal.html">Next</a></p>
+<h1><a name="C26"></a>Chapter 26: <a name="i0"></a>Bridges</h1>
+<p>
+You have a set of islands distributed across the playing area. Each island contains a number. Your aim is to connect the islands together with bridges, in such a way that:
+</p>
+<ul><li>
+Bridges run horizontally or vertically.
+</li>
+<li>
+The number of bridges terminating at any island is equal to the number written in that island.
+</li>
+<li>
+Two bridges may run in parallel between the same two islands, but no more than two may do so.
+</li>
+<li>
+No bridge crosses another bridge.
+</li>
+<li>
+All the islands are connected together.
+</li>
+</ul>
+<p>
+There are some configurable alternative modes, which involve changing the parallel-bridge limit to something other than 2, and introducing the additional constraint that no sequence of bridges may form a loop from one island back to the same island. The rules stated above are the default ones.
+</p>
+<p>
+Credit for this puzzle goes to <a name="i1"></a>Nikoli <a href="#p0">[12]</a>.
+</p>
+<p>
+Bridges was contributed to this collection by James Harvey.
+</p>
+<p><a name="p0"></a>
+[12] <a href="http://www.nikoli.co.jp/en/puzzles/hashiwokakero.html"><code>http://www.nikoli.co.jp/en/puzzles/hashiwokakero.html</code></a> (beware of Flash)
+</p>
+<h2><a name="S26.1"></a>26.1 <a name="i2"></a>Bridges controls</h2>
+<p>
+To place a bridge between two islands, click the mouse down on one island and drag it towards the other. You do not need to drag all the way to the other island; you only need to move the mouse far enough for the intended bridge direction to be unambiguous. (So you can keep the mouse near the starting island and conveniently throw bridges out from it in many directions.)
+</p>
+<p>
+Doing this again when a bridge is already present will add another parallel bridge. If there are already as many bridges between the two islands as permitted by the current game rules (i.e. two by default), the same dragging action will remove all of them.
+</p>
+<p>
+If you want to remind yourself that two islands definitely <em>do not</em> have a bridge between them, you can right-drag between them in the same way to draw a &#8216;non-bridge&#8217; marker.
+</p>
+<p>
+If you think you have finished with an island (i.e. you have placed all its bridges and are confident that they are in the right places), you can mark the island as finished by left-clicking on it. This will highlight it and all the bridges connected to it, and you will be prevented from accidentally modifying any of those bridges in future. Left-clicking again on a highlighted island will unmark it and restore your ability to modify it.
+</p>
+<p>
+You can also use the cursor keys to move around the grid: if possible the cursor will always move orthogonally, otherwise it will move towards the nearest island to the indicated direction. Holding Control and pressing a cursor key will lay a bridge in that direction (if available); Shift and a cursor key will lay a &#8216;non-bridge&#8217; marker. Pressing the return key followed by a cursor key will also lay a bridge in that direction.
+</p>
+<p>
+You can mark an island as finished by pressing the space bar or by pressing the return key twice.
+</p>
+<p>
+By pressing a number key, you can jump to the nearest island with that number. Letters &#8216;a&#8217;, ..., &#8216;f&#8217; count as 10, ..., 15 and &#8216;0&#8217; as 16.
+</p>
+<p>
+Violations of the puzzle rules will be marked in red:
+</p>
+<ul><li>
+An island with too many bridges will be highlighted in red.
+</li>
+<li>
+An island with too few bridges will be highlighted in red if it is definitely an error (as opposed to merely not being finished yet): if adding enough bridges would involve having to cross another bridge or remove a non-bridge marker, or if the island has been highlighted as complete.
+</li>
+<li>
+A group of islands and bridges may be highlighted in red if it is a closed subset of the puzzle with no way to connect it to the rest of the islands. For example, if you directly connect two 1s together with a bridge and they are not the only two islands on the grid, they will light up red to indicate that such a group cannot be contained in any valid solution.
+</li>
+<li>
+If you have selected the (non-default) option to disallow loops in the solution, a group of bridges which forms a loop will be highlighted.
+</li>
+</ul>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S26.2"></a>26.2 <a name="i3"></a>Bridges parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Difficulty level of puzzle.
+</dd>
+<dt>
+<em>Allow loops</em>
+</dt>
+<dd>
+This is set by default. If cleared, puzzles will be generated in such a way that they are always soluble without creating a loop, and solutions which do involve a loop will be disallowed.
+</dd>
+<dt>
+<em>Max. bridges per direction</em>
+</dt>
+<dd>
+Maximum number of bridges in any particular direction. The default is 2, but you can change it to 1, 3 or 4. In general, fewer is easier.
+</dd>
+<dt>
+<em>%age of island squares</em>
+</dt>
+<dd>
+Gives a rough percentage of islands the generator will try and lay before finishing the puzzle. Certain layouts will not manage to lay enough islands; this is an upper bound.
+</dd>
+<dt>
+<em>Expansion factor (%age)</em>
+</dt>
+<dd>
+The grid generator works by picking an existing island at random (after first creating an initial island somewhere). It then decides on a direction (at random), and then works out how far it could extend before creating another island. This parameter determines how likely it is to extend as far as it can, rather than choosing somewhere closer.
+<p>
+High expansion factors usually mean easier puzzles with fewer possible islands; low expansion factors can create lots of tightly-packed islands.
+</p>
+
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/chm.but b/apps/plugins/puzzles/src/chm.but
index e0237044e4..e0237044e4 100644
--- a/apps/plugins/puzzles/chm.but
+++ b/apps/plugins/puzzles/src/chm.but
diff --git a/apps/plugins/puzzles/chm.css b/apps/plugins/puzzles/src/chm.css
index d8c316bfc6..d8c316bfc6 100644
--- a/apps/plugins/puzzles/chm.css
+++ b/apps/plugins/puzzles/src/chm.css
diff --git a/apps/plugins/puzzles/combi.c b/apps/plugins/puzzles/src/combi.c
index d39e298405..4c5d1077aa 100644
--- a/apps/plugins/puzzles/combi.c
+++ b/apps/plugins/puzzles/src/combi.c
@@ -1,4 +1,4 @@
-#include "rbassert.h"
+#include <assert.h>
 #include <string.h>
 
 #include "puzzles.h"
diff --git a/apps/plugins/puzzles/src/common.html b/apps/plugins/puzzles/src/common.html
new file mode 100644
index 0000000000..951429d806
--- /dev/null
+++ b/apps/plugins/puzzles/src/common.html
@@ -0,0 +1,285 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Common features</title>
+<link rel="previous" href="intro.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="net.html">
+</head>
+<body>
+<p><a href="intro.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="net.html">Next</a></p>
+
+<ul>
+<li><a href="#C2">Chapter 2: Common features</a>
+<ul>
+<li><a href="#S2.1">2.1 Common actions</a></li>
+<li><a href="#S2.2">2.2 Specifying games with the game ID</a></li>
+<li><a href="#S2.3">2.3 The &#8216;Type&#8217; menu</a></li>
+<li><a href="#S2.4">2.4 Specifying game parameters on the command line</a></li>
+<li><a href="#S2.5">2.5 Unix command-line options</a></li>
+</ul></li>
+</ul>
+<h1><a name="C2"></a>Chapter 2: <a name="i0"></a>Common features</h1>
+<p>
+This chapter describes features that are common to all the games.
+</p>
+<h2><a name="S2.1"></a>2.1 <a name="i1"></a>Common actions</h2>
+<p>
+These actions are all available from the <a name="i2"></a>&#8216;Game&#8217; menu and via <a name="i3"></a>keyboard shortcuts, in addition to any game-specific actions.
+</p>
+<p>
+(On <a name="i4"></a>Mac OS X, to conform with local user interface standards, these actions are situated on the <a name="i5"></a>&#8216;File&#8217; and <a name="i6"></a>&#8216;Edit&#8217; menus instead.)
+</p>
+<dl><dt>
+<a name="i7"></a><em>New game</em> (&#8216;N&#8217;, Ctrl+&#8216;N&#8217;)
+</dt>
+<dd>
+Starts a new game, with a random initial state.
+</dd>
+<dt>
+<a name="i8"></a><em>Restart game</em>
+</dt>
+<dd>
+Resets the current game to its initial state. (This can be undone.)
+</dd>
+<dt>
+<a name="i9"></a><em>Load</em>
+</dt>
+<dd>
+Loads a saved game from a file on disk.
+</dd>
+<dt>
+<a name="i10"></a><em>Save</em>
+</dt>
+<dd>
+Saves the current state of your game to a file on disk.
+<p>
+The Load and Save operations preserve your entire game history (so you can save, reload, and still Undo and Redo things you had done before saving).
+</p>
+
+</dd>
+<dt>
+<a name="i11"></a><em>Print</em>
+</dt>
+<dd>
+Where supported (currently only on Windows), brings up a dialog allowing you to print an arbitrary number of puzzles randomly generated from the current parameters, optionally including the current puzzle. (Only for puzzles which make sense to print, of course &#8211; it's hard to think of a sensible printable representation of Fifteen!)
+</dd>
+<dt>
+<a name="i12"></a><em>Undo</em> (&#8216;U&#8217;, Ctrl+&#8216;Z&#8217;, Ctrl+&#8216;_&#8217;)
+</dt>
+<dd>
+Undoes a single move. (You can undo moves back to the start of the session.)
+</dd>
+<dt>
+<a name="i13"></a><em>Redo</em> (&#8216;R&#8217;, Ctrl+&#8216;R&#8217;)
+</dt>
+<dd>
+Redoes a previously undone move.
+</dd>
+<dt>
+<a name="i14"></a><em>Copy</em>
+</dt>
+<dd>
+Copies the current state of your game to the clipboard in text format, so that you can paste it into (say) an e-mail client or a web message board if you're discussing the game with someone else. (Not all games support this feature.)
+</dd>
+<dt>
+<a name="i15"></a><em>Solve</em>
+</dt>
+<dd>
+Transforms the puzzle instantly into its solved state. For some games (Cube) this feature is not supported at all because it is of no particular use. For other games (such as Pattern), the solved state can be used to give you information, if you can't see how a solution can exist at all or you want to know where you made a mistake. For still other games (such as Sixteen), automatic solution tells you nothing about how to <em>get</em> to the solution, but it does provide a useful way to get there quickly so that you can experiment with set-piece moves and transformations.
+<p>
+Some games (such as Solo) are capable of solving a game ID you have typed in from elsewhere. Other games (such as Rectangles) cannot solve a game ID they didn't invent themself, but when they did invent the game ID they know what the solution is already. Still other games (Pattern) can solve <em>some</em> external game IDs, but only if they aren't too difficult.
+</p>
+<p>
+The &#8216;Solve&#8217; command adds the solved state to the end of the undo chain for the puzzle. In other words, if you want to go back to solving it yourself after seeing the answer, you can just press Undo.
+</p>
+
+</dd>
+<dt>
+<a name="i16"></a><a name="i17"></a><em>Quit</em> (&#8216;Q&#8217;, Ctrl+&#8216;Q&#8217;)
+</dt>
+<dd>
+Closes the application entirely.
+</dd>
+</dl>
+<h2><a name="S2.2"></a>2.2 Specifying games with the <a name="i18"></a>game ID</h2>
+<p>
+There are two ways to save a game specification out of a puzzle and recreate it later, or recreate it in somebody else's copy of the same puzzle.
+</p>
+<p>
+The &#8216;<a name="i19"></a>Specific&#8217; and &#8216;<a name="i20"></a>Random Seed&#8217; options from the <a name="i21"></a>&#8216;Game&#8217; menu (or the &#8216;File&#8217; menu, on <a name="i22"></a>Mac OS X) each show a piece of text (a &#8216;game ID&#8217;) which is sufficient to reconstruct precisely the same game at a later date.
+</p>
+<p>
+You can enter either of these pieces of text back into the program (via the same &#8216;Specific&#8217; or &#8216;Random Seed&#8217; menu options) at a later point, and it will recreate the same game. You can also use either one as a <a name="i23"></a>command line argument (on Windows or Unix); see <a href="#S2.4">section 2.4</a> for more detail.
+</p>
+<p>
+The difference between the two forms is that a descriptive game ID is a literal <em>description</em> of the <a name="i24"></a>initial state of the game, whereas a random seed is just a piece of arbitrary text which was provided as input to the random number generator used to create the puzzle. This means that:
+</p>
+<ul><li>
+Descriptive game IDs tend to be longer in many puzzles (although some, such as Cube (<a href="cube.html#C4">chapter 4</a>), only need very short descriptions). So a random seed is often a <em>quicker</em> way to note down the puzzle you're currently playing, or to tell it to somebody else so they can play the same one as you.
+</li>
+<li>
+Any text at all is a valid random seed. The automatically generated ones are fifteen-digit numbers, but anything will do; you can type in your full name, or a word you just made up, and a valid puzzle will be generated from it. This provides a way for two or more people to race to complete the same puzzle: you think of a random seed, then everybody types it in at the same time, and nobody has an advantage due to having seen the generated puzzle before anybody else.
+</li>
+<li>
+It is often possible to convert puzzles from other sources (such as &#8216;nonograms&#8217; or &#8216;sudoku&#8217; from newspapers) into descriptive game IDs suitable for use with these programs.
+</li>
+<li>
+Random seeds are not guaranteed to produce the same result if you use them with a different <a name="i25"></a><em>version</em> of the puzzle program. This is because the generation algorithm might have been improved or modified in later versions of the code, and will therefore produce a different result when given the same sequence of random numbers. Use a descriptive game ID if you aren't sure that it will be used on the same version of the program as yours.
+<p>
+(Use the &#8216;About&#8217; menu option to find out the version number of the program. Programs with the same version number running on different platforms should still be random-seed compatible.)
+</p>
+
+</li>
+</ul>
+<p>
+<a name="i26"></a>A descriptive game ID starts with a piece of text which encodes the <a name="i27"></a><em>parameters</em> of the current game (such as grid size). Then there is a colon, and after that is the description of the game's initial state. A random seed starts with a similar string of parameters, but then it contains a hash sign followed by arbitrary data.
+</p>
+<p>
+If you enter a descriptive game ID, the program will not be able to show you the random seed which generated it, since it wasn't generated <em>from</em> a random seed. If you <em>enter</em> a random seed, however, the program will be able to show you the descriptive game ID derived from that random seed.
+</p>
+<p>
+Note that the game parameter strings are not always identical between the two forms. For some games, there will be parameter data provided with the random seed which is not included in the descriptive game ID. This is because that parameter information is only relevant when <em>generating</em> puzzle grids, and is not important when playing them. Thus, for example, the difficulty level in Solo (<a href="solo.html#C11">chapter 11</a>) is not mentioned in the descriptive game ID.
+</p>
+<p>
+These additional parameters are also not set permanently if you type in a game ID. For example, suppose you have Solo set to &#8216;Advanced&#8217; difficulty level, and then a friend wants your help with a &#8216;Trivial&#8217; puzzle; so the friend reads out a random seed specifying &#8216;Trivial&#8217; difficulty, and you type it in. The program will generate you the same &#8216;Trivial&#8217; grid which your friend was having trouble with, but once you have finished playing it, when you ask for a new game it will automatically go back to the &#8216;Advanced&#8217; difficulty which it was previously set on.
+</p>
+<h2><a name="S2.3"></a>2.3 The &#8216;Type&#8217; menu</h2>
+<p>
+The <a name="i28"></a>&#8216;Type&#8217; menu, if present, may contain a list of <a name="i29"></a>preset game settings. Selecting one of these will start a new random game with the parameters specified.
+</p>
+<p>
+The &#8216;Type&#8217; menu may also contain a &#8216;<a name="i30"></a>Custom&#8217; option which allows you to fine-tune game <a name="i31"></a>parameters. The parameters available are specific to each game and are described in the following sections.
+</p>
+<h2><a name="S2.4"></a>2.4 Specifying game parameters on the <a name="i32"></a>command line</h2>
+<p>
+(This section does not apply to the <a name="i33"></a>Mac OS X version.)
+</p>
+<p>
+The games in this collection deliberately do not ever save information on to the computer they run on: they have no high score tables and no saved preferences. (This is because I expect at least some people to play them at work, and those people will probably appreciate leaving as little evidence as possible!)
+</p>
+<p>
+However, if you do want to arrange for one of these games to <a name="i34"></a>default to a particular set of parameters, you can specify them on the command line.
+</p>
+<p>
+The easiest way to do this is to set up the parameters you want using the &#8216;Type&#8217; menu (see <a href="#S2.3">section 2.3</a>), and then to select &#8216;Random Seed&#8217; from the &#8216;Game&#8217; or &#8216;File&#8217; menu (see <a href="#S2.2">section 2.2</a>). The text in the &#8216;Game ID&#8217; box will be composed of two parts, separated by a hash. The first of these parts represents the game parameters (the size of the playing area, for example, and anything else you set using the &#8216;Type&#8217; menu).
+</p>
+<p>
+If you run the game with just that parameter text on the command line, it will start up with the settings you specified.
+</p>
+<p>
+For example: if you run Cube (see <a href="cube.html#C4">chapter 4</a>), select &#8216;Octahedron&#8217; from the &#8216;Type&#8217; menu, and then go to the game ID selection, you will see a string of the form &#8216;<code>o2x2#338686542711620</code>&#8217;. Take only the part before the hash (&#8216;<code>o2x2</code>&#8217;), and start Cube with that text on the command line: &#8216;<code>PREFIX-cube o2x2</code>&#8217;.
+</p>
+<p>
+If you copy the <em>entire</em> game ID on to the command line, the game will start up in the specific game that was described. This is occasionally a more convenient way to start a particular game ID than by pasting it into the game ID selection box.
+</p>
+<p>
+(You could also retrieve the encoded game parameters using the &#8216;Specific&#8217; menu option instead of &#8216;Random Seed&#8217;, but if you do then some options, such as the difficulty level in Solo, will be missing. See <a href="#S2.2">section 2.2</a> for more details on this.)
+</p>
+<h2><a name="S2.5"></a>2.5 <a name="i35"></a>Unix <a name="i36"></a>command-line options</h2>
+<p>
+(This section only applies to the Unix port.)
+</p>
+<p>
+In addition to being able to specify game parameters on the command line (see <a href="#S2.4">section 2.4</a>), there are various other options:
+</p>
+<dl><dt>
+<code>--game</code>
+</dt>
+<dt>
+<code>--load</code>
+</dt>
+<dd>
+These options respectively determine whether the command-line argument is treated as specifying game parameters or a <a name="i37"></a>save file to <a name="i38"></a>load. Only one should be specified. If neither of these options is specified, a guess is made based on the format of the argument.
+</dd>
+<dt>
+<code>--generate </code><em>n</em>
+</dt>
+<dd>
+If this option is specified, instead of a puzzle being displayed, a number of descriptive game IDs will be <a name="i39"></a>invented and printed on standard output. This is useful for gaining access to the game generation algorithms without necessarily using the frontend.
+<p>
+If game parameters are specified on the command-line, they will be used to generate the game IDs; otherwise a default set of parameters will be used.
+</p>
+<p>
+The most common use of this option is in conjunction with <code>--print</code>, in which case its behaviour is slightly different; see below.
+</p>
+
+</dd>
+<dt>
+<a name="i40"></a><code>--print </code><em>w</em><code>x</code><em>h</em>
+</dt>
+<dd>
+If this option is specified, instead of a puzzle being displayed, a printed representation of one or more unsolved puzzles is sent to standard output, in <a name="i41"></a>PostScript format.
+<p>
+On each page of puzzles, there will be <em>w</em> across and <em>h</em> down. If there are more puzzles than <em>w</em>&#215;<em>h</em>, more than one page will be printed.
+</p>
+<p>
+If <code>--generate</code> has also been specified, the invented game IDs will be used to generate the printed output. Otherwise, a list of game IDs is expected on standard input (which can be descriptive or random seeds; see <a href="#S2.2">section 2.2</a>), in the same format produced by <code>--generate</code>.
+</p>
+<p>
+For example:
+</p>
+<pre><code>PREFIX-net --generate 12 --print 2x3 7x7w | lpr
+</code></pre>
+<p>
+will generate two pages of printed Net puzzles (each of which will have a 7&#215;7 wrapping grid), and pipe the output to the <code>lpr</code> command, which on many systems will send them to an actual printer.
+</p>
+<p>
+There are various other options which affect printing; see below.
+</p>
+
+</dd>
+<dt>
+<code>--save </code><em>file-prefix</em> [ <code>--save-suffix </code><em>file-suffix</em> ]
+</dt>
+<dd>
+If this option is specified, instead of a puzzle being displayed, saved-game files for one or more unsolved puzzles are written to files constructed from the supplied prefix and/or suffix.
+<p>
+If <code>--generate</code> has also been specified, the invented game IDs will be used to generate the printed output. Otherwise, a list of game IDs is expected on standard input (which can be descriptive or random seeds; see <a href="#S2.2">section 2.2</a>), in the same format produced by <code>--generate</code>.
+</p>
+<p>
+For example:
+</p>
+<pre><code>PREFIX-net --generate 12 --save game --save-suffix .sav
+</code></pre>
+<p>
+will generate twelve Net saved-game files with the names <code>game0.sav</code> to <code>game11.sav</code>.
+</p>
+
+</dd>
+<dt>
+<code>--version</code>
+</dt>
+<dd>
+Prints version information about the game, and then quits.
+</dd>
+</dl>
+<p>
+The following options are only meaningful if <code>--print</code> is also specified:
+</p>
+<dl><dt>
+<code>--with-solutions</code>
+</dt>
+<dd>
+The set of pages filled with unsolved puzzles will be followed by the solutions to those puzzles.
+</dd>
+<dt>
+<code>--scale </code><em>n</em>
+</dt>
+<dd>
+Adjusts how big each puzzle is when printed. Larger numbers make puzzles bigger; the default is 1.0.
+</dd>
+<dt>
+<code>--colour</code>
+</dt>
+<dd>
+Puzzles will be printed in colour, rather than in black and white (if supported by the puzzle).
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/src/compile b/apps/plugins/puzzles/src/compile
new file mode 100755
index 0000000000..a85b723c7e
--- /dev/null
+++ b/apps/plugins/puzzles/src/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""        $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+        # lazily determine how to convert abs files
+        case `uname -s` in
+          MINGW*)
+            file_conv=mingw
+            ;;
+          CYGWIN*)
+            file_conv=cygwin
+            ;;
+          *)
+            file_conv=wine
+            ;;
+        esac
+      fi
+      case $file_conv/,$2, in
+        *,$file_conv,*)
+          ;;
+        mingw/*)
+          file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+          ;;
+        cygwin/*)
+          file=`cygpath -m "$file" || echo "$file"`
+          ;;
+        wine/*)
+          file=`winepath -w "$file" || echo "$file"`
+          ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+        -o)
+          # configure might choose to run compile as 'compile cc -o foo foo.c'.
+          eat=1
+          case $2 in
+            *.o | *.[oO][bB][jJ])
+              func_file_conv "$2"
+              set x "$@" -Fo"$file"
+              shift
+              ;;
+            *)
+              func_file_conv "$2"
+              set x "$@" -Fe"$file"
+              shift
+              ;;
+          esac
+          ;;
+        -I)
+          eat=1
+          func_file_conv "$2" mingw
+          set x "$@" -I"$file"
+          shift
+          ;;
+        -I*)
+          func_file_conv "${1#-I}" mingw
+          set x "$@" -I"$file"
+          shift
+          ;;
+        -l)
+          eat=1
+          func_cl_dashl "$2"
+          set x "$@" "$lib"
+          shift
+          ;;
+        -l*)
+          func_cl_dashl "${1#-l}"
+          set x "$@" "$lib"
+          shift
+          ;;
+        -L)
+          eat=1
+          func_cl_dashL "$2"
+          ;;
+        -L*)
+          func_cl_dashL "${1#-L}"
+          ;;
+        -static)
+          shared=false
+          ;;
+        -Wl,*)
+          arg=${1#-Wl,}
+          save_ifs="$IFS"; IFS=','
+          for flag in $arg; do
+            IFS="$save_ifs"
+            linker_opts="$linker_opts $flag"
+          done
+          IFS="$save_ifs"
+          ;;
+        -Xlinker)
+          eat=1
+          linker_opts="$linker_opts $2"
+          ;;
+        -*)
+          set x "$@" "$1"
+          shift
+          ;;
+        *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+          func_file_conv "$1"
+          set x "$@" -Tp"$file"
+          shift
+          ;;
+        *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+          func_file_conv "$1" mingw
+          set x "$@" "$file"
+          shift
+          ;;
+        *)
+          set x "$@" "$1"
+          shift
+          ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+        # configure might choose to run compile as 'compile cc -o foo foo.c'.
+        # So we strip '-o arg' only if arg is an object.
+        eat=1
+        case $2 in
+          *.o | *.obj)
+            ofile=$2
+            ;;
+          *)
+            set x "$@" -o "$2"
+            shift
+            ;;
+        esac
+        ;;
+      *.c)
+        cfile=$1
+        set x "$@" "$1"
+        shift
+        ;;
+      *)
+        set x "$@" "$1"
+        shift
+        ;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/apps/plugins/puzzles/src/config.log b/apps/plugins/puzzles/src/config.log
new file mode 100644
index 0000000000..8bf125c515
--- /dev/null
+++ b/apps/plugins/puzzles/src/config.log
@@ -0,0 +1,135 @@
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by puzzles configure 6.66, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ ./configure 
+
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = alpha
+uname -m = x86_64
+uname -r = 4.8.4-1-ARCH
+uname -s = Linux
+uname -v = #1 SMP PREEMPT Sat Oct 22 18:26:57 CEST 2016
+
+/usr/bin/uname -p = unknown
+/bin/uname -X     = unknown
+
+/bin/arch              = unknown
+/usr/bin/arch -k       = unknown
+/usr/convex/getsysinfo = unknown
+/usr/bin/hostinfo      = unknown
+/bin/machine           = unknown
+/usr/bin/oslevel       = unknown
+/bin/universe          = unknown
+
+PATH: /usr/local/sbin
+PATH: /usr/local/bin
+PATH: /usr/bin
+PATH: /opt/cuda/bin
+PATH: /usr/lib/jvm/default/bin
+PATH: /opt/kde/bin
+PATH: /usr/bin/site_perl
+PATH: /usr/bin/vendor_perl
+PATH: /usr/bin/core_perl
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+
+ac_cv_env_CC_set=
+ac_cv_env_CC_value=
+ac_cv_env_CFLAGS_set=
+ac_cv_env_CFLAGS_value=
+ac_cv_env_CPPFLAGS_set=
+ac_cv_env_CPPFLAGS_value=
+ac_cv_env_LDFLAGS_set=
+ac_cv_env_LDFLAGS_value=
+ac_cv_env_LIBS_set=
+ac_cv_env_LIBS_value=
+ac_cv_env_build_alias_set=
+ac_cv_env_build_alias_value=
+ac_cv_env_host_alias_set=
+ac_cv_env_host_alias_value=
+ac_cv_env_target_alias_set=
+ac_cv_env_target_alias_value=
+
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+
+CC=''
+CFLAGS=''
+CPPFLAGS=''
+DEFS=''
+ECHO_C=''
+ECHO_N='-n'
+ECHO_T=''
+EXEEXT=''
+INSTALL_DATA=''
+INSTALL_PROGRAM=''
+INSTALL_SCRIPT=''
+LDFLAGS=''
+LIBOBJS=''
+LIBS=''
+LTLIBOBJS=''
+OBJEXT=''
+PACKAGE_BUGREPORT='anakin@pobox.com'
+PACKAGE_NAME='puzzles'
+PACKAGE_STRING='puzzles 6.66'
+PACKAGE_TARNAME='puzzles'
+PACKAGE_URL=''
+PACKAGE_VERSION='6.66'
+PATH_SEPARATOR=':'
+RANLIB=''
+SHELL='/bin/sh'
+ac_ct_CC=''
+bindir='${exec_prefix}/bin'
+build_alias=''
+datadir='${datarootdir}'
+datarootdir='${prefix}/share'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+dvidir='${docdir}'
+exec_prefix='NONE'
+host_alias=''
+htmldir='${docdir}'
+includedir='${prefix}/include'
+infodir='${datarootdir}/info'
+libdir='${exec_prefix}/lib'
+libexecdir='${exec_prefix}/libexec'
+localedir='${datarootdir}/locale'
+localstatedir='${prefix}/var'
+mandir='${datarootdir}/man'
+oldincludedir='/usr/include'
+pdfdir='${docdir}'
+prefix='NONE'
+program_transform_name='s,x,x,'
+psdir='${docdir}'
+sbindir='${exec_prefix}/sbin'
+sharedstatedir='${prefix}/com'
+sysconfdir='${prefix}/etc'
+target_alias=''
+
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+
+/* confdefs.h */
+#define PACKAGE_NAME "puzzles"
+#define PACKAGE_TARNAME "puzzles"
+#define PACKAGE_VERSION "6.66"
+#define PACKAGE_STRING "puzzles 6.66"
+#define PACKAGE_BUGREPORT "anakin@pobox.com"
+#define PACKAGE_URL ""
+
+configure: exit 2
diff --git a/apps/plugins/puzzles/src/configure b/apps/plugins/puzzles/src/configure
new file mode 100755
index 0000000000..432ca273b3
--- /dev/null
+++ b/apps/plugins/puzzles/src/configure
@@ -0,0 +1,5739 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.69 for puzzles 6.66.
+#
+# Report bugs to <anakin@pobox.com>.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+        expr "X$arg" : "X\\(.*\\)$as_nl";
+        arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""        $as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+         /*)
+           for as_base in sh bash ksh sh5; do
+             # Try only shells that exist, to save several forks.
+             as_shell=$as_dir/$as_base
+             if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+                    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+                   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+           done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+              { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and anakin@pobox.com
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)[^/].*/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+            s//\1/
+            q
+          }
+          /^X\/\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\/\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T=' ';;     # ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T=' ';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='puzzles'
+PACKAGE_TARNAME='puzzles'
+PACKAGE_VERSION='6.66'
+PACKAGE_STRING='puzzles 6.66'
+PACKAGE_BUGREPORT='anakin@pobox.com'
+PACKAGE_URL=''
+
+ac_unique_file="midend.c"
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+RANLIB
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+GTK_LIBS
+GTK_CFLAGS
+PKG_CONFIG
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_silent_rules
+enable_dependency_tracking
+with_gtk
+enable_gtktest
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in   exec_prefix prefix bindir sbindir libexecdir datarootdir \
+                datadir sysconfdir sharedstatedir localstatedir includedir \
+                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+                libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_myself" : 'X\(//\)[^/]' \| \
+         X"$as_myself" : 'X\(//\)$' \| \
+         X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)[^/].*/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+        cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+        pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures puzzles 6.66 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/puzzles]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of puzzles 6.66:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --disable-gtktest       do not try to compile and run a test GTK+ program
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gtk=VER          specify GTK version to use (`2' or `3')
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <anakin@pobox.com>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+puzzles configure 6.66
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+         test "$cross_compiling" = yes ||
+         test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by puzzles $as_me 6.66, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+        ac_must_keep_next=false # Got value, back to normal.
+      else
+        case $ac_arg in
+          *=* | --config-cache | -C | -disable-* | --disable-* \
+          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+          | -with-* | --with-* | -without-* | --without-* | --x)
+            case "$ac_configure_args0 " in
+              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+            esac
+            ;;
+          -* ) ac_must_keep_next=true ;;
+        esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+        "s/'\''/'\''\\\\'\'''\''/g;
+          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+        eval ac_val=\$$ac_var
+        case $ac_val in
+        *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+        esac
+        $as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+        # differences in whitespace do not lead to failure.
+        ac_old_val_w=`echo x $ac_old_val`
+        ac_new_val_w=`echo x $ac_new_val`
+        if test "$ac_old_val_w" != "$ac_new_val_w"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+          ac_cache_corrupted=:
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+          eval $ac_var=\$ac_old_val
+        fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+am__api_version='1.15'
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+          if test $ac_prog = install &&
+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # AIX install.  It has an incompatible calling convention.
+            :
+          elif test $ac_prog = install &&
+            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # program-specific install script used by HP pwplus--don't use.
+            :
+          else
+            rm -rf conftest.one conftest.two conftest.dir
+            echo one > conftest.one
+            echo two > conftest.two
+            mkdir conftest.dir
+            if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+              test -s conftest.one && test -s conftest.two &&
+              test -s conftest.dir/conftest.one &&
+              test -s conftest.dir/conftest.two
+            then
+              ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+              break 3
+            fi
+          fi
+        fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \     ]*)
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+        # -L didn't work.
+        set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+        && test "$*" != "X conftest.file $srcdir/configure"; then
+
+        # If neither matched, then we have a broken ls.  This can happen
+        # if, for instance, CONFIG_SHELL is bash and it inherits a
+        # broken ls alias from the environment.  This has actually
+        # happened.  Such a system could not be considered "sane".
+        as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\     *)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\     *)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+         for ac_exec_ext in '' $ac_executable_extensions; do
+           as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+           case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+             'mkdir (GNU coreutils) '* | \
+             'mkdir (coreutils) '* | \
+             'mkdir (fileutils) '4.1*)
+               ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+               break 3;;
+           esac
+         done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+        @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+        @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='puzzles'
+ VERSION='6.66'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+        ;;
+    [ab].out )
+        # We found the default executable, but exeext='' is most
+        # certainly right.
+        break;;
+    *.* )
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+        then :; else
+           ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+        fi
+        # We set ac_cv_exeext here because the later test for it is not
+        # safe: cross compilers may not add the suffix if given an `-o'
+        # argument, so we may need to know it at that point already.
+        # Even if this section looks crufty: it has the advantage of
+        # actually working.
+        break;;
+    * )
+        break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+        cross_compiling=yes
+    else
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+         CFLAGS="-g"
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+        -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+        @echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+        continue
+      else
+        break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+
+# Check whether --with-gtk was given.
+if test "${with_gtk+set}" = set; then :
+  withval=$with_gtk; gtk_version_desired="$withval"
+else
+  gtk_version_desired="any"
+fi
+
+
+case "$gtk_version_desired" in
+  2 | 3 | any) ;;
+  yes) gtk_version_desired="any" ;;
+  *) as_fn_error $? "Invalid GTK version specified" "$LINENO" 5
+esac
+
+gtk=none
+
+case "$gtk_version_desired:$gtk" in
+  3:none | any:none)
+
+
+
+# Check whether --enable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then :
+  enableval=$enable_gtktest;
+else
+  enable_gtktest=yes
+fi
+
+  min_gtk_version=3.0.0
+
+  pkg_config_args="gtk+-3.0 >= $min_gtk_version"
+  for module in .
+  do
+      case "$module" in
+         gthread)
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  no_gtk=""
+
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+  if test x$PKG_CONFIG != xno ; then
+    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
+      :
+    else
+      echo "*** pkg-config too old; version 0.7 or better required."
+      no_gtk=yes
+      PKG_CONFIG=no
+    fi
+  else
+    no_gtk=yes
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
+$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+          echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+          enable_gtktest=no
+    fi
+
+    if $PKG_CONFIG $pkg_config_args; then
+          :
+    else
+          no_gtk=yes
+    fi
+  fi
+
+  if test x"$no_gtk" = x ; then
+    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+      rm -f conf.gtktest
+      if test "$cross_compiling" = yes; then :
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  unsigned int major, minor, micro;
+
+  fclose (fopen ("conf.gtktest", "w"));
+
+  if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    }
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+           (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n",
+               major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  no_gtk=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
+$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
+     gtk=3
+  else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://pkgconfig.sourceforge.net"
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK+ test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+int
+main ()
+{
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
+          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+          echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+else
+   echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     :
+  fi
+
+
+  rm -f conf.gtktest
+
+
+    ;;
+esac
+
+case "$gtk_version_desired:$gtk" in
+  2:none | any:none)
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+        if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+        _pkg_min_version=0.9.0
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                PKG_CONFIG=""
+        fi
+fi
+# Check whether --enable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then :
+  enableval=$enable_gtktest;
+else
+  enable_gtktest=yes
+fi
+
+
+  pkg_config_args=gtk+-2.0
+  for module in .
+  do
+      case "$module" in
+         gthread)
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  no_gtk=""
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+        if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+        _pkg_min_version=0.7
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                PKG_CONFIG=""
+        fi
+fi
+
+  min_gtk_version=2.0.0
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
+$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+          echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+          enable_gtktest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+          :
+    else
+          no_gtk=yes
+    fi
+  fi
+
+  if test x"$no_gtk" = x ; then
+    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+      rm -f conf.gtktest
+      if test "$cross_compiling" = yes; then :
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  fclose (fopen ("conf.gtktest", "w"));
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    }
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+           (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+               major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  no_gtk=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
+$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
+     gtk=2
+  else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://pkgconfig.sourceforge.net"
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK+ test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+int
+main ()
+{
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
+          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+          echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+else
+   echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     :
+  fi
+
+
+  rm -f conf.gtktest
+
+
+    ;;
+esac
+
+if test "$gtk" = "none"; then
+   as_fn_error $? "cannot build without GTK 2 or GTK 3" "$LINENO" 5
+fi
+
+if test "x$GCC" = "xyes"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable gcc warning flags" >&5
+$as_echo_n "checking for usable gcc warning flags... " >&6; }
+  gccwarningflags=
+  for flag in -Wall -Werror -std=c89 -pedantic; do
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS$gccwarningflags $flag $GTK_CFLAGS"
+    LIBS="$GTK_LIBS $LIBS"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <stdio.h>
+        #include <assert.h>
+        #include <stdlib.h>
+        #include <time.h>
+        #include <stdarg.h>
+        #include <string.h>
+        #include <errno.h>
+        #include <math.h>
+
+        #include <sys/time.h>
+        #include <sys/resource.h>
+
+        #include <gtk/gtk.h>
+        #include <gdk/gdkkeysyms.h>
+
+        #include <gdk-pixbuf/gdk-pixbuf.h>
+
+        #include <gdk/gdkx.h>
+        #include <X11/Xlib.h>
+        #include <X11/Xutil.h>
+        #include <X11/Xatom.h>
+
+int
+main ()
+{
+
+        return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gccwarningflags="$gccwarningflags $flag"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    CFLAGS="$ac_save_CFLAGS"
+    LIBS="$ac_save_LIBS"
+  done
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccwarningflags" >&5
+$as_echo "$gccwarningflags" >&6; }
+  CFLAGS="$CFLAGS$gccwarningflags"
+fi
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+
+ac_config_files="$ac_config_files Makefile"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+        "s/'/'\\\\''/g;
+          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+        cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+          mv -f confcache "$cache_file"$$ &&
+          mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+          mv -f confcache "$cache_file" ;;
+        esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[     ]*#[    ]*define[       ][      ]*\([^  (][^    (]*([^)]*)\)[   ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[     ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[      `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+        g
+        s/^\n//
+        s/\n/ /g
+        p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+        expr "X$arg" : "X\\(.*\\)$as_nl";
+        arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""        $as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+            s//\1/
+            q
+          }
+          /^X\/\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\/\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T=' ';;     # ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T=' ';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)[^/].*/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by puzzles $as_me 6.66, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to <anakin@pobox.com>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+puzzles config.status 6.66
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[  ]*VPATH[        ]*=[    ]*/{
+h
+s///
+s/^/:/
+s/[      ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[   ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[       ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+         # (if the path is not absolute).  The absolute path cannot be DOS-style,
+         # because $ac_f cannot contain `:'.
+         test -f "$ac_f" ||
+           case $ac_f in
+           [\\/$]*) false;;
+           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+           esac ||
+           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+          $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+        `' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)[^/].*/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$mf" : 'X\(//\)[^/]' \| \
+         X"$mf" : 'X\(//\)$' \| \
+         X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)[^/].*/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$file" : 'X\(//\)[^/]' \| \
+         X"$file" : 'X\(//\)$' \| \
+         X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)[^/].*/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff --git a/apps/plugins/puzzles/configure.ac b/apps/plugins/puzzles/src/configure.ac
index 3a38c95602..3a38c95602 100644
--- a/apps/plugins/puzzles/configure.ac
+++ b/apps/plugins/puzzles/src/configure.ac
diff --git a/apps/plugins/puzzles/cube.R b/apps/plugins/puzzles/src/cube.R
index 85b081ec76..85b081ec76 100644
--- a/apps/plugins/puzzles/cube.R
+++ b/apps/plugins/puzzles/src/cube.R
diff --git a/apps/plugins/puzzles/cube.c b/apps/plugins/puzzles/src/cube.c
index d0d9525130..a30dc10b3f 100644
--- a/apps/plugins/puzzles/cube.c
+++ b/apps/plugins/puzzles/src/cube.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1737,7 +1737,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Cube", "games.cube", "cube",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/cube.html b/apps/plugins/puzzles/src/cube.html
new file mode 100644
index 0000000000..0e32be600e
--- /dev/null
+++ b/apps/plugins/puzzles/src/cube.html
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Cube</title>
+<link rel="previous" href="net.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="fifteen.html">
+</head>
+<body>
+<p><a href="net.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="fifteen.html">Next</a></p>
+<h1><a name="C4"></a>Chapter 4: <a name="i0"></a>Cube</h1>
+<p>
+This is another one I originally saw as a web game. This one was a Java game <a href="#p0">[2]</a>, by Paul Scott. You have a grid of 16 squares, six of which are blue; on one square rests a cube. Your move is to use the arrow keys to roll the cube through 90 degrees so that it moves to an adjacent square. If you roll the cube on to a blue square, the blue square is picked up on one face of the cube; if you roll a blue face of the cube on to a non-blue square, the blueness is put down again. (In general, whenever you roll the cube, the two faces that come into contact swap colours.) Your job is to get all six blue squares on to the six faces of the cube at the same time. Count your moves and try to do it in as few as possible.
+</p>
+<p>
+Unlike the original Java game, my version has an additional feature: once you've mastered the game with a cube rolling on a square grid, you can change to a triangular grid and roll any of a tetrahedron, an octahedron or an icosahedron.
+</p>
+<p><a name="p0"></a>
+[2] <a href="http://www3.sympatico.ca/paulscott/cube/cube.htm"><code>http://www3.sympatico.ca/paulscott/cube/cube.htm</code></a>
+</p>
+<h2><a name="S4.1"></a>4.1 <a name="i1"></a>Cube controls</h2>
+<p>
+This game can be played with either the keyboard or the mouse.
+</p>
+<p>
+Left-clicking anywhere on the window will move the cube (or other solid) towards the mouse pointer.
+</p>
+<p>
+The arrow keys can also used to roll the cube on its square grid in the four cardinal directions. On the triangular grids, the mapping of arrow keys to directions is more approximate. Vertical movement is disallowed where it doesn't make sense. The four keys surrounding the arrow keys on the numeric keypad (&#8216;7&#8217;, &#8216;9&#8217;, &#8216;1&#8217;, &#8216;3&#8217;) can be used for diagonal movement.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S4.2"></a>4.2 <a name="i2"></a>Cube parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Type of solid</em>
+</dt>
+<dd>
+Selects the solid to roll (and hence the shape of the grid): tetrahedron, cube, octahedron, or icosahedron.
+</dd>
+<dt>
+<em>Width / top</em>, <em>Height / bottom</em>
+</dt>
+<dd>
+On a square grid, horizontal and vertical dimensions. On a triangular grid, the number of triangles on the top and bottom rows respectively.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/src/depcomp b/apps/plugins/puzzles/src/depcomp
new file mode 100755
index 0000000000..fc98710e2a
--- /dev/null
+++ b/apps/plugins/puzzles/src/depcomp
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2013-05-30.07; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='   '
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/apps/plugins/puzzles/desktop.pl b/apps/plugins/puzzles/src/desktop.pl
index 204c0ce262..204c0ce262 100755
--- a/apps/plugins/puzzles/desktop.pl
+++ b/apps/plugins/puzzles/src/desktop.pl
diff --git a/apps/plugins/puzzles/devel.but b/apps/plugins/puzzles/src/devel.but
index 9befcadcb7..a38fdda5d0 100644
--- a/apps/plugins/puzzles/devel.but
+++ b/apps/plugins/puzzles/src/devel.but
@@ -391,8 +391,9 @@ with the default values, and returns a pointer to it.
 
 \c int (*fetch_preset)(int i, char **name, game_params **params);
 
-This function is used to populate the \q{Type} menu, which provides
-a list of conveniently accessible preset parameters for most games.
+This function is one of the two APIs a back end can provide to
+populate the \q{Type} menu, which provides a list of conveniently
+accessible preset parameters for most games.
 
 The function is called with \c{i} equal to the index of the preset
 required (numbering from zero). It returns \cw{FALSE} if that preset
@@ -406,6 +407,33 @@ returns \cw{TRUE}.
 If the game does not wish to support any presets at all, this
 function is permitted to return \cw{FALSE} always.
 
+If the game wants to return presets in the form of a hierarchical menu
+instead of a flat list (and, indeed, even if it doesn't), then it may
+set this function pointer to \cw{NULL}, and instead fill in the
+alternative function pointer \cw{preset_menu}
+(\k{backend-preset-menu}).
+
+\S{backend-preset-menu} \cw{preset_menu()}
+
+\c struct preset_menu *(*preset_menu)(void);
+
+This function is the more flexible of the two APIs by which a back end
+can define a collection of preset game parameters.
+
+This function simply returns a complete menu hierarchy, in the form of
+a \c{struct preset_menu} (see \k{midend-get-presets}) and further
+submenus (if it wishes) dangling off it. There are utility functions
+described in \k{utils-presets} to make it easy for the back end to
+construct this menu.
+
+If the game has no need to return a hierarchy of menus, it may instead
+opt to implement the \cw{fetch_preset()} function (see
+\k{backend-fetch-preset}).
+
+The game need not fill in the \c{id} fields in the preset menu
+structures. The mid-end will do that after it receives the structure
+from the game, and before passing it on to the front end.
+
 \S{backend-encode-params} \cw{encode_params()}
 
 \c char *(*encode_params)(const game_params *params, int full);
@@ -2743,8 +2771,8 @@ these parameters until further notice.
 
 The usual way in which the front end will have an actual
 \c{game_params} structure to pass to this function is if it had
-previously got it from \cw{midend_fetch_preset()}
-(\k{midend-fetch-preset}). Thus, this function is usually called in
+previously got it from \cw{midend_get_presets()}
+(\k{midend-get-presets}). Thus, this function is usually called in
 response to the user making a selection from the presets menu.
 
 \H{midend-get-params} \cw{midend_get_params()}
@@ -2966,34 +2994,63 @@ One of the major purposes of timing in the mid-end is to perform
 move animation. Therefore, calling this function is very likely to
 result in calls back to the front end's drawing API.
 
-\H{midend-num-presets} \cw{midend_num_presets()}
+\H{midend-get-presets} \cw{midend_get_presets()}
 
-\c int midend_num_presets(midend *me);
+\c struct preset_menu *midend_get_presets(midend *me, int *id_limit);
 
-Returns the number of game parameter presets supplied by this game.
-Front ends should use this function and \cw{midend_fetch_preset()}
-to configure their presets menu rather than calling the back end
-directly, since the mid-end adds standard customisation facilities.
-(At the time of writing, those customisation facilities are
-implemented hackily by means of environment variables, but it's not
-impossible that they may become more full and formal in future.)
+Returns a data structure describing this game's collection of preset
+game parameters, organised into a hierarchical structure of menus and
+submenus.
 
-\H{midend-fetch-preset} \cw{midend_fetch_preset()}
+The return value is a pointer to a data structure containing the
+following fields (among others, which are not intended for front end
+use):
 
-\c void midend_fetch_preset(midend *me, int n,
-\c                          char **name, game_params **params);
+\c struct preset_menu {
+\c     int n_entries;
+\c     struct preset_menu_entry *entries;
+\c     /* and other things */
+\e     iiiiiiiiiiiiiiiiiiiiii
+\c };
 
-Returns one of the preset game parameter structures for the game. On
-input \c{n} must be a non-negative integer and less than the value
-returned from \cw{midend_num_presets()}. On output, \c{*name} is set
-to an ASCII string suitable for entering in the game's presets menu,
-and \c{*params} is set to the corresponding \c{game_params}
-structure.
+Those fields describe the intended contents of one particular menu in
+the hierarchy. \cq{entries} points to an array of \cq{n_entries}
+items, each of which is a structure containing the following fields:
+
+\c struct preset_menu_entry {
+\c     char *title;
+\c     game_params *params;
+\c     struct preset_menu *submenu;
+\c     int id;
+\c };
 
-Both of the two output values are dynamically allocated, but they
-are owned by the mid-end structure: the front end should not ever
-free them directly, because they will be freed automatically during
-\cw{midend_free()}.
+Of these fields, \cq{title} and \cq{id} are present in every entry,
+giving (respectively) the textual name of the menu item and an integer
+identifier for it. The integer id will correspond to the one returned
+by \c{midend_which_preset} (\k{midend-which-preset}), when that preset
+is the one selected.
+
+The other two fields are mutually exclusive. Each \c{struct
+preset_menu_entry} will have one of those fields \cw{NULL} and the
+other one non-null. If the menu item is an actual preset, then
+\cq{params} will point to the set of game parameters that go with the
+name; if it's a submenu, then \cq{submenu} instead will be non-null,
+and will point at a subsidiary \c{struct preset_menu}.
+
+The complete hierarchy of these structures is owned by the mid-end,
+and will be freed when the mid-end is freed. The front end should not
+attempt to free any of it.
+
+The integer identifiers will be allocated densely from 0 upwards, so
+that it's reasonable for the front end to allocate an array which uses
+them as indices, if it needs to store information per preset menu
+item. For this purpose, the front end may pass the second parameter
+\cq{id_limit} to \cw{midend_get_presets} as the address of an \c{int}
+variable, into which \cw{midend_get_presets} will write an integer one
+larger than the largest id number actually used (i.e. the number of
+elements the front end would need in the array).
+
+Submenu-type entries also have integer identifiers.
 
 \H{midend-which-preset} \cw{midend_which_preset()}
 
@@ -3005,6 +3062,10 @@ no preset matches. Front ends could use this to maintain a tick
 beside one of the items in the menu (or tick the \q{Custom} option
 if the return value is less than zero).
 
+The returned index value (if non-negative) will match the \c{id} field
+of the corresponding \cw{struct preset_menu_entry} returned by
+\c{midend_get_presets()} (\k{midend-get-presets}).
+
 \H{midend-wants-statusbar} \cw{midend_wants_statusbar()}
 
 \c int midend_wants_statusbar(midend *me);
@@ -3535,6 +3596,63 @@ single element (typically measured using \c{sizeof}). \c{rs} is a
 \c{random_state} used to generate all the random numbers for the
 shuffling process.
 
+\H{utils-presets} Presets menu management
+
+The function \c{midend_get_presets()} (\k{midend-get-presets}) returns
+a data structure describing a menu hierarchy. Back ends can also
+choose to provide such a structure to the mid-end, if they want to
+group their presets hierarchically. To make this easy, there are a few
+utility functions to construct preset menu structures, and also one
+intended for front-end use.
+
+\S{utils-preset-menu-new} \cw{preset_menu_new()}
+
+\c struct preset_menu *preset_menu_new(void);
+
+Allocates a new \c{struct preset_menu}, and initialises it to hold no
+menu items.
+
+\S{utils-preset-menu-add_submenu} \cw{preset_menu_add_submenu()}
+
+\c struct preset_menu *preset_menu_add_submenu
+\c     (struct preset_menu *parent, char *title);
+
+Adds a new submenu to the end of an existing preset menu, and returns
+a pointer to a newly allocated \c{struct preset_menu} describing the
+submenu.
+
+The string parameter \cq{title} must be dynamically allocated by the
+caller. The preset-menu structure will take ownership of it, so the
+caller must not free it.
+
+\S{utils-preset-menu-add-preset} \cw{preset_menu_add_preset()}
+
+\c void preset_menu_add_preset
+\c     (struct preset_menu *menu, char *title, game_params *params);
+
+Adds a preset game configuration to the end of a preset menu.
+
+Both the string parameter \cq{title} and the game parameter structure
+\cq{params} itself must be dynamically allocated by the caller. The
+preset-menu structure will take ownership of it, so the caller must
+not free it.
+
+\S{utils-preset-menu-lookup-by-id} \cw{preset_menu_lookup_by_id()}
+
+\c game_params *preset_menu_lookup_by_id
+\c     (struct preset_menu *menu, int id);
+
+Given a numeric index, searches recursively through a preset menu
+hierarchy to find the corresponding menu entry, and returns a pointer
+to its existing \c{game_params} structure.
+
+This function is intended for front end use (but front ends need not
+use it if they prefer to do things another way). If a front end finds
+it inconvenient to store anything more than a numeric index alongside
+each menu item, then this function provides an easy way for the front
+end to get back the actual game parameters corresponding to a menu
+item that the user has selected.
+
 \H{utils-alloc} Memory allocation
 
 Puzzles has some central wrappers on the standard memory allocation
diff --git a/apps/plugins/puzzles/divvy.c b/apps/plugins/puzzles/src/divvy.c
index dfd409c9e0..517e3ddbb0 100644
--- a/apps/plugins/puzzles/divvy.c
+++ b/apps/plugins/puzzles/src/divvy.c
@@ -185,7 +185,7 @@
  * think of.
  */
 
-#include "rbassert.h"
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/apps/plugins/puzzles/src/docindex.html b/apps/plugins/puzzles/src/docindex.html
new file mode 100644
index 0000000000..8ed483bbe1
--- /dev/null
+++ b/apps/plugins/puzzles/src/docindex.html
@@ -0,0 +1,217 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title></title>
+<link rel="previous" href="licence.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+</head>
+<body>
+<p><a href="licence.html">Previous</a> | <a href="index.html">Contents</a> | Index | Next</p>
+<h1><a name="Index"></a>Index</h1><p>
+Black Box: <a href="blackbox.html#i0">Chapter 19</a><br>
+Bridges: <a href="bridges.html#i0">Chapter 26</a><br>
+bugs: <a href="intro.html#i7">Chapter 1</a><br>
+command line: <a href="common.html#i23">Section 2.2</a>, <a href="common.html#i32">Section 2.4</a>, <a href="common.html#i36">Section 2.5</a><br>
+common features: <a href="common.html#i0">Chapter 2</a><br>
+controls: <a href="common.html#i1">Section 2.1</a><br>
+controls, for Black Box: <a href="blackbox.html#i1">Section 19.1</a><br>
+controls, for Bridges: <a href="bridges.html#i2">Section 26.1</a><br>
+controls, for Cube: <a href="cube.html#i1">Section 4.1</a><br>
+controls, for Dominosa: <a href="dominosa.html#i1">Section 17.1</a><br>
+controls, for Fifteen: <a href="fifteen.html#i2">Section 5.1</a><br>
+controls, for Filling: <a href="filling.html#i2">Section 29.1</a><br>
+controls, for Flip: <a href="flip.html#i1">Section 14.1</a><br>
+controls, for Flood: <a href="flood.html#i1">Section 39.1</a><br>
+controls, for Galaxies: <a href="galaxies.html#i2">Section 28.1</a><br>
+controls, for Guess: <a href="guess.html#i2">Section 15.1</a><br>
+controls, for Inertia: <a href="inertia.html#i1">Section 24.1</a><br>
+controls, for Keen: <a href="keen.html#i2">Section 30.1</a><br>
+controls, for Light Up: <a href="lightup.html#i2">Section 21.1</a><br>
+controls, for Loopy: <a href="loopy.html#i2">Section 23.1</a><br>
+controls, for Magnets: <a href="magnets.html#i2">Section 33.1</a><br>
+controls, for Map: <a href="map.html#i2">Section 22.1</a><br>
+controls, for Mines: <a href="mines.html#i1">Section 12.1</a><br>
+controls, for Net: <a href="net.html#i5">Section 3.1</a><br>
+controls, for Netslide: <a href="netslide.html#i1">Chapter 9</a><br>
+controls, for Palisade: <a href="palisade.html#i2">Section 41.1</a><br>
+controls, for Pattern: <a href="pattern.html#i2">Section 10.1</a><br>
+controls, for Pearl: <a href="pearl.html#i2">Section 36.1</a><br>
+controls, for Pegs: <a href="pegs.html#i2">Section 16.1</a><br>
+controls, for Range: <a href="range.html#i2">Section 35.1</a><br>
+controls, for Rectangles: <a href="rect.html#i3">Section 8.1</a><br>
+controls, for Same Game: <a href="samegame.html#i1">Section 13.1</a><br>
+controls, for Signpost: <a href="signpost.html#i2">Section 34.1</a><br>
+controls, for Singles: <a href="singles.html#i3">Section 32.1</a><br>
+controls, for Sixteen: <a href="sixteen.html#i1">Section 6.1</a><br>
+controls, for Slant: <a href="slant.html#i2">Section 20.1</a><br>
+controls, for Solo: <a href="solo.html#i2">Section 11.1</a><br>
+controls, for Tents: <a href="tents.html#i1">Section 25.1</a><br>
+controls, for Towers: <a href="towers.html#i2">Section 31.1</a><br>
+controls, for Tracks: <a href="tracks.html#i1">Section 40.1</a><br>
+controls, for Twiddle: <a href="twiddle.html#i1">Section 7.1</a><br>
+controls, for Undead: <a href="undead.html#i1">Section 37.1</a><br>
+controls, for Unequal: <a href="unequal.html#i3">Section 27.1</a><br>
+controls, for Unruly: <a href="unruly.html#i1">Section 38.1</a><br>
+controls, for Untangle: <a href="untangle.html#i2">Section 18.1</a><br>
+copy: <a href="common.html#i14">Section 2.1</a><br>
+copyright: <a href="licence.html#i2">Appendix A</a><br>
+Cube: <a href="cube.html#i0">Chapter 4</a><br>
+&#8216;Custom&#8217;, menu option: <a href="common.html#i30">Section 2.3</a><br>
+default parameters, specifying: <a href="common.html#i34">Section 2.4</a><br>
+Dominosa: <a href="dominosa.html#i0">Chapter 17</a><br>
+Edit menu: <a href="common.html#i6">Section 2.1</a><br>
+exit: <a href="common.html#i16">Section 2.1</a><br>
+feedback: <a href="intro.html#i6">Chapter 1</a><br>
+Fifteen: <a href="fifteen.html#i0">Chapter 5</a><br>
+File menu: <a href="common.html#i5">Section 2.1</a><br>
+Filling: <a href="filling.html#i0">Chapter 29</a><br>
+Flip: <a href="flip.html#i0">Chapter 14</a><br>
+Flood: <a href="flood.html#i0">Chapter 39</a><br>
+format, ID: <a href="common.html#i26">Section 2.2</a><br>
+four-colouring: <a href="map.html#i1">Chapter 22</a><br>
+FreeNet: <a href="net.html#i3">Chapter 3</a><br>
+Futoshiki: <a href="unequal.html#i2">Chapter 27</a><br>
+Galaxies: <a href="galaxies.html#i0">Chapter 28</a><br>
+game ID: <a href="common.html#i18">Section 2.2</a><br>
+game ID, format: <a href="common.html#i26">Section 2.2</a><br>
+game ID, generating: <a href="common.html#i39">Section 2.5</a><br>
+Game menu: <a href="common.html#i2">Section 2.1</a>, <a href="common.html#i21">Section 2.2</a><br>
+generating game IDs: <a href="common.html#i39">Section 2.5</a><br>
+Guess: <a href="guess.html#i0">Chapter 15</a><br>
+Hitori: <a href="singles.html#i2">Chapter 32</a><br>
+ID format: <a href="common.html#i26">Section 2.2</a><br>
+ID, game: <a href="common.html#i18">Section 2.2</a><br>
+Inertia: <a href="inertia.html#i0">Chapter 24</a><br>
+initial state: <a href="common.html#i24">Section 2.2</a><br>
+Janko: <a href="magnets.html#i1">Chapter 33</a>, <a href="signpost.html#i1">Chapter 34</a><br>
+Keen: <a href="keen.html#i0">Chapter 30</a><br>
+KenKen: <a href="keen.html#i1">Chapter 30</a><br>
+keys: <a href="common.html#i3">Section 2.1</a><br>
+keys, for Black Box: <a href="blackbox.html#i1">Section 19.1</a><br>
+keys, for Cube: <a href="cube.html#i1">Section 4.1</a><br>
+keys, for Fifteen: <a href="fifteen.html#i2">Section 5.1</a><br>
+keys, for Flip: <a href="flip.html#i1">Section 14.1</a><br>
+keys, for Guess: <a href="guess.html#i2">Section 15.1</a><br>
+keys, for Inertia: <a href="inertia.html#i1">Section 24.1</a><br>
+keys, for Net: <a href="net.html#i5">Section 3.1</a><br>
+keys, for Same Game: <a href="samegame.html#i1">Section 13.1</a><br>
+Latin square: <a href="unequal.html#i1">Chapter 27</a><br>
+licence: <a href="licence.html#i1">Appendix A</a><br>
+licence, MIT: <a href="intro.html#i3">Chapter 1</a>, <a href="licence.html#i0">Appendix A</a><br>
+Light Up: <a href="lightup.html#i0">Chapter 21</a><br>
+Linux: <a href="intro.html#i0">Chapter 1</a>, <a href="common.html#i35">Section 2.5</a><br>
+load: <a href="common.html#i9">Section 2.1</a>, <a href="common.html#i38">Section 2.5</a><br>
+Loopy: <a href="loopy.html#i0">Chapter 23</a><br>
+Mac OS X: <a href="intro.html#i2">Chapter 1</a>, <a href="common.html#i4">Section 2.1</a>, <a href="common.html#i22">Section 2.2</a>, <a href="common.html#i33">Section 2.4</a><br>
+Magnets: <a href="magnets.html#i0">Chapter 33</a><br>
+Map: <a href="map.html#i0">Chapter 22</a><br>
+Mastermind: <a href="guess.html#i1">Chapter 15</a><br>
+Mines: <a href="mines.html#i0">Chapter 12</a><br>
+MIT licence: <a href="intro.html#i3">Chapter 1</a>, <a href="licence.html#i0">Appendix A</a><br>
+Net: <a href="net.html#i0">Chapter 3</a><br>
+<code>NETGAME.EXE</code>: <a href="net.html#i2">Chapter 3</a><br>
+Netslide: <a href="netslide.html#i0">Chapter 9</a><br>
+NetWalk: <a href="net.html#i4">Chapter 3</a><br>
+new game: <a href="common.html#i7">Section 2.1</a><br>
+Nikoli: <a href="rect.html#i1">Chapter 8</a>, <a href="solo.html#i1">Chapter 11</a>, <a href="slant.html#i1">Chapter 20</a>, <a href="lightup.html#i1">Chapter 21</a>, <a href="loopy.html#i1">Chapter 23</a>, <a href="bridges.html#i1">Chapter 26</a>, <a href="galaxies.html#i1">Chapter 28</a>, <a href="filling.html#i1">Chapter 29</a>, <a href="singles.html#i1">Chapter 32</a>, <a href="range.html#i1">Chapter 35</a>, <a href="pearl.html#i1">Chapter 36</a>, <a href="palisade.html#i1">Chapter 41</a><br>
+nonograms: <a href="pattern.html#i1">Chapter 10</a><br>
+Palisade: <a href="palisade.html#i0">Chapter 41</a><br>
+parameters: <a href="common.html#i27">Section 2.2</a>, <a href="common.html#i31">Section 2.3</a><br>
+parameters, for Black Box: <a href="blackbox.html#i2">Section 19.2</a><br>
+parameters, for Bridges: <a href="bridges.html#i3">Section 26.2</a><br>
+parameters, for Cube: <a href="cube.html#i2">Section 4.2</a><br>
+parameters, for Dominosa: <a href="dominosa.html#i2">Section 17.2</a><br>
+parameters, for Fifteen: <a href="fifteen.html#i3">Section 5.2</a><br>
+parameters, for Filling: <a href="filling.html#i3">Section 29.2</a><br>
+parameters, for flip: <a href="flip.html#i2">Section 14.2</a><br>
+parameters, for Flood: <a href="flood.html#i2">Section 39.2</a><br>
+parameters, for Galaxies: <a href="galaxies.html#i3">Section 28.2</a><br>
+parameters, for Guess: <a href="guess.html#i3">Section 15.2</a><br>
+parameters, for Inertia: <a href="inertia.html#i2">Section 24.2</a><br>
+parameters, for Keen: <a href="keen.html#i3">Section 30.2</a><br>
+parameters, for Light Up: <a href="lightup.html#i3">Section 21.2</a><br>
+parameters, for Loopy: <a href="loopy.html#i3">Section 23.2</a><br>
+parameters, for Magnets: <a href="magnets.html#i3">Section 33.2</a><br>
+parameters, for Map: <a href="map.html#i3">Section 22.2</a><br>
+parameters, for Mines: <a href="mines.html#i2">Section 12.2</a><br>
+parameters, for Net: <a href="net.html#i6">Section 3.2</a><br>
+parameters, for Netslide: <a href="netslide.html#i2">Chapter 9</a><br>
+parameters, for Palisade: <a href="palisade.html#i3">Section 41.2</a><br>
+parameters, for Pattern: <a href="pattern.html#i3">Section 10.2</a><br>
+parameters, for Pearl: <a href="pearl.html#i3">Section 36.2</a><br>
+parameters, for Pegs: <a href="pegs.html#i3">Section 16.2</a><br>
+parameters, for Range: <a href="range.html#i3">Section 35.2</a><br>
+parameters, for Rectangles: <a href="rect.html#i4">Section 8.2</a><br>
+parameters, for Same Game: <a href="samegame.html#i2">Section 13.2</a><br>
+parameters, for Signpost: <a href="signpost.html#i3">Section 34.2</a><br>
+parameters, for Singles: <a href="singles.html#i4">Section 32.2</a><br>
+parameters, for Sixteen: <a href="sixteen.html#i2">Section 6.2</a><br>
+parameters, for Slant: <a href="slant.html#i3">Section 20.2</a><br>
+parameters, for Solo: <a href="solo.html#i3">Section 11.2</a><br>
+parameters, for Tents: <a href="tents.html#i2">Section 25.2</a><br>
+parameters, for Towers: <a href="towers.html#i3">Section 31.2</a><br>
+parameters, for Tracks: <a href="tracks.html#i2">Section 40.2</a><br>
+parameters, for Twiddle: <a href="twiddle.html#i2">Section 7.2</a><br>
+parameters, for Undead: <a href="undead.html#i2">Section 37.2</a><br>
+parameters, for Unequal: <a href="unequal.html#i4">Section 27.2</a><br>
+parameters, for Unruly: <a href="unruly.html#i2">Section 38.2</a><br>
+parameters, for Untangle: <a href="untangle.html#i3">Section 18.2</a><br>
+patches: <a href="intro.html#i8">Chapter 1</a><br>
+Pattern: <a href="pattern.html#i0">Chapter 10</a><br>
+Pearl: <a href="pearl.html#i0">Chapter 36</a><br>
+Pegs: <a href="pegs.html#i0">Chapter 16</a><br>
+Planarity: <a href="untangle.html#i1">Chapter 18</a><br>
+PostScript: <a href="common.html#i41">Section 2.5</a><br>
+preferences, specifying default: <a href="common.html#i34">Section 2.4</a><br>
+preset: <a href="common.html#i29">Section 2.3</a><br>
+printing, on Unix: <a href="common.html#i40">Section 2.5</a><br>
+printing, on Windows: <a href="common.html#i11">Section 2.1</a><br>
+15-puzzle: <a href="fifteen.html#i1">Chapter 5</a><br>
+Puzzle Palace: <a href="rect.html#i2">Chapter 8</a><br>
+quit: <a href="common.html#i17">Section 2.1</a><br>
+Random Seed: <a href="common.html#i20">Section 2.2</a><br>
+Range: <a href="range.html#i0">Chapter 35</a><br>
+Rectangles: <a href="rect.html#i0">Chapter 8</a><br>
+redo: <a href="common.html#i13">Section 2.1</a><br>
+restart game: <a href="common.html#i8">Section 2.1</a><br>
+Same Game: <a href="samegame.html#i0">Chapter 13</a><br>
+save: <a href="common.html#i10">Section 2.1</a>, <a href="common.html#i37">Section 2.5</a><br>
+shortcuts (keyboard): <a href="common.html#i3">Section 2.1</a><br>
+shortcuts (keyboard), for Black Box: <a href="blackbox.html#i1">Section 19.1</a><br>
+shortcuts (keyboard), for Cube: <a href="cube.html#i1">Section 4.1</a><br>
+shortcuts (keyboard), for Fifteen: <a href="fifteen.html#i2">Section 5.1</a><br>
+shortcuts (keyboard), for Flip: <a href="flip.html#i1">Section 14.1</a><br>
+shortcuts (keyboard), for Guess: <a href="guess.html#i2">Section 15.1</a><br>
+shortcuts (keyboard), for Inertia: <a href="inertia.html#i1">Section 24.1</a><br>
+shortcuts (keyboard), for Net: <a href="net.html#i5">Section 3.1</a><br>
+shortcuts (keyboard), for Same Game: <a href="samegame.html#i1">Section 13.1</a><br>
+Signpost: <a href="signpost.html#i0">Chapter 34</a><br>
+Singles: <a href="singles.html#i0">Chapter 32</a><br>
+Sixteen: <a href="sixteen.html#i0">Chapter 6</a><br>
+Skyscrapers: <a href="towers.html#i1">Chapter 31</a><br>
+Slant: <a href="slant.html#i0">Chapter 20</a><br>
+Solitaire, Peg: <a href="pegs.html#i1">Chapter 16</a><br>
+Solo: <a href="solo.html#i0">Chapter 11</a><br>
+solve: <a href="common.html#i15">Section 2.1</a><br>
+source code: <a href="intro.html#i4">Chapter 1</a><br>
+&#8216;Specific&#8217;, menu option: <a href="common.html#i19">Section 2.2</a><br>
+state, initial: <a href="common.html#i24">Section 2.2</a><br>
+Tents: <a href="tents.html#i0">Chapter 25</a><br>
+Towers: <a href="towers.html#i0">Chapter 31</a><br>
+Tracks: <a href="tracks.html#i0">Chapter 40</a><br>
+Twiddle: <a href="twiddle.html#i0">Chapter 7</a><br>
+Type menu: <a href="common.html#i28">Section 2.3</a><br>
+Undead: <a href="undead.html#i0">Chapter 37</a><br>
+undo: <a href="common.html#i12">Section 2.1</a><br>
+Unequal: <a href="unequal.html#i0">Chapter 27</a><br>
+Unix: <a href="intro.html#i0">Chapter 1</a>, <a href="common.html#i35">Section 2.5</a><br>
+Unruly: <a href="unruly.html#i0">Chapter 38</a><br>
+Untangle: <a href="untangle.html#i0">Chapter 18</a><br>
+version: <a href="common.html#i25">Section 2.2</a><br>
+website: <a href="intro.html#i5">Chapter 1</a><br>
+Windows: <a href="intro.html#i1">Chapter 1</a>, <a href="net.html#i1">Chapter 3</a></p>
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/dominosa.R b/apps/plugins/puzzles/src/dominosa.R
index 99218366e6..99218366e6 100644
--- a/apps/plugins/puzzles/dominosa.R
+++ b/apps/plugins/puzzles/src/dominosa.R
diff --git a/apps/plugins/puzzles/dominosa.c b/apps/plugins/puzzles/src/dominosa.c
index a2dd69ba86..c86ba19dfa 100644
--- a/apps/plugins/puzzles/dominosa.c
+++ b/apps/plugins/puzzles/src/dominosa.c
@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1709,7 +1709,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Dominosa", "games.dominosa", "dominosa",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/dominosa.html b/apps/plugins/puzzles/src/dominosa.html
new file mode 100644
index 0000000000..67659571ea
--- /dev/null
+++ b/apps/plugins/puzzles/src/dominosa.html
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Dominosa</title>
+<link rel="previous" href="pegs.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="untangle.html">
+</head>
+<body>
+<p><a href="pegs.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="untangle.html">Next</a></p>
+<h1><a name="C17"></a>Chapter 17: <a name="i0"></a>Dominosa</h1>
+<p>
+A normal set of dominoes &#8211; that is, one instance of every (unordered) pair of numbers from 0 to 6 &#8211; has been arranged irregularly into a rectangle; then the number in each square has been written down and the dominoes themselves removed. Your task is to reconstruct the pattern by arranging the set of dominoes to match the provided array of numbers.
+</p>
+<p>
+This puzzle is widely credited to O. S. Adler, and takes part of its name from those initials.
+</p>
+<h2><a name="S17.1"></a>17.1 <a name="i1"></a>Dominosa controls</h2>
+<p>
+Left-clicking between any two adjacent numbers places a domino covering them, or removes one if it is already present. Trying to place a domino which overlaps existing dominoes will remove the ones it overlaps.
+</p>
+<p>
+Right-clicking between two adjacent numbers draws a line between them, which you can use to remind yourself that you know those two numbers are <em>not</em> covered by a single domino. Right-clicking again removes the line.
+</p>
+<p>
+You can also use the cursor keys to move a cursor around the grid. When the cursor is half way between two adjacent numbers, pressing the return key will place a domino covering those numbers, or pressing the space bar will lay a line between the two squares. Repeating either action removes the domino or line.
+</p>
+<p>
+Pressing a number key will highlight all occurrences of that number. Pressing that number again will clear the highlighting. Up to two different numbers can be highlighted at any given time.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S17.2"></a>17.2 <a name="i2"></a>Dominosa parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Maximum number on dominoes</em>
+</dt>
+<dd>
+Controls the size of the puzzle, by controlling the size of the set of dominoes used to make it. Dominoes with numbers going up to N will give rise to an (N+2) &#215; (N+1) rectangle; so, in particular, the default value of 6 gives an 8&#215;7 grid.
+</dd>
+<dt>
+<em>Ensure unique solution</em>
+</dt>
+<dd>
+Normally, Dominosa will make sure that the puzzles it presents have only one solution. Puzzles with ambiguous sections can be more difficult and sometimes more subtle, so if you like you can turn off this feature. Also, finding <em>all</em> the possible solutions can be an additional challenge for an advanced player. Turning off this option can also speed up puzzle generation.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/drawing.c b/apps/plugins/puzzles/src/drawing.c
index 8bf58d5530..7f4a6cf674 100644
--- a/apps/plugins/puzzles/drawing.c
+++ b/apps/plugins/puzzles/src/drawing.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <math.h>
 
 #include "puzzles.h"
diff --git a/apps/plugins/puzzles/dsf.c b/apps/plugins/puzzles/src/dsf.c
index 1a2fa8c4be..aa22392661 100644
--- a/apps/plugins/puzzles/dsf.c
+++ b/apps/plugins/puzzles/src/dsf.c
@@ -4,7 +4,7 @@
  * worry about avoiding closed loops.
  */
 
-#include "rbassert.h"
+#include <assert.h>
 #include <string.h>
 
 #include "puzzles.h"
diff --git a/apps/plugins/puzzles/emcc.c b/apps/plugins/puzzles/src/emcc.c
index 5ffcb0b793..ca033cbd47 100644
--- a/apps/plugins/puzzles/emcc.c
+++ b/apps/plugins/puzzles/src/emcc.c
@@ -47,7 +47,7 @@
  *    that using whatever they normally use to print PDFs!)
  */
 
-#include "rbassert.h"
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -61,7 +61,8 @@ extern void js_debug(const char *);
 extern void js_error_box(const char *message);
 extern void js_remove_type_dropdown(void);
 extern void js_remove_solve_button(void);
-extern void js_add_preset(const char *name);
+extern void js_add_preset(int menuid, const char *name, int value);
+extern int js_add_preset_submenu(int menuid, const char *name);
 extern int js_get_selected_preset(void);
 extern void js_select_preset(int n);
 extern void js_get_date_64(unsigned *p);
@@ -552,6 +553,21 @@ static game_params **presets;
 static int npresets;
 int have_presets_dropdown;
 
+void populate_js_preset_menu(int menuid, struct preset_menu *menu)
+{
+    int i;
+    for (i = 0; i < menu->n_entries; i++) {
+        struct preset_menu_entry *entry = &menu->entries[i];
+        if (entry->params) {
+            presets[entry->id] = entry->params;
+            js_add_preset(menuid, entry->title, entry->id);
+        } else {
+            int js_submenu = js_add_preset_submenu(menuid, entry->title);
+            populate_js_preset_menu(js_submenu, entry->submenu);
+        }
+    }
+}
+
 void select_appropriate_preset(void)
 {
     if (have_presets_dropdown) {
@@ -696,7 +712,7 @@ void command(int n)
                 midend_redraw(me);
                 update_undo_redo();
                 js_focus_canvas();
-                select_appropriate_preset(); /* sort out Custom/Customise */
+                select_appropriate_preset();
             }
         }
         break;
@@ -787,23 +803,16 @@ int main(int argc, char **argv)
      * Set up the game-type dropdown with presets and/or the Custom
      * option.
      */
-    npresets = midend_num_presets(me);
-    if (npresets == 0) {
-        /*
-         * This puzzle doesn't have selectable game types at all.
-         * Completely remove the drop-down list from the page.
-         */
-        js_remove_type_dropdown();
-        have_presets_dropdown = FALSE;
-    } else {
+    {
+        struct preset_menu *menu = midend_get_presets(me, &npresets);
         presets = snewn(npresets, game_params *);
-        for (i = 0; i < npresets; i++) {
-            char *name;
-            midend_fetch_preset(me, i, &name, &presets[i]);
-            js_add_preset(name);
-        }
+        for (i = 0; i < npresets; i++)
+            presets[i] = NULL;
+
+        populate_js_preset_menu(0, menu);
+
         if (thegame.can_configure)
-            js_add_preset(NULL);   /* the 'Custom' entry in the dropdown */
+            js_add_preset(0, "Custom", -1);
 
         have_presets_dropdown = TRUE;
 
diff --git a/apps/plugins/puzzles/emcclib.js b/apps/plugins/puzzles/src/emcclib.js
index 385281ad0b..cd8876e76d 100644
--- a/apps/plugins/puzzles/emcclib.js
+++ b/apps/plugins/puzzles/src/emcclib.js
@@ -45,7 +45,7 @@ mergeInto(LibraryManager.library, {
      * provides neither presets nor configurability.
      */
     js_remove_type_dropdown: function() {
-        document.getElementById("gametype").style.display = "none";
+        gametypelist.style.display = "none";
     },
 
     /*
@@ -59,58 +59,71 @@ mergeInto(LibraryManager.library, {
     },
 
     /*
-     * void js_add_preset(const char *name);
+     * void js_add_preset(int menuid, const char *name, int value);
      *
-     * Add a preset to the drop-down types menu. The provided text is
-     * the name of the preset. (The corresponding game_params stays on
-     * the C side and never comes out this far; we just pass a numeric
-     * index back to the C code when a selection is made.)
-     *
-     * The special 'Custom' preset is requested by passing NULL to
-     * this function, rather than the string "Custom", since in that
-     * case we need to do something special - see below.
-     */
-    js_add_preset: function(ptr) {
-        var name = (ptr == 0 ? "Customise..." : Pointer_stringify(ptr));
-        var value = gametypeoptions.length;
-
-        var option = document.createElement("option");
-        option.value = value;
-        option.appendChild(document.createTextNode(name));
-        gametypeselector.appendChild(option);
-        gametypeoptions.push(option);
-
-        if (ptr == 0) {
-            // The option we've just created is the one for inventing
-            // a new custom setup.
-            gametypenewcustom = option;
-            option.value = -1;
-
-            // Now create another element called 'Custom', which will
-            // be auto-selected by us to indicate the custom settings
-            // you've previously selected. However, we don't add it to
-            // the game type selector; it will only appear when the
-            // user actually has custom settings selected.
-            option = document.createElement("option");
-            option.value = -2;
-            option.appendChild(document.createTextNode("Custom"));
-            gametypethiscustom = option;
+     * Add a preset to the drop-down types menu, or to a submenu of
+     * it. 'menuid' specifies an index into our array of submenus
+     * where the item might be placed; 'value' specifies the number
+     * that js_get_selected_preset() will return when this item is
+     * clicked.
+     */
+    js_add_preset: function(menuid, ptr, value) {
+        var name = Pointer_stringify(ptr);
+        var item = document.createElement("li");
+        item.setAttribute("data-index", value);
+        var tick = document.createElement("span");
+        tick.appendChild(document.createTextNode("\u2713"));
+        tick.style.color = "transparent";
+        tick.style.paddingRight = "0.5em";
+        item.appendChild(tick);
+        item.appendChild(document.createTextNode(name));
+        gametypesubmenus[menuid].appendChild(item);
+        gametypeitems.push(item);
+
+        item.onclick = function(event) {
+            if (dlg_dimmer === null) {
+                gametypeselectedindex = value;
+                command(2);
+            }
         }
     },
 
     /*
+     * int js_add_preset_submenu(int menuid, const char *name);
+     *
+     * Add a submenu in the presets menu hierarchy. Returns its index,
+     * for passing as the 'menuid' argument in further calls to
+     * js_add_preset or this function.
+     */
+    js_add_preset_submenu: function(menuid, ptr, value) {
+        var name = Pointer_stringify(ptr);
+        var item = document.createElement("li");
+        // We still create a transparent tick element, even though it
+        // won't ever be selected, to make submenu titles line up
+        // nicely with their neighbours.
+        var tick = document.createElement("span");
+        tick.appendChild(document.createTextNode("\u2713"));
+        tick.style.color = "transparent";
+        tick.style.paddingRight = "0.5em";
+        item.appendChild(tick);
+        item.appendChild(document.createTextNode(name));
+        var submenu = document.createElement("ul");
+        submenu.className = "left";
+        item.appendChild(submenu);
+        gametypesubmenus[menuid].appendChild(item);
+        var toret = gametypesubmenus.length;
+        gametypesubmenus.push(submenu);
+        return toret;
+    },
+
+    /*
      * int js_get_selected_preset(void);
      *
      * Return the index of the currently selected value in the type
      * dropdown.
      */
     js_get_selected_preset: function() {
-        for (var i in gametypeoptions) {
-            if (gametypeoptions[i].selected) {
-                return gametypeoptions[i].value;
-            }
-        }
-        return 0;
+        return gametypeselectedindex;
     },
 
     /*
@@ -121,33 +134,15 @@ mergeInto(LibraryManager.library, {
      * which turn out to exactly match a preset).
      */
     js_select_preset: function(n) {
-        if (gametypethiscustom !== null) {
-            // Fiddle with the Custom/Customise options. If we're
-            // about to select the Custom option, then it should be in
-            // the menu, and the other one should read "Re-customise";
-            // if we're about to select another one, then the static
-            // Custom option should disappear and the other one should
-            // read "Customise".
-
-            if (gametypethiscustom.parentNode == gametypeselector)
-                gametypeselector.removeChild(gametypethiscustom);
-            if (gametypenewcustom.parentNode == gametypeselector)
-                gametypeselector.removeChild(gametypenewcustom);
-
-            if (n < 0) {
-                gametypeselector.appendChild(gametypethiscustom);
-                gametypenewcustom.lastChild.data = "Re-customise...";
+        gametypeselectedindex = n;
+        for (var i in gametypeitems) {
+            var item = gametypeitems[i];
+            var tick = item.firstChild;
+            if (item.getAttribute("data-index") == n) {
+                tick.style.color = "inherit";
             } else {
-                gametypenewcustom.lastChild.data = "Customise...";
+                tick.style.color = "transparent";
             }
-            gametypeselector.appendChild(gametypenewcustom);
-            gametypenewcustom.selected = false;
-        }
-
-        if (n < 0) {
-            gametypethiscustom.selected = true;
-        } else {
-            gametypeoptions[n].selected = true;
         }
     },
 
@@ -192,8 +187,8 @@ mergeInto(LibraryManager.library, {
      * after a move.
      */
     js_enable_undo_redo: function(undo, redo) {
-        undo_button.disabled = (undo == 0);
-        redo_button.disabled = (redo == 0);
+        disable_menu_item(undo_button, (undo == 0));
+        disable_menu_item(redo_button, (redo == 0));
     },
 
     /*
diff --git a/apps/plugins/puzzles/emccpre.js b/apps/plugins/puzzles/src/emccpre.js
index ebf67d1fc6..d715858883 100644
--- a/apps/plugins/puzzles/emccpre.js
+++ b/apps/plugins/puzzles/src/emccpre.js
@@ -79,22 +79,12 @@ var dlg_return_funcs = null;
 // pass back the final value in each dialog control.
 var dlg_return_sval, dlg_return_ival;
 
-// The <select> object implementing the game-type drop-down, and a
-// list of the <option> objects inside it. Used by js_add_preset(),
+// The <ul> object implementing the game-type drop-down, and a list of
+// the <li> objects inside it. Used by js_add_preset(),
 // js_get_selected_preset() and js_select_preset().
-//
-// gametypethiscustom is an option which indicates some custom game
-// params you've already set up, and which will be auto-selected on
-// return from the customisation dialog; gametypenewcustom is an
-// option which you select to indicate that you want to bring up the
-// customisation dialog and select a new configuration. Ideally I'd do
-// this with just one option serving both purposes, but instead we
-// have to do this a bit oddly because browsers don't send 'onchange'
-// events for a select element if you reselect the same one - so if
-// you've picked a custom setup and now want to change it, you need a
-// way to specify that.
-var gametypeselector = null, gametypeoptions = [];
-var gametypethiscustom = null, gametypehiddencustom = null;
+var gametypelist = null, gametypeitems = [];
+var gametypeselectedindex = null;
+var gametypesubmenus = [];
 
 // The two anchors used to give permalinks to the current puzzle. Used
 // by js_update_permalinks().
@@ -131,6 +121,14 @@ function relative_mouse_coords(event, element) {
             y: event.pageY - ecoords.y};
 }
 
+// Enable and disable items in the CSS menus.
+function disable_menu_item(item, disabledFlag) {
+    if (disabledFlag)
+        item.className = "disabled";
+    else
+        item.className = "";
+}
+
 // Init function called from body.onload.
 function initPuzzle() {
     // Construct the off-screen canvas used for double buffering.
@@ -232,11 +230,8 @@ function initPuzzle() {
             command(9);
     };
 
-    gametypeselector = document.getElementById("gametype");
-    gametypeselector.onchange = function(event) {
-        if (dlg_dimmer === null)
-            command(2);
-    };
+    gametypelist = document.getElementById("gametype");
+    gametypesubmenus.push(gametypelist);
 
     // In IE, the canvas doesn't automatically gain focus on a mouse
     // click, so make sure it does
diff --git a/apps/plugins/puzzles/emccx.json b/apps/plugins/puzzles/src/emccx.json
index e03f7e25c7..e03f7e25c7 100644
--- a/apps/plugins/puzzles/emccx.json
+++ b/apps/plugins/puzzles/src/emccx.json
diff --git a/apps/plugins/puzzles/fifteen.R b/apps/plugins/puzzles/src/fifteen.R
index b2292acc69..b2292acc69 100644
--- a/apps/plugins/puzzles/fifteen.R
+++ b/apps/plugins/puzzles/src/fifteen.R
diff --git a/apps/plugins/puzzles/fifteen.c b/apps/plugins/puzzles/src/fifteen.c
index 0d5e7f5b0c..aee89071ca 100644
--- a/apps/plugins/puzzles/fifteen.c
+++ b/apps/plugins/puzzles/src/fifteen.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1089,7 +1089,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Fifteen", "games.fifteen", "fifteen",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/fifteen.html b/apps/plugins/puzzles/src/fifteen.html
new file mode 100644
index 0000000000..05d3661dad
--- /dev/null
+++ b/apps/plugins/puzzles/src/fifteen.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Fifteen</title>
+<link rel="previous" href="cube.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="sixteen.html">
+</head>
+<body>
+<p><a href="cube.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="sixteen.html">Next</a></p>
+<h1><a name="C5"></a>Chapter 5: <a name="i0"></a>Fifteen</h1>
+<p>
+The old ones are the best: this is the good old &#8216;<a name="i1"></a>15-puzzle&#8217; with sliding tiles. You have a 4&#215;4 square grid; 15 squares contain numbered tiles, and the sixteenth is empty. Your move is to choose a tile next to the empty space, and slide it into the space. The aim is to end up with the tiles in numerical order, with the space in the bottom right (so that the top row reads 1,2,3,4 and the bottom row reads 13,14,15,<em>space</em>).
+</p>
+<h2><a name="S5.1"></a>5.1 <a name="i2"></a>Fifteen controls</h2>
+<p>
+This game can be controlled with the mouse or the keyboard.
+</p>
+<p>
+A left-click with the mouse in the row or column containing the empty space will move as many tiles as necessary to move the space to the mouse pointer.
+</p>
+<p>
+The arrow keys will move a tile adjacent to the space in the direction indicated (moving the space in the <em>opposite</em> direction).
+</p>
+<p>
+Pressing &#8216;h&#8217; will make a suggested move. Pressing &#8216;h&#8217; enough times will solve the game, but it may scramble your progress while doing so.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S5.2"></a>5.2 <a name="i3"></a>Fifteen parameters</h2>
+<p>
+The only options available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu are <em>Width</em> and <em>Height</em>, which are self-explanatory. (Once you've changed these, it's not a &#8216;15-puzzle&#8217; any more, of course!)
+</p>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/filling.R b/apps/plugins/puzzles/src/filling.R
index cffbafaa0a..cffbafaa0a 100644
--- a/apps/plugins/puzzles/filling.R
+++ b/apps/plugins/puzzles/src/filling.R
diff --git a/apps/plugins/puzzles/filling.c b/apps/plugins/puzzles/src/filling.c
index c2dfafc7ca..d8d0c8cbb0 100644
--- a/apps/plugins/puzzles/filling.c
+++ b/apps/plugins/puzzles/src/filling.c
@@ -56,7 +56,7 @@
  *     + but the hints are independent, not linear, so... what?
  */
 
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 #include <stdarg.h>
@@ -1551,12 +1551,12 @@ static game_state *execute_move(const game_state *state, const char *move)
         int value;
         char *endptr, *delim = strchr(move, '_');
         if (!delim) goto err;
-        value = strtol(delim+1, &endptr, 10);
+        value = strtol(delim+1, &endptr, 0);
         if (*endptr || endptr == delim+1) goto err;
         if (value < 0 || value > 9) goto err;
         new_state = dup_game(state);
         while (*move) {
-            const int i = strtol(move, &endptr, 10);
+            const int i = strtol(move, &endptr, 0);
             if (endptr == move) goto err;
             if (i < 0 || i >= sz) goto err;
             new_state->board[i] = value;
@@ -2111,7 +2111,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Filling", "games.filling", "filling",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/filling.html b/apps/plugins/puzzles/src/filling.html
new file mode 100644
index 0000000000..3ccbf06e4d
--- /dev/null
+++ b/apps/plugins/puzzles/src/filling.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Filling</title>
+<link rel="previous" href="galaxies.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="keen.html">
+</head>
+<body>
+<p><a href="galaxies.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="keen.html">Next</a></p>
+<h1><a name="C29"></a>Chapter 29: <a name="i0"></a>Filling</h1>
+<p>
+You have a grid of squares, some of which contain digits, and the rest of which are empty. Your job is to fill in digits in the empty squares, in such a way that each connected region of squares all containing the same digit has an area equal to that digit.
+</p>
+<p>
+(&#8216;Connected region&#8217;, for the purposes of this game, does not count diagonally separated squares as adjacent.)
+</p>
+<p>
+For example, it follows that no square can contain a zero, and that two adjacent squares can not both contain a one. No region has an area greater than 9 (because then its area would not be a single digit).
+</p>
+<p>
+Credit for this puzzle goes to <a name="i1"></a>Nikoli <a href="#p0">[14]</a>.
+</p>
+<p>
+Filling was contributed to this collection by Jonas K&#246;lker.
+</p>
+<p><a name="p0"></a>
+[14] <a href="http://www.nikoli.co.jp/en/puzzles/fillomino.html"><code>http://www.nikoli.co.jp/en/puzzles/fillomino.html</code></a>
+</p>
+<h2><a name="S29.1"></a>29.1 <a name="i2"></a>Filling controls</h2>
+<p>
+To play Filling, simply click the mouse in any empty square and then type a digit on the keyboard to fill that square. By dragging the mouse, you can select multiple squares to fill with a single keypress. If you make a mistake, click the mouse in the incorrect square and press 0, Space, Backspace or Enter to clear it again (or use the Undo feature).
+</p>
+<p>
+You can also move around the grid with the cursor keys; typing a digit will fill the square containing the cursor with that number; typing 0 will clear it. You can also select multiple squares for numbering or clearing with the return and arrow keys, before typing a digit to fill or clear the highlighted squares (as above). The space bar adds and removes single squares to and from the selection. Backspace and escape remove all squares from the selection.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S29.2"></a>29.2 <a name="i3"></a>Filling parameters</h2>
+<p>
+Filling allows you to configure the number of rows and columns of the grid, through the &#8216;Type&#8217; menu.
+</p>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/findloop.c b/apps/plugins/puzzles/src/findloop.c
index e6b2654cad..e6b2654cad 100644
--- a/apps/plugins/puzzles/findloop.c
+++ b/apps/plugins/puzzles/src/findloop.c
diff --git a/apps/plugins/puzzles/flip.R b/apps/plugins/puzzles/src/flip.R
index 03241f015b..03241f015b 100644
--- a/apps/plugins/puzzles/flip.R
+++ b/apps/plugins/puzzles/src/flip.R
diff --git a/apps/plugins/puzzles/flip.c b/apps/plugins/puzzles/src/flip.c
index ffa6c07c94..c7126fb7d9 100644
--- a/apps/plugins/puzzles/flip.c
+++ b/apps/plugins/puzzles/src/flip.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1313,7 +1313,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Flip", "games.flip", "flip",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/flip.html b/apps/plugins/puzzles/src/flip.html
new file mode 100644
index 0000000000..52790dba6c
--- /dev/null
+++ b/apps/plugins/puzzles/src/flip.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Flip</title>
+<link rel="previous" href="samegame.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="guess.html">
+</head>
+<body>
+<p><a href="samegame.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="guess.html">Next</a></p>
+<h1><a name="C14"></a>Chapter 14: <a name="i0"></a>Flip</h1>
+<p>
+You have a grid of squares, some light and some dark. Your aim is to light all the squares up at the same time. You can choose any square and flip its state from light to dark or dark to light, but when you do so, other squares around it change state as well.
+</p>
+<p>
+Each square contains a small diagram showing which other squares change when you flip it.
+</p>
+<h2><a name="S14.1"></a>14.1 <a name="i1"></a>Flip controls</h2>
+<p>
+This game can be played with either the keyboard or the mouse.
+</p>
+<p>
+Left-click in a square to flip it and its associated squares, or use the cursor keys to choose a square and the space bar or Enter key to flip.
+</p>
+<p>
+If you use the &#8216;Solve&#8217; function on this game, it will mark some of the squares in red. If you click once in every square with a red mark, the game should be solved. (If you click in a square <em>without</em> a red mark, a red mark will appear in it to indicate that you will need to reverse that operation to reach the solution.)
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S14.2"></a>14.2 <a name="i2"></a>Flip parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>Shape type</em>
+</dt>
+<dd>
+This control determines the shape of the region which is flipped by clicking in any given square. The default setting, &#8216;Crosses&#8217;, causes every square to flip itself and its four immediate neighbours (or three or two if it's at an edge or corner). The other setting, &#8216;Random&#8217;, causes a random shape to be chosen for every square, so the game is different every time.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/flood.R b/apps/plugins/puzzles/src/flood.R
index 359bbb5dce..359bbb5dce 100644
--- a/apps/plugins/puzzles/flood.R
+++ b/apps/plugins/puzzles/src/flood.R
diff --git a/apps/plugins/puzzles/flood.c b/apps/plugins/puzzles/src/flood.c
index 69ae3067a9..1262be8175 100644
--- a/apps/plugins/puzzles/flood.c
+++ b/apps/plugins/puzzles/src/flood.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1336,7 +1336,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Flood", "games.flood", "flood",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/flood.html b/apps/plugins/puzzles/src/flood.html
new file mode 100644
index 0000000000..21beaa689b
--- /dev/null
+++ b/apps/plugins/puzzles/src/flood.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Flood</title>
+<link rel="previous" href="unruly.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="tracks.html">
+</head>
+<body>
+<p><a href="unruly.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="tracks.html">Next</a></p>
+<h1><a name="C39"></a>Chapter 39: <a name="i0"></a>Flood</h1>
+<p>
+You are given a grid of squares, coloured at random in multiple colours. In each move, you can flood-fill the top left square in a colour of your choice (i.e. every square reachable from the starting square by an orthogonally connected path of squares all the same colour will be filled in the new colour). As you do this, more and more of the grid becomes connected to the starting square.
+</p>
+<p>
+Your aim is to make the whole grid the same colour, in as few moves as possible. The game will set a limit on the number of moves, based on running its own internal solver. You win if you can make the whole grid the same colour in that many moves or fewer.
+</p>
+<p>
+I saw this game (with a fixed grid size, fixed number of colours, and fixed move limit) at http://floodit.appspot.com (no longer accessible).
+</p>
+<h2><a name="S39.1"></a>39.1 <a name="i1"></a>Flood controls</h2>
+<p>
+To play Flood, click the mouse in a square. The top left corner and everything connected to it will be flood-filled with the colour of the square you clicked. Clicking a square the same colour as the top left corner has no effect, and therefore does not count as a move.
+</p>
+<p>
+You can also use the cursor keys to move a cursor (outline black square) around the grid. Pressing the return key will fill the top left corner in the colour of the square under the cursor.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S39.2"></a>39.2 <a name="i2"></a>Flood parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of the grid, in squares.
+</dd>
+<dt>
+<em>Colours</em>
+</dt>
+<dd>
+Number of colours used to fill the grid. Must be at least 3 (with two colours there would only be one legal move at any stage, hence no choice to make at all), and at most 10.
+</dd>
+<dt>
+<em>Extra moves permitted</em>
+</dt>
+<dd>
+Controls the difficulty of the puzzle, by increasing the move limit. In each new grid, Flood will run an internal solver to generate its own solution, and then the value in this field will be added to the length of Flood's solution to generate the game's move limit. So a value of 0 requires you to be just as efficient as Flood's automated solver, and a larger value makes it easier.
+<p>
+(Note that Flood's internal solver will not necessarily find the shortest possible solution, though I believe it's pretty close. For a real challenge, set this value to 0 and then try to solve a grid in <em>strictly fewer</em> moves than the limit you're given!)
+</p>
+
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/galaxies.R b/apps/plugins/puzzles/src/galaxies.R
index 957e5dad90..957e5dad90 100644
--- a/apps/plugins/puzzles/galaxies.R
+++ b/apps/plugins/puzzles/src/galaxies.R
diff --git a/apps/plugins/puzzles/galaxies.c b/apps/plugins/puzzles/src/galaxies.c
index a18901d6e5..f4f75c629c 100644
--- a/apps/plugins/puzzles/galaxies.c
+++ b/apps/plugins/puzzles/src/galaxies.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -3633,7 +3633,7 @@ static void game_print(drawing *dr, const game_state *state, int sz)
 const struct game thegame = {
     "Galaxies", "games.galaxies", "galaxies",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/galaxies.html b/apps/plugins/puzzles/src/galaxies.html
new file mode 100644
index 0000000000..41c32c1b1e
--- /dev/null
+++ b/apps/plugins/puzzles/src/galaxies.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Galaxies</title>
+<link rel="previous" href="unequal.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="filling.html">
+</head>
+<body>
+<p><a href="unequal.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="filling.html">Next</a></p>
+<h1><a name="C28"></a>Chapter 28: <a name="i0"></a>Galaxies</h1>
+<p>
+You have a rectangular grid containing a number of dots. Your aim is to draw edges along the grid lines which divide the rectangle into regions in such a way that every region is 180&#176; rotationally symmetric, and contains exactly one dot which is located at its centre of symmetry.
+</p>
+<p>
+This puzzle was invented by <a name="i1"></a>Nikoli <a href="#p0">[13]</a>, under the name &#8216;Tentai Show&#8217;; its name is commonly translated into English as &#8216;Spiral Galaxies&#8217;.
+</p>
+<p>
+Galaxies was contributed to this collection by James Harvey.
+</p>
+<p><a name="p0"></a>
+[13] <a href="http://www.nikoli.co.jp/en/puzzles/astronomical_show.html"><code>http://www.nikoli.co.jp/en/puzzles/astronomical_show.html</code></a>
+</p>
+<h2><a name="S28.1"></a>28.1 <a name="i2"></a>Galaxies controls</h2>
+<p>
+Left-click on any grid line to draw an edge if there isn't one already, or to remove one if there is. When you create a valid region (one which is closed, contains exactly one dot, is 180&#176; symmetric about that dot, and contains no extraneous edges inside it) it will be highlighted automatically; so your aim is to have the whole grid highlighted in that way.
+</p>
+<p>
+During solving, you might know that a particular grid square belongs to a specific dot, but not be sure of where the edges go and which other squares are connected to the dot. In order to mark this so you don't forget, you can right-click on the dot and drag, which will create an arrow marker pointing at the dot. Drop that in a square of your choice and it will remind you which dot it's associated with. You can also right-click on existing arrows to pick them up and move them, or destroy them by dropping them off the edge of the grid. (Also, if you're not sure which dot an arrow is pointing at, you can pick it up and move it around to make it clearer. It will swivel constantly as you drag it, to stay pointed at its parent dot.)
+</p>
+<p>
+You can also use the cursor keys to move around the grid squares and lines. Pressing the return key when over a grid line will draw or clear its edge, as above. Pressing the return key when over a dot will pick up an arrow, to be dropped the next time the return key is pressed; this can also be used to move existing arrows around, removing them by dropping them on a dot or another arrow.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S28.2"></a>28.2 <a name="i3"></a>Galaxies parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle. More difficult puzzles require more complex deductions, and the &#8216;Unreasonable&#8217; difficulty level may require backtracking.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/src/gamedesc.txt b/apps/plugins/puzzles/src/gamedesc.txt
new file mode 100644
index 0000000000..db0d9cbd01
--- /dev/null
+++ b/apps/plugins/puzzles/src/gamedesc.txt
@@ -0,0 +1,39 @@
+blackbox:blackbox.exe:Black Box:Ball-finding puzzle:Find the hidden balls in the box by bouncing laser beams off them.
+bridges:bridges.exe:Bridges:Bridge-placing puzzle:Connect all the islands with a network of bridges.
+cube:cube.exe:Cube:Rolling cube puzzle:Pick up all the blue squares by rolling the cube over them.
+dominosa:dominosa.exe:Dominosa:Domino tiling puzzle:Tile the rectangle with a full set of dominoes.
+fifteen:fifteen.exe:Fifteen:Sliding block puzzle:Slide the tiles around to arrange them into order.
+filling:filling.exe:Filling:Polyomino puzzle:Mark every square with the area of its containing region.
+flip:flip.exe:Flip:Tile inversion puzzle:Flip groups of squares to light them all up at once.
+flood:flood.exe:Flood:Flood-filling puzzle:Turn the grid the same colour in as few flood fills as possible.
+galaxies:galaxies.exe:Galaxies:Symmetric polyomino puzzle:Divide the grid into rotationally symmetric regions each centred on a dot.
+guess:guess.exe:Guess:Combination-guessing puzzle:Guess the hidden combination of colours.
+inertia:inertia.exe:Inertia:Gem-collecting puzzle:Collect all the gems without running into any of the mines.
+keen:keen.exe:Keen:Arithmetic Latin square puzzle:Complete the latin square in accordance with the arithmetic clues.
+lightup:lightup.exe:Light Up:Light-bulb placing puzzle:Place bulbs to light up all the squares.
+loopy:loopy.exe:Loopy:Loop-drawing puzzle:Draw a single closed loop, given clues about number of adjacent edges.
+magnets:magnets.exe:Magnets:Magnet-placing puzzle:Place magnets to satisfy the clues and avoid like poles touching.
+map:map.exe:Map:Map-colouring puzzle:Colour the map so that adjacent regions are never the same colour.
+mines:mines.exe:Mines:Mine-finding puzzle:Find all the mines without treading on any of them.
+net:netgame.exe:Net:Network jigsaw puzzle:Rotate each tile to reassemble the network.
+netslide:netslide.exe:Netslide:Toroidal sliding network puzzle:Slide a row at a time to reassemble the network.
+palisade:palisade.exe:Palisade:Grid-division puzzle:Divide the grid into equal-sized areas in accordance with the clues.
+pattern:pattern.exe:Pattern:Pattern puzzle:Fill in the pattern in the grid, given only the lengths of runs of black squares.
+pearl:pearl.exe:Pearl:Loop-drawing puzzle:Draw a single closed loop, given clues about corner and straight squares.
+pegs:pegs.exe:Pegs:Peg solitaire puzzle:Jump pegs over each other to remove all but one.
+range:range.exe:Range:Visible-distance puzzle:Place black squares to limit the visible distance from each numbered cell.
+rect:rect.exe:Rectangles:Rectangles puzzle:Divide the grid into rectangles with areas equal to the numbers.
+samegame:samegame.exe:Same Game:Block-clearing puzzle:Clear the grid by removing touching groups of the same colour squares.
+signpost:signpost.exe:Signpost:Square-connecting puzzle:Connect the squares into a path following the arrows.
+singles:singles.exe:Singles:Number-removing puzzle:Black out the right set of duplicate numbers.
+sixteen:sixteen.exe:Sixteen:Toroidal sliding block puzzle:Slide a row at a time to arrange the tiles into order.
+slant:slant.exe:Slant:Maze-drawing puzzle:Draw a maze of slanting lines that matches the clues.
+solo:solo.exe:Solo:Number placement puzzle:Fill in the grid so that each row, column and square block contains one of every digit.
+tents:tents.exe:Tents:Tent-placing puzzle:Place a tent next to each tree.
+towers:towers.exe:Towers:Tower-placing Latin square puzzle:Complete the latin square of towers in accordance with the clues.
+tracks:tracks.exe:Tracks:Path-finding railway track puzzle:Fill in the railway track according to the clues.
+twiddle:twiddle.exe:Twiddle:Rotational sliding block puzzle:Rotate the tiles around themselves to arrange them into order.
+undead:undead.exe:Undead:Monster-placing puzzle:Place ghosts, vampires and zombies so that the right numbers of them can be seen in mirrors.
+unequal:unequal.exe:Unequal:Latin square puzzle:Complete the latin square in accordance with the > signs.
+unruly:unruly.exe:Unruly:Black and white grid puzzle:Fill in the black and white grid to avoid runs of three.
+untangle:untangle.exe:Untangle:Planar graph layout puzzle:Reposition the points so that the lines do not cross.
diff --git a/apps/plugins/puzzles/grid.c b/apps/plugins/puzzles/src/grid.c
index 112162d4df..4929b5c7d3 100644
--- a/apps/plugins/puzzles/grid.c
+++ b/apps/plugins/puzzles/src/grid.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 #include <float.h>
@@ -2571,6 +2571,175 @@ static grid *grid_new_greatdodecagonal(int width, int height, const char *desc)
     return g;
 }
 
+static void grid_size_greatgreatdodecagonal(int width, int height,
+                                            int *tilesize, int *xextent, int *yextent)
+{
+    int a = DODEC_A;
+    int b = DODEC_B;
+
+    *tilesize = DODEC_TILESIZE;
+    *xextent = (4*a + 4*b) * (width-1) + 2*(2*a + b) + 2*a + 2*b;
+    *yextent = (6*a + 2*b) * (height-1) + 2*(2*a + b);
+}
+
+static grid *grid_new_greatgreatdodecagonal(int width, int height, const char *desc)
+{
+    int x, y;
+    /* Vector for side of triangle - ratio is close to sqrt(3) */
+    int a = DODEC_A;
+    int b = DODEC_B;
+
+    /* Upper bounds - don't have to be exact */
+    int max_faces = 50 * width * height;
+    int max_dots = 300 * width * height;
+
+    tree234 *points;
+
+    grid *g = grid_empty();
+    g->tilesize = DODEC_TILESIZE;
+    g->faces = snewn(max_faces, grid_face);
+    g->dots = snewn(max_dots, grid_dot);
+
+    points = newtree234(grid_point_cmp_fn);
+
+    for (y = 0; y < height; y++) {
+        for (x = 0; x < width; x++) {
+            grid_dot *d;
+            /* centre of dodecagon */
+            int px = (4*a + 4*b) * x;
+            int py = (6*a + 2*b) * y;
+            if (y % 2)
+                px += 2*a + 2*b;
+
+            /* dodecagon */
+            grid_face_add_new(g, 12);
+            d = grid_get_dot(g, points, px + (  a    ), py - (2*a + b)); grid_face_set_dot(g, d, 0);
+            d = grid_get_dot(g, points, px + (  a + b), py - (  a + b)); grid_face_set_dot(g, d, 1);
+            d = grid_get_dot(g, points, px + (2*a + b), py - (  a    )); grid_face_set_dot(g, d, 2);
+            d = grid_get_dot(g, points, px + (2*a + b), py + (  a    )); grid_face_set_dot(g, d, 3);
+            d = grid_get_dot(g, points, px + (  a + b), py + (  a + b)); grid_face_set_dot(g, d, 4);
+            d = grid_get_dot(g, points, px + (  a    ), py + (2*a + b)); grid_face_set_dot(g, d, 5);
+            d = grid_get_dot(g, points, px - (  a    ), py + (2*a + b)); grid_face_set_dot(g, d, 6);
+            d = grid_get_dot(g, points, px - (  a + b), py + (  a + b)); grid_face_set_dot(g, d, 7);
+            d = grid_get_dot(g, points, px - (2*a + b), py + (  a    )); grid_face_set_dot(g, d, 8);
+            d = grid_get_dot(g, points, px - (2*a + b), py - (  a    )); grid_face_set_dot(g, d, 9);
+            d = grid_get_dot(g, points, px - (  a + b), py - (  a + b)); grid_face_set_dot(g, d, 10);
+            d = grid_get_dot(g, points, px - (  a    ), py - (2*a + b)); grid_face_set_dot(g, d, 11);
+
+            /* hexagon on top right of dodecagon */
+            if (y && (x < width - 1 || !(y % 2))) {
+                grid_face_add_new(g, 6);
+                d = grid_get_dot(g, points, px + (a + 2*b), py - (4*a + b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (a + 2*b), py - (2*a + b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (a +   b), py - (  a + b)); grid_face_set_dot(g, d, 2);
+                d = grid_get_dot(g, points, px + (a      ), py - (2*a + b)); grid_face_set_dot(g, d, 3);
+                d = grid_get_dot(g, points, px + (a      ), py - (4*a + b)); grid_face_set_dot(g, d, 4);
+                d = grid_get_dot(g, points, px + (a +   b), py - (5*a + b)); grid_face_set_dot(g, d, 5);
+            }
+
+            /* hexagon on right of dodecagon*/
+            if (x < width - 1) {
+                grid_face_add_new(g, 6);
+                d = grid_get_dot(g, points, px + (2*a + 3*b), py -   a); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (2*a + 3*b), py +   a); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (2*a + 2*b), py + 2*a); grid_face_set_dot(g, d, 2);
+                d = grid_get_dot(g, points, px + (2*a +   b), py +   a); grid_face_set_dot(g, d, 3);
+                d = grid_get_dot(g, points, px + (2*a +   b), py -   a); grid_face_set_dot(g, d, 4);
+                d = grid_get_dot(g, points, px + (2*a + 2*b), py - 2*a); grid_face_set_dot(g, d, 5);
+            }
+
+            /* hexagon on bottom right  of dodecagon */
+            if ((y < height - 1) && (x < width - 1 || !(y % 2))) {
+                grid_face_add_new(g, 6);
+                d = grid_get_dot(g, points, px + (a + 2*b), py + (2*a + b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (a + 2*b), py + (4*a + b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (a +   b), py + (5*a + b)); grid_face_set_dot(g, d, 2);
+                d = grid_get_dot(g, points, px + (a      ), py + (4*a + b)); grid_face_set_dot(g, d, 3);
+                d = grid_get_dot(g, points, px + (a      ), py + (2*a + b)); grid_face_set_dot(g, d, 4);
+                d = grid_get_dot(g, points, px + (a +   b), py + (  a + b)); grid_face_set_dot(g, d, 5);
+            }
+
+            /* square on top right of dodecagon */
+            if (y && (x < width - 1 )) {
+                grid_face_add_new(g, 4);
+                d = grid_get_dot(g, points, px + (  a + 2*b), py - (2*a +   b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (2*a + 2*b), py - (2*a      )); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (2*a +   b), py - (  a      )); grid_face_set_dot(g, d, 2);
+                d = grid_get_dot(g, points, px + (  a +   b), py - (  a +   b)); grid_face_set_dot(g, d, 3);
+            }
+
+            /* square on bottom right of dodecagon */
+            if ((y < height - 1) && (x < width - 1 )) {
+                grid_face_add_new(g, 4);
+                d = grid_get_dot(g, points, px + (2*a + 2*b), py + (2*a      )); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (  a + 2*b), py + (2*a +   b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (  a +   b), py + (  a +   b)); grid_face_set_dot(g, d, 2);
+                d = grid_get_dot(g, points, px + (2*a +   b), py + (  a      )); grid_face_set_dot(g, d, 3);
+            }
+
+            /* square below dodecagon */
+            if ((y < height - 1) && (x < width - 1 || !(y % 2)) && (x > 0 || (y % 2))) {
+                grid_face_add_new(g, 4);
+                d = grid_get_dot(g, points, px + a, py + (2*a + b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + a, py + (4*a + b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px - a, py + (4*a + b)); grid_face_set_dot(g, d, 2);
+                d = grid_get_dot(g, points, px - a, py + (2*a + b)); grid_face_set_dot(g, d, 3);
+            }
+
+            /* square on bottom left of dodecagon */
+            if (x && (y < height - 1)) {
+                grid_face_add_new(g, 4);
+                d = grid_get_dot(g, points, px - (2*a +   b), py + (  a      )); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px - (  a +   b), py + (  a +   b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px - (  a + 2*b), py + (2*a +   b)); grid_face_set_dot(g, d, 2);
+                d = grid_get_dot(g, points, px - (2*a + 2*b), py + (2*a      )); grid_face_set_dot(g, d, 3);
+            }
+
+            /* square on top left of dodecagon */
+            if (x && y) {
+                grid_face_add_new(g, 4);
+                d = grid_get_dot(g, points, px - (  a +   b), py - (  a +   b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px - (2*a +   b), py - (  a      )); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px - (2*a + 2*b), py - (2*a      )); grid_face_set_dot(g, d, 2);
+                d = grid_get_dot(g, points, px - (  a + 2*b), py - (2*a +   b)); grid_face_set_dot(g, d, 3);
+
+            }
+
+            /* square above dodecagon */
+            if (y && (x < width - 1 || !(y % 2)) && (x > 0 || (y % 2))) {
+                grid_face_add_new(g, 4);
+                d = grid_get_dot(g, points, px + a, py - (4*a + b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + a, py - (2*a + b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px - a, py - (2*a + b)); grid_face_set_dot(g, d, 2);
+                d = grid_get_dot(g, points, px - a, py - (4*a + b)); grid_face_set_dot(g, d, 3);
+            }
+
+            /* upper triangle (v) */
+            if (y && (x < width - 1)) {
+                grid_face_add_new(g, 3);
+                d = grid_get_dot(g, points, px + (3*a + 2*b), py - (2*a +   b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (2*a + 2*b), py - (2*a      )); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (  a + 2*b), py - (2*a +   b)); grid_face_set_dot(g, d, 2);
+            }
+
+            /* lower triangle (^) */
+            if ((y < height - 1) && (x < width - 1)) {
+                grid_face_add_new(g, 3);
+                d = grid_get_dot(g, points, px + (3*a + 2*b), py + (2*a +   b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (  a + 2*b), py + (2*a +   b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (2*a + 2*b), py + (2*a      )); grid_face_set_dot(g, d, 2);
+            }
+        }
+    }
+
+    freetree234(points);
+    assert(g->num_faces <= max_faces);
+    assert(g->num_dots <= max_dots);
+
+    grid_make_consistent(g);
+    return g;
+}
+
 typedef struct setface_ctx
 {
     int xmin, xmax, ymin, ymax;
diff --git a/apps/plugins/puzzles/grid.h b/apps/plugins/puzzles/src/grid.h
index 17d0aa1961..fb8ac48790 100644
--- a/apps/plugins/puzzles/grid.h
+++ b/apps/plugins/puzzles/src/grid.h
@@ -105,6 +105,7 @@ typedef struct grid {
   A(FLORET,floret) \
   A(DODECAGONAL,dodecagonal) \
   A(GREATDODECAGONAL,greatdodecagonal) \
+  A(GREATGREATDODECAGONAL,greatgreatdodecagonal) \
   A(PENROSE_P2,penrose_p2_kite) \
   A(PENROSE_P3,penrose_p3_thick)
 
diff --git a/apps/plugins/puzzles/gtk.c b/apps/plugins/puzzles/src/gtk.c
index e132c3db58..c5e3d1c997 100644
--- a/apps/plugins/puzzles/gtk.c
+++ b/apps/plugins/puzzles/src/gtk.c
@@ -3,7 +3,7 @@
  */
 
 #include <stdio.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <stdlib.h>
 #include <time.h>
 #include <stdarg.h>
@@ -144,6 +144,9 @@ struct frontend {
     GtkWidget *area;
     GtkWidget *statusbar;
     GtkWidget *menubar;
+#if GTK_CHECK_VERSION(3,20,0)
+    GtkCssProvider *css_provider;
+#endif
     guint statusctx;
     int w, h;
     midend *me;
@@ -179,7 +182,6 @@ struct frontend {
     char *filesel_name;
 #endif
     GSList *preset_radio;
-    int n_preset_menu_items;
     int preset_threaded;
     GtkWidget *preset_custom;
     GtkWidget *copy_menu_item;
@@ -290,7 +292,27 @@ static void set_colour(frontend *fe, int colour)
 
 static void set_window_background(frontend *fe, int colour)
 {
-#if GTK_CHECK_VERSION(3,0,0)
+#if GTK_CHECK_VERSION(3,20,0)
+    char css_buf[512];
+    sprintf(css_buf, ".background { "
+            "background-color: #%02x%02x%02x; }",
+            (unsigned)(fe->colours[3*colour + 0] * 255),
+            (unsigned)(fe->colours[3*colour + 1] * 255),
+            (unsigned)(fe->colours[3*colour + 2] * 255));
+    if (!fe->css_provider)
+        fe->css_provider = gtk_css_provider_new();
+    if (!gtk_css_provider_load_from_data(
+            GTK_CSS_PROVIDER(fe->css_provider), css_buf, -1, NULL))
+        assert(0 && "Couldn't load CSS");
+    gtk_style_context_add_provider(
+        gtk_widget_get_style_context(fe->window),
+        GTK_STYLE_PROVIDER(fe->css_provider),
+        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    gtk_style_context_add_provider(
+        gtk_widget_get_style_context(fe->area),
+        GTK_STYLE_PROVIDER(fe->css_provider),
+        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+#elif GTK_CHECK_VERSION(3,0,0)
     GdkRGBA rgba;
     rgba.red = fe->colours[3*colour + 0];
     rgba.green = fe->colours[3*colour + 1];
@@ -439,11 +461,13 @@ static void clear_backing_store(frontend *fe)
     fe->image = NULL;
 }
 
-static void wipe_and_destroy_cairo(frontend *fe, cairo_t *cr)
+static void wipe_and_maybe_destroy_cairo(frontend *fe, cairo_t *cr,
+                                         int destroy)
 {
     cairo_set_source_rgb(cr, fe->colours[0], fe->colours[1], fe->colours[2]);
     cairo_paint(cr);
-    cairo_destroy(cr);
+    if (destroy)
+        cairo_destroy(cr);
 }
 
 static void setup_backing_store(frontend *fe)
@@ -455,12 +479,29 @@ static void setup_backing_store(frontend *fe)
     fe->image = cairo_image_surface_create(CAIRO_FORMAT_RGB24,
                                            fe->pw, fe->ph);
 
-    wipe_and_destroy_cairo(fe, cairo_create(fe->image));
+    wipe_and_maybe_destroy_cairo(fe, cairo_create(fe->image), TRUE);
 #ifndef USE_CAIRO_WITHOUT_PIXMAP
-    wipe_and_destroy_cairo(fe, gdk_cairo_create(fe->pixmap));
+    wipe_and_maybe_destroy_cairo(fe, gdk_cairo_create(fe->pixmap), TRUE);
+#endif
+#if GTK_CHECK_VERSION(3,22,0)
+    {
+        GdkWindow *gdkwin;
+        cairo_region_t *region;
+        GdkDrawingContext *drawctx;
+        cairo_t *cr;
+
+        gdkwin = gtk_widget_get_window(fe->area);
+        region = gdk_window_get_clip_region(gdkwin);
+        drawctx = gdk_window_begin_draw_frame(gdkwin, region);
+        cr = gdk_drawing_context_get_cairo_context(drawctx);
+        wipe_and_maybe_destroy_cairo(fe, cr, FALSE);
+        gdk_window_end_draw_frame(gdkwin, drawctx);
+        cairo_region_destroy(region);
+    }
+#else
+    wipe_and_maybe_destroy_cairo(
+        fe, gdk_cairo_create(gtk_widget_get_window(fe->area)), TRUE);
 #endif
-    wipe_and_destroy_cairo(fe, gdk_cairo_create
-                           (gtk_widget_get_window(fe->area)));
 }
 
 static int backing_store_ok(frontend *fe)
@@ -1842,20 +1883,22 @@ static void changed_preset(frontend *fe)
             TRUE);
     } else {
         GSList *gs = fe->preset_radio;
-        int i = fe->n_preset_menu_items - 1 - n;
-        if (fe->preset_custom)
-            gs = gs->next;
-        while (i && gs) {
-            i--;
-            gs = gs->next;
-        }
-        if (gs) {
-            gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gs->data),
-                                           TRUE);
-        } else for (gs = fe->preset_radio; gs; gs = gs->next) {
-            gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gs->data),
-                                           FALSE);
-        }
+        GSList *found = NULL;
+
+        for (gs = fe->preset_radio; gs; gs = gs->next) {
+            struct preset_menu_entry *entry =
+                (struct preset_menu_entry *)g_object_get_data(
+                    G_OBJECT(gs->data), "user-data");
+
+            if (entry && entry->id != n)
+                gtk_check_menu_item_set_active(
+                    GTK_CHECK_MENU_ITEM(gs->data), FALSE);
+            else
+                found = gs;
+        }
+        if (found)
+            gtk_check_menu_item_set_active(
+                GTK_CHECK_MENU_ITEM(found->data), FALSE);
     }
     fe->preset_threaded = FALSE;
 
@@ -1977,14 +2020,15 @@ static void resize_fe(frontend *fe)
 static void menu_preset_event(GtkMenuItem *menuitem, gpointer data)
 {
     frontend *fe = (frontend *)data;
-    game_params *params =
-        (game_params *)g_object_get_data(G_OBJECT(menuitem), "user-data");
+    struct preset_menu_entry *entry =
+        (struct preset_menu_entry *)g_object_get_data(
+            G_OBJECT(menuitem), "user-data");
 
     if (fe->preset_threaded ||
         (GTK_IS_CHECK_MENU_ITEM(menuitem) &&
          !gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))))
         return;
-    midend_set_params(fe->me, params);
+    midend_set_params(fe->me, entry->params);
     midend_new_game(fe->me);
     changed_preset(fe);
     resize_fe(fe);
@@ -2341,6 +2385,36 @@ static void add_menu_separator(GtkContainer *cont)
     gtk_widget_show(menuitem);
 }
 
+static void populate_gtk_preset_menu(frontend *fe, struct preset_menu *menu,
+                                     GtkWidget *gtkmenu)
+{
+    int i;
+
+    for (i = 0; i < menu->n_entries; i++) {
+        struct preset_menu_entry *entry = &menu->entries[i];
+        GtkWidget *menuitem;
+
+        if (entry->params) {
+            menuitem = gtk_radio_menu_item_new_with_label(
+                fe->preset_radio, entry->title);
+            fe->preset_radio = gtk_radio_menu_item_get_group(
+                GTK_RADIO_MENU_ITEM(menuitem));
+            g_object_set_data(G_OBJECT(menuitem), "user-data", entry);
+            g_signal_connect(G_OBJECT(menuitem), "activate",
+                             G_CALLBACK(menu_preset_event), fe);
+        } else {
+            GtkWidget *submenu;
+            menuitem = gtk_menu_item_new_with_label(entry->title);
+            submenu = gtk_menu_new();
+            gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
+            populate_gtk_preset_menu(fe, entry->submenu, submenu);
+        }
+
+        gtk_container_add(GTK_CONTAINER(gtkmenu), menuitem);
+        gtk_widget_show(menuitem);
+    }
+}
+
 enum { ARG_EITHER, ARG_SAVE, ARG_ID }; /* for argtype */
 
 static frontend *new_window(char *arg, int argtype, char **error)
@@ -2353,8 +2427,12 @@ static frontend *new_window(char *arg, int argtype, char **error)
     char errbuf[1024];
     extern char *const *const xpm_icons[];
     extern const int n_xpm_icons;
+    struct preset_menu *preset_menu;
 
     fe = snew(frontend);
+#if GTK_CHECK_VERSION(3,20,0)
+    fe->css_provider = NULL;
+#endif
 
     fe->timer_active = FALSE;
     fe->timer_id = -1;
@@ -2501,11 +2579,11 @@ static frontend *new_window(char *arg, int argtype, char **error)
 
     fe->preset_radio = NULL;
     fe->preset_custom = NULL;
-    fe->n_preset_menu_items = 0;
     fe->preset_threaded = FALSE;
-    if ((n = midend_num_presets(fe->me)) > 0 || thegame.can_configure) {
+
+    preset_menu = midend_get_presets(fe->me, NULL);
+    if (preset_menu->n_entries > 0 || thegame.can_configure) {
         GtkWidget *submenu;
-        int i;
 
         menuitem = gtk_menu_item_new_with_mnemonic("_Type");
         gtk_container_add(GTK_CONTAINER(fe->menubar), menuitem);
@@ -2514,23 +2592,7 @@ static frontend *new_window(char *arg, int argtype, char **error)
         submenu = gtk_menu_new();
         gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 
-        for (i = 0; i < n; i++) {
-            char *name;
-            game_params *params;
-
-            midend_fetch_preset(fe->me, i, &name, &params);
-
-            menuitem =
-                gtk_radio_menu_item_new_with_label(fe->preset_radio, name);
-            fe->preset_radio =
-                gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
-            fe->n_preset_menu_items++;
-            gtk_container_add(GTK_CONTAINER(submenu), menuitem);
-            g_object_set_data(G_OBJECT(menuitem), "user-data", params);
-            g_signal_connect(G_OBJECT(menuitem), "activate",
-                             G_CALLBACK(menu_preset_event), fe);
-            gtk_widget_show(menuitem);
-        }
+        populate_gtk_preset_menu(fe, preset_menu, submenu);
 
         if (thegame.can_configure) {
             menuitem = fe->preset_custom =
@@ -2781,6 +2843,22 @@ char *fgetline(FILE *fp)
     return ret;
 }
 
+static void list_presets_from_menu(struct preset_menu *menu)
+{
+    int i;
+
+    for (i = 0; i < menu->n_entries; i++) {
+        if (menu->entries[i].params) {
+            char *paramstr = thegame.encode_params(
+                menu->entries[i].params, TRUE);
+            printf("%s %s\n", paramstr, menu->entries[i].title);
+            sfree(paramstr);
+        } else {
+            list_presets_from_menu(menu->entries[i].submenu);
+        }
+    }
+}
+
 int main(int argc, char **argv)
 {
     char *pname = argv[0];
@@ -3184,23 +3262,12 @@ int main(int argc, char **argv)
          * Another specialist mode which causes the puzzle to list the
          * game_params strings for all its preset configurations.
          */
-        int i, npresets;
         midend *me;
+        struct preset_menu *menu;
 
         me = midend_new(NULL, &thegame, NULL, NULL);
-        npresets = midend_num_presets(me);
-
-        for (i = 0; i < npresets; i++) {
-            game_params *params;
-            char *name, *paramstr;
-
-            midend_fetch_preset(me, i, &name, &params);
-            paramstr = thegame.encode_params(params, TRUE);
-
-            printf("%s %s\n", paramstr, name);
-            sfree(paramstr);
-        }
-
+        menu = midend_get_presets(me, NULL);
+        list_presets_from_menu(menu);
         midend_free(me);
         return 0;
     } else {
diff --git a/apps/plugins/puzzles/guess.R b/apps/plugins/puzzles/src/guess.R
index 0e1a00c073..0e1a00c073 100644
--- a/apps/plugins/puzzles/guess.R
+++ b/apps/plugins/puzzles/src/guess.R
diff --git a/apps/plugins/puzzles/guess.c b/apps/plugins/puzzles/src/guess.c
index d1187f3e3c..8f058638da 100644
--- a/apps/plugins/puzzles/guess.c
+++ b/apps/plugins/puzzles/src/guess.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1480,7 +1480,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Guess", "games.guess", "guess",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/guess.html b/apps/plugins/puzzles/src/guess.html
new file mode 100644
index 0000000000..b530f71a75
--- /dev/null
+++ b/apps/plugins/puzzles/src/guess.html
@@ -0,0 +1,94 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Guess</title>
+<link rel="previous" href="flip.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="pegs.html">
+</head>
+<body>
+<p><a href="flip.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="pegs.html">Next</a></p>
+<h1><a name="C15"></a>Chapter 15: <a name="i0"></a>Guess</h1>
+<p>
+You have a set of coloured pegs, and have to reproduce a predetermined sequence of them (chosen by the computer) within a certain number of guesses.
+</p>
+<p>
+Each guess gets marked with the number of correctly-coloured pegs in the correct places (in black), and also the number of correctly-coloured pegs in the wrong places (in white).
+</p>
+<p>
+This game is also known (and marketed, by Hasbro, mainly) as a board game &#8216;<a name="i1"></a>Mastermind&#8217;, with 6 colours, 4 pegs per row, and 10 guesses. However, this version allows custom settings of number of colours (up to 10), number of pegs per row, and number of guesses.
+</p>
+<p>
+Guess was contributed to this collection by James Harvey.
+</p>
+<h2><a name="S15.1"></a>15.1 <a name="i2"></a>Guess controls</h2>
+<p>
+This game can be played with either the keyboard or the mouse.
+</p>
+<p>
+With the mouse, drag a coloured peg from the tray on the left-hand side to its required position in the current guess; pegs may also be dragged from current and past guesses to copy them elsewhere. To remove a peg, drag it off its current position to somewhere invalid.
+</p>
+<p>
+Right-clicking in the current guess adds a &#8216;hold&#8217; marker; pegs that have hold markers will be automatically added to the next guess after marking.
+</p>
+<p>
+Alternatively, with the keyboard, the up and down cursor keys can be used to select a peg colour, the left and right keys to select a peg position, and the space bar or Enter key to place a peg of the selected colour in the chosen position. &#8216;D&#8217; or Backspace removes a peg, and Space adds a hold marker.
+</p>
+<p>
+Pressing &#8216;h&#8217; or &#8216;?&#8217; will fill the current guess with a suggested guess. Using this is not recommended for 10 or more pegs as it is slow.
+</p>
+<p>
+When the guess is complete, the smaller feedback pegs will be highlighted; clicking on these (or moving the peg cursor to them with the arrow keys and pressing the space bar or Enter key) will mark the current guess, copy any held pegs to the next guess, and move the &#8216;current guess&#8217; marker.
+</p>
+<p>
+If you correctly position all the pegs the solution will be displayed below; if you run out of guesses (or select &#8216;Solve...&#8217;) the solution will also be revealed.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S15.2"></a>15.2 <a name="i3"></a>Guess parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu. The default game matches the parameters for the board game &#8216;Mastermind&#8217;.
+</p>
+<dl><dt>
+<em>Colours</em>
+</dt>
+<dd>
+Number of colours the solution is chosen from; from 2 to 10 (more is harder).
+</dd>
+<dt>
+<em>Pegs per guess</em>
+</dt>
+<dd>
+Number of pegs per guess (more is harder).
+</dd>
+<dt>
+<em>Guesses</em>
+</dt>
+<dd>
+Number of guesses you have to find the solution in (fewer is harder).
+</dd>
+<dt>
+<em>Allow blanks</em>
+</dt>
+<dd>
+Allows blank pegs to be given as part of a guess (makes it easier, because you know that those will never be counted as part of the solution). This is turned off by default.
+<p>
+Note that this doesn't allow blank pegs in the solution; if you really wanted that, use one extra colour.
+</p>
+
+</dd>
+<dt>
+<em>Allow duplicates</em>
+</dt>
+<dd>
+Allows the solution (and the guesses) to contain colours more than once; this increases the search space (making things harder), and is turned on by default.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/html/blackbox.html b/apps/plugins/puzzles/src/html/blackbox.html
index f98604f12f..f98604f12f 100644
--- a/apps/plugins/puzzles/html/blackbox.html
+++ b/apps/plugins/puzzles/src/html/blackbox.html
diff --git a/apps/plugins/puzzles/html/bridges.html b/apps/plugins/puzzles/src/html/bridges.html
index 06ec2d4d4b..06ec2d4d4b 100644
--- a/apps/plugins/puzzles/html/bridges.html
+++ b/apps/plugins/puzzles/src/html/bridges.html
diff --git a/apps/plugins/puzzles/html/cube.html b/apps/plugins/puzzles/src/html/cube.html
index f08e16c38d..f08e16c38d 100644
--- a/apps/plugins/puzzles/html/cube.html
+++ b/apps/plugins/puzzles/src/html/cube.html
diff --git a/apps/plugins/puzzles/html/dominosa.html b/apps/plugins/puzzles/src/html/dominosa.html
index d2f672806a..d2f672806a 100644
--- a/apps/plugins/puzzles/html/dominosa.html
+++ b/apps/plugins/puzzles/src/html/dominosa.html
diff --git a/apps/plugins/puzzles/html/fifteen.html b/apps/plugins/puzzles/src/html/fifteen.html
index 53053b440d..53053b440d 100644
--- a/apps/plugins/puzzles/html/fifteen.html
+++ b/apps/plugins/puzzles/src/html/fifteen.html
diff --git a/apps/plugins/puzzles/html/filling.html b/apps/plugins/puzzles/src/html/filling.html
index 70ce16d4a9..70ce16d4a9 100644
--- a/apps/plugins/puzzles/html/filling.html
+++ b/apps/plugins/puzzles/src/html/filling.html
diff --git a/apps/plugins/puzzles/html/flip.html b/apps/plugins/puzzles/src/html/flip.html
index 404aae6b9a..404aae6b9a 100644
--- a/apps/plugins/puzzles/html/flip.html
+++ b/apps/plugins/puzzles/src/html/flip.html
diff --git a/apps/plugins/puzzles/html/flood.html b/apps/plugins/puzzles/src/html/flood.html
index cf09eac766..cf09eac766 100644
--- a/apps/plugins/puzzles/html/flood.html
+++ b/apps/plugins/puzzles/src/html/flood.html
diff --git a/apps/plugins/puzzles/html/galaxies.html b/apps/plugins/puzzles/src/html/galaxies.html
index 8041a95cee..8041a95cee 100644
--- a/apps/plugins/puzzles/html/galaxies.html
+++ b/apps/plugins/puzzles/src/html/galaxies.html
diff --git a/apps/plugins/puzzles/html/group.html b/apps/plugins/puzzles/src/html/group.html
index c0f52de629..c0f52de629 100644
--- a/apps/plugins/puzzles/html/group.html
+++ b/apps/plugins/puzzles/src/html/group.html
diff --git a/apps/plugins/puzzles/html/guess.html b/apps/plugins/puzzles/src/html/guess.html
index 1e4fc1ed04..1e4fc1ed04 100644
--- a/apps/plugins/puzzles/html/guess.html
+++ b/apps/plugins/puzzles/src/html/guess.html
diff --git a/apps/plugins/puzzles/html/inertia.html b/apps/plugins/puzzles/src/html/inertia.html
index 20077c0048..20077c0048 100644
--- a/apps/plugins/puzzles/html/inertia.html
+++ b/apps/plugins/puzzles/src/html/inertia.html
diff --git a/apps/plugins/puzzles/html/javapage.pl b/apps/plugins/puzzles/src/html/javapage.pl
index cd5e6a1669..cd5e6a1669 100755
--- a/apps/plugins/puzzles/html/javapage.pl
+++ b/apps/plugins/puzzles/src/html/javapage.pl
diff --git a/apps/plugins/puzzles/src/html/jspage.pl b/apps/plugins/puzzles/src/html/jspage.pl
new file mode 100755
index 0000000000..a21f977166
--- /dev/null
+++ b/apps/plugins/puzzles/src/html/jspage.pl
@@ -0,0 +1,242 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+open my $footerfile, "<", shift @ARGV or die "footer: open: $!\n";
+my $footer = "";
+$footer .= $_ while <$footerfile>;
+close $footerfile;
+
+for my $arg (@ARGV) {
+    $arg =~ /(.*\/)?([^\/]+)\.html$/ or die;
+    my $filename = $2;
+    open my $gamefile, "<", $arg or die "$arg: open: $!\n";
+    my $unfinished = 0;
+    my $docname = $filename;
+    chomp(my $puzzlename = <$gamefile>);
+    while ($puzzlename =~ s/^([^:=]+)(=([^:]+))?://) {
+        if ($1 eq "unfinished") {
+            $unfinished = 1;
+        } elsif ($1 eq "docname") {
+            $docname = $3;
+        } else {
+            die "$arg: unknown keyword '$1'\n";
+        }
+    }
+    my $instructions = "";
+    $instructions .= $_ while <$gamefile>;
+    close $gamefile;
+
+    open my $outpage, ">", "${filename}.html";
+
+    my $unfinishedtitlefragment = $unfinished ? "an unfinished puzzle " : "";
+    my $unfinishedheading = $unfinished ? "<h2 align=center>an unfinished puzzle</h2>\n" : "";
+    my $unfinishedpara;
+    my $links;
+    if ($unfinished) {
+        $unfinishedpara = <<EOF;
+<p>
+You have found your way to a page containing an <em>unfinished</em>
+puzzle in my collection, not linked from the <a href="../">main
+puzzles page</a>. Don't be surprised if things are hard to understand
+or don't work as you expect.
+EOF
+        $links = <<EOF;
+<p align="center">
+<a href="../">Back to main puzzles page</a> (which does not link to this)
+EOF
+    } else {
+        $unfinishedpara = "";
+        $links = <<EOF;
+<p align="center">
+<a href="../doc/${docname}.html#${docname}">Full instructions</a>
+|
+<a href="../">Back to main puzzles page</a>
+EOF
+    }
+
+    print $outpage <<EOF;
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+<title>${puzzlename}, ${unfinishedtitlefragment}from Simon Tatham's Portable Puzzle Collection</title>
+<script type="text/javascript" src="${filename}.js"></script>
+<style class="text/css">
+/* Margins and centring on the top-level div for the game menu */
+#gamemenu { margin-top: 0; margin-bottom: 0.5em; text-align: center }
+
+/* Inside that div, the main menu bar and every submenu inside it is a <ul> */
+#gamemenu ul {
+    list-style: none;  /* get rid of the normal unordered-list bullets */
+    display: inline;   /* make top-level menu bar items appear side by side */
+    position: relative; /* allow submenus to position themselves near parent */
+    margin: 0;
+    margin-bottom: 0.5em;
+    padding: 0;
+}
+
+/* Individual menu items are <li> elements within such a <ul> */
+#gamemenu ul li {
+    /* Add a little mild text formatting */
+    font-weight: bold; font-size: 0.8em;
+    /* Line height and padding appropriate to top-level menu items */
+    padding-left: 0.75em; padding-right: 0.75em;
+    padding-top: 0.2em; padding-bottom: 0.2em;
+    margin: 0;
+    /* Make top-level menu items appear side by side, not vertically stacked */
+    display: inline;
+    /* Suppress the text-selection I-beam pointer */
+    cursor: default;
+    /* Surround each menu item with a border. The left border is removed
+     * because it will abut the right border of the previous item. (A rule
+     * below will reinstate the left border for the leftmost menu item.) */
+    border-left: 0;
+    border-right: 1px solid rgba(0,0,0,0.3);
+    border-top: 1px solid rgba(0,0,0,0.3);
+    border-bottom: 1px solid rgba(0,0,0,0.3);
+}
+
+#gamemenu ul li.disabled {
+    /* Grey out menu items with the "disabled" class */
+    color: rgba(0,0,0,0.5);
+}
+
+#gamemenu ul li:first-of-type {
+    /* Reinstate the left border for the leftmost top-level menu item */
+    border-left: 1px solid rgba(0,0,0,0.3);
+}
+
+#gamemenu ul li:hover {
+    /* When the mouse is over a menu item, highlight it */
+    background: rgba(0,0,0,0.3);
+    /* Set position:relative, so that if this item has a submenu it can
+     * position itself relative to the parent item. */
+    position: relative;
+}
+
+#gamemenu ul li.disabled:hover {
+    /* Disabled menu items don't get a highlight on mouse hover */
+    background: inherit;
+}
+
+#gamemenu ul ul {
+    /* Second-level menus and below are not displayed by default */
+    display: none;
+    /* When they are displayed, they are positioned immediately below
+     * their parent <li>, and with the left edge aligning */
+    position: absolute;
+    top: 100%;
+    left: 0;
+    /* We must specify an explicit background colour for submenus, because
+     * they must be opaque (don't want other page contents showing through
+     * them). */
+    background: white;
+    /* And make sure they appear in front. */
+    z-index: 1;
+}
+
+#gamemenu ul ul.left {
+    /* A second-level menu with class "left" aligns its right edge with
+     * its parent, rather than its left edge */
+    left: inherit; right: 0;
+}
+
+/* Menu items in second-level menus and below */
+#gamemenu ul ul li {
+    /* Go back to vertical stacking, for drop-down submenus */
+    display: block;
+    /* Inhibit wrapping, so the submenu will expand its width as needed. */
+    white-space: nowrap;
+    /* Override the text-align:center from above */
+    text-align: left;
+    /* Don't make the text any smaller than the previous level of menu */
+    font-size: 100%;
+    /* This time it's the top border that we omit on all but the first
+     * element in the submenu, since now they're vertically stacked */
+    border-left: 1px solid rgba(0,0,0,0.3);
+    border-right: 1px solid rgba(0,0,0,0.3);
+    border-top: 0;
+    border-bottom: 1px solid rgba(0,0,0,0.3);
+}
+
+#gamemenu ul ul li:first-of-type {
+    /* Reinstate top border for first item in a submenu */
+    border-top: 1px solid rgba(0,0,0,0.3);
+}
+
+#gamemenu ul ul ul {
+    /* Third-level submenus are drawn to the side of their parent menu
+     * item, not below it */
+    top: 0; left: 100%;
+}
+
+#gamemenu ul ul ul.left {
+    /* A submenu with class "left" goes to the left of its parent,
+     * not the right */
+    left: inherit; right: 100%;
+}
+
+#gamemenu ul li:hover > ul {
+    /* Last but by no means least, the all-important line that makes
+     * submenus be displayed! Any <ul> whose parent <li> is being
+     * hovered over gets display:block overriding the display:none
+     * from above. */
+    display: block;
+}
+</style>
+</head>
+<body onLoad="initPuzzle();">
+<h1 align=center>${puzzlename}</h1>
+${unfinishedheading}
+<h2 align=center>from Simon Tatham's Portable Puzzle Collection</h2>
+
+${unfinishedpara}
+
+<hr>
+<div id="puzzle" style="display: none">
+<div id="gamemenu"><ul><li id="new">New game</li
+><li id="restart">Restart game</li
+><li id="undo">Undo move</li
+><li id="redo">Redo move</li
+><li id="solve">Solve game</li
+><li id="specific">Enter game ID</li
+><li id="random">Enter random seed</li
+><li>Select game type<ul id="gametype" class="left"></ul></li
+></ul></div>
+<div align=center>
+  <div id="resizable" style="position:relative; left:0; top:0">
+  <canvas style="display: block" id="puzzlecanvas" width="1px" height="1px" tabindex="1">
+  </canvas>
+  <div id="statusbarholder" style="display: block">
+  </div>
+  </div>
+  <p>
+    Link to this puzzle:
+    <a id="permalink-desc">by game ID</a>
+    <a id="permalink-seed">by random seed</a>
+  </p>
+</div>
+</div>
+<div id="apology">
+Sorry, this Javascript puzzle doesn't seem to work in your web
+browser. Perhaps you have Javascript disabled, or perhaps your browser
+doesn't provide a feature that the puzzle code requires (such as
+<a href="https://developer.mozilla.org/en-US/docs/JavaScript/Typed_arrays">typed arrays</a>).
+These puzzles have been successfully run in Firefox 19, Chrome 26,
+Internet Explorer 10 and Safari 6.
+</div>
+<hr>
+
+${instructions}
+
+${links}
+
+${footer}
+</body>
+</html>
+EOF
+
+    close $outpage;
+}
diff --git a/apps/plugins/puzzles/html/keen.html b/apps/plugins/puzzles/src/html/keen.html
index bd0eb3644d..bd0eb3644d 100644
--- a/apps/plugins/puzzles/html/keen.html
+++ b/apps/plugins/puzzles/src/html/keen.html
diff --git a/apps/plugins/puzzles/html/lightup.html b/apps/plugins/puzzles/src/html/lightup.html
index 2de2f91bb9..2de2f91bb9 100644
--- a/apps/plugins/puzzles/html/lightup.html
+++ b/apps/plugins/puzzles/src/html/lightup.html
diff --git a/apps/plugins/puzzles/html/loopy.html b/apps/plugins/puzzles/src/html/loopy.html
index 96f3a9d908..96f3a9d908 100644
--- a/apps/plugins/puzzles/html/loopy.html
+++ b/apps/plugins/puzzles/src/html/loopy.html
diff --git a/apps/plugins/puzzles/html/magnets.html b/apps/plugins/puzzles/src/html/magnets.html
index 2807569a6c..2807569a6c 100644
--- a/apps/plugins/puzzles/html/magnets.html
+++ b/apps/plugins/puzzles/src/html/magnets.html
diff --git a/apps/plugins/puzzles/html/map.html b/apps/plugins/puzzles/src/html/map.html
index 5f81793054..5f81793054 100644
--- a/apps/plugins/puzzles/html/map.html
+++ b/apps/plugins/puzzles/src/html/map.html
diff --git a/apps/plugins/puzzles/html/mines.html b/apps/plugins/puzzles/src/html/mines.html
index d17d6ffa80..d17d6ffa80 100644
--- a/apps/plugins/puzzles/html/mines.html
+++ b/apps/plugins/puzzles/src/html/mines.html
diff --git a/apps/plugins/puzzles/html/net.html b/apps/plugins/puzzles/src/html/net.html
index 08bffbac3e..08bffbac3e 100644
--- a/apps/plugins/puzzles/html/net.html
+++ b/apps/plugins/puzzles/src/html/net.html
diff --git a/apps/plugins/puzzles/html/netslide.html b/apps/plugins/puzzles/src/html/netslide.html
index f1877417d4..f1877417d4 100644
--- a/apps/plugins/puzzles/html/netslide.html
+++ b/apps/plugins/puzzles/src/html/netslide.html
diff --git a/apps/plugins/puzzles/html/palisade.html b/apps/plugins/puzzles/src/html/palisade.html
index 5b6b933104..5b6b933104 100644
--- a/apps/plugins/puzzles/html/palisade.html
+++ b/apps/plugins/puzzles/src/html/palisade.html
diff --git a/apps/plugins/puzzles/html/pattern.html b/apps/plugins/puzzles/src/html/pattern.html
index 54e05d6416..54e05d6416 100644
--- a/apps/plugins/puzzles/html/pattern.html
+++ b/apps/plugins/puzzles/src/html/pattern.html
diff --git a/apps/plugins/puzzles/html/pearl.html b/apps/plugins/puzzles/src/html/pearl.html
index 2ca25a5ee0..2ca25a5ee0 100644
--- a/apps/plugins/puzzles/html/pearl.html
+++ b/apps/plugins/puzzles/src/html/pearl.html
diff --git a/apps/plugins/puzzles/html/pegs.html b/apps/plugins/puzzles/src/html/pegs.html
index 4a2378873e..4a2378873e 100644
--- a/apps/plugins/puzzles/html/pegs.html
+++ b/apps/plugins/puzzles/src/html/pegs.html
diff --git a/apps/plugins/puzzles/html/range.html b/apps/plugins/puzzles/src/html/range.html
index bb5b59c4d2..bb5b59c4d2 100644
--- a/apps/plugins/puzzles/html/range.html
+++ b/apps/plugins/puzzles/src/html/range.html
diff --git a/apps/plugins/puzzles/html/rect.html b/apps/plugins/puzzles/src/html/rect.html
index d23d827663..d23d827663 100644
--- a/apps/plugins/puzzles/html/rect.html
+++ b/apps/plugins/puzzles/src/html/rect.html
diff --git a/apps/plugins/puzzles/html/samegame.html b/apps/plugins/puzzles/src/html/samegame.html
index e6de095210..e6de095210 100644
--- a/apps/plugins/puzzles/html/samegame.html
+++ b/apps/plugins/puzzles/src/html/samegame.html
diff --git a/apps/plugins/puzzles/html/signpost.html b/apps/plugins/puzzles/src/html/signpost.html
index fa23e99de0..fa23e99de0 100644
--- a/apps/plugins/puzzles/html/signpost.html
+++ b/apps/plugins/puzzles/src/html/signpost.html
diff --git a/apps/plugins/puzzles/html/singles.html b/apps/plugins/puzzles/src/html/singles.html
index 252bffb380..252bffb380 100644
--- a/apps/plugins/puzzles/html/singles.html
+++ b/apps/plugins/puzzles/src/html/singles.html
diff --git a/apps/plugins/puzzles/html/sixteen.html b/apps/plugins/puzzles/src/html/sixteen.html
index 4530469fe6..4530469fe6 100644
--- a/apps/plugins/puzzles/html/sixteen.html
+++ b/apps/plugins/puzzles/src/html/sixteen.html
diff --git a/apps/plugins/puzzles/html/slant.html b/apps/plugins/puzzles/src/html/slant.html
index d6d31aa302..d6d31aa302 100644
--- a/apps/plugins/puzzles/html/slant.html
+++ b/apps/plugins/puzzles/src/html/slant.html
diff --git a/apps/plugins/puzzles/html/solo.html b/apps/plugins/puzzles/src/html/solo.html
index 88ebd5cb29..88ebd5cb29 100644
--- a/apps/plugins/puzzles/html/solo.html
+++ b/apps/plugins/puzzles/src/html/solo.html
diff --git a/apps/plugins/puzzles/html/tents.html b/apps/plugins/puzzles/src/html/tents.html
index e3f6d5f0ea..e3f6d5f0ea 100644
--- a/apps/plugins/puzzles/html/tents.html
+++ b/apps/plugins/puzzles/src/html/tents.html
diff --git a/apps/plugins/puzzles/html/towers.html b/apps/plugins/puzzles/src/html/towers.html
index a710e0ab6e..a710e0ab6e 100644
--- a/apps/plugins/puzzles/html/towers.html
+++ b/apps/plugins/puzzles/src/html/towers.html
diff --git a/apps/plugins/puzzles/html/tracks.html b/apps/plugins/puzzles/src/html/tracks.html
index afabed37ac..afabed37ac 100644
--- a/apps/plugins/puzzles/html/tracks.html
+++ b/apps/plugins/puzzles/src/html/tracks.html
diff --git a/apps/plugins/puzzles/html/twiddle.html b/apps/plugins/puzzles/src/html/twiddle.html
index 5f94e4e120..5f94e4e120 100644
--- a/apps/plugins/puzzles/html/twiddle.html
+++ b/apps/plugins/puzzles/src/html/twiddle.html
diff --git a/apps/plugins/puzzles/html/undead.html b/apps/plugins/puzzles/src/html/undead.html
index c21374f6dc..c21374f6dc 100644
--- a/apps/plugins/puzzles/html/undead.html
+++ b/apps/plugins/puzzles/src/html/undead.html
diff --git a/apps/plugins/puzzles/html/unequal.html b/apps/plugins/puzzles/src/html/unequal.html
index 085f82effc..085f82effc 100644
--- a/apps/plugins/puzzles/html/unequal.html
+++ b/apps/plugins/puzzles/src/html/unequal.html
diff --git a/apps/plugins/puzzles/html/unruly.html b/apps/plugins/puzzles/src/html/unruly.html
index 2cd3fb25f5..2cd3fb25f5 100644
--- a/apps/plugins/puzzles/html/unruly.html
+++ b/apps/plugins/puzzles/src/html/unruly.html
diff --git a/apps/plugins/puzzles/html/untangle.html b/apps/plugins/puzzles/src/html/untangle.html
index 7171a3d55d..7171a3d55d 100644
--- a/apps/plugins/puzzles/html/untangle.html
+++ b/apps/plugins/puzzles/src/html/untangle.html
diff --git a/apps/plugins/puzzles/icons/Makefile b/apps/plugins/puzzles/src/icons/Makefile
index 00dae1f841..00dae1f841 100644
--- a/apps/plugins/puzzles/icons/Makefile
+++ b/apps/plugins/puzzles/src/icons/Makefile
diff --git a/apps/plugins/puzzles/icons/blackbox.sav b/apps/plugins/puzzles/src/icons/blackbox.sav
index 4483f3c81a..4483f3c81a 100644
--- a/apps/plugins/puzzles/icons/blackbox.sav
+++ b/apps/plugins/puzzles/src/icons/blackbox.sav
diff --git a/apps/plugins/puzzles/icons/bridges.sav b/apps/plugins/puzzles/src/icons/bridges.sav
index ddae7085cd..ddae7085cd 100644
--- a/apps/plugins/puzzles/icons/bridges.sav
+++ b/apps/plugins/puzzles/src/icons/bridges.sav
diff --git a/apps/plugins/puzzles/icons/cicon.pl b/apps/plugins/puzzles/src/icons/cicon.pl
index 3578bd33fe..3578bd33fe 100755
--- a/apps/plugins/puzzles/icons/cicon.pl
+++ b/apps/plugins/puzzles/src/icons/cicon.pl
diff --git a/apps/plugins/puzzles/icons/crop.sh b/apps/plugins/puzzles/src/icons/crop.sh
index 0d15d3c9b9..0d15d3c9b9 100755
--- a/apps/plugins/puzzles/icons/crop.sh
+++ b/apps/plugins/puzzles/src/icons/crop.sh
diff --git a/apps/plugins/puzzles/icons/cube.sav b/apps/plugins/puzzles/src/icons/cube.sav
index bb123f4e74..bb123f4e74 100644
--- a/apps/plugins/puzzles/icons/cube.sav
+++ b/apps/plugins/puzzles/src/icons/cube.sav
diff --git a/apps/plugins/puzzles/icons/dominosa.sav b/apps/plugins/puzzles/src/icons/dominosa.sav
index 5991f3e57e..5991f3e57e 100644
--- a/apps/plugins/puzzles/icons/dominosa.sav
+++ b/apps/plugins/puzzles/src/icons/dominosa.sav
diff --git a/apps/plugins/puzzles/icons/fifteen.sav b/apps/plugins/puzzles/src/icons/fifteen.sav
index d81345a7d8..d81345a7d8 100644
--- a/apps/plugins/puzzles/icons/fifteen.sav
+++ b/apps/plugins/puzzles/src/icons/fifteen.sav
diff --git a/apps/plugins/puzzles/icons/filling.sav b/apps/plugins/puzzles/src/icons/filling.sav
index caf0bb2d4c..caf0bb2d4c 100644
--- a/apps/plugins/puzzles/icons/filling.sav
+++ b/apps/plugins/puzzles/src/icons/filling.sav
diff --git a/apps/plugins/puzzles/icons/flip.sav b/apps/plugins/puzzles/src/icons/flip.sav
index 82b4c49357..82b4c49357 100644
--- a/apps/plugins/puzzles/icons/flip.sav
+++ b/apps/plugins/puzzles/src/icons/flip.sav
diff --git a/apps/plugins/puzzles/icons/flood.sav b/apps/plugins/puzzles/src/icons/flood.sav
index ac4adf7020..ac4adf7020 100644
--- a/apps/plugins/puzzles/icons/flood.sav
+++ b/apps/plugins/puzzles/src/icons/flood.sav
diff --git a/apps/plugins/puzzles/icons/galaxies.sav b/apps/plugins/puzzles/src/icons/galaxies.sav
index 42d18bc335..42d18bc335 100644
--- a/apps/plugins/puzzles/icons/galaxies.sav
+++ b/apps/plugins/puzzles/src/icons/galaxies.sav
diff --git a/apps/plugins/puzzles/icons/guess.sav b/apps/plugins/puzzles/src/icons/guess.sav
index 69852bf769..69852bf769 100644
--- a/apps/plugins/puzzles/icons/guess.sav
+++ b/apps/plugins/puzzles/src/icons/guess.sav
diff --git a/apps/plugins/puzzles/icons/icon.pl b/apps/plugins/puzzles/src/icons/icon.pl
index fcb1aa3e2c..fcb1aa3e2c 100755
--- a/apps/plugins/puzzles/icons/icon.pl
+++ b/apps/plugins/puzzles/src/icons/icon.pl
diff --git a/apps/plugins/puzzles/icons/inertia.sav b/apps/plugins/puzzles/src/icons/inertia.sav
index a6d6faed1b..a6d6faed1b 100644
--- a/apps/plugins/puzzles/icons/inertia.sav
+++ b/apps/plugins/puzzles/src/icons/inertia.sav
diff --git a/apps/plugins/puzzles/icons/keen.sav b/apps/plugins/puzzles/src/icons/keen.sav
index 4adbd42d17..4adbd42d17 100644
--- a/apps/plugins/puzzles/icons/keen.sav
+++ b/apps/plugins/puzzles/src/icons/keen.sav
diff --git a/apps/plugins/puzzles/icons/lightup.sav b/apps/plugins/puzzles/src/icons/lightup.sav
index 21b59bdec4..21b59bdec4 100644
--- a/apps/plugins/puzzles/icons/lightup.sav
+++ b/apps/plugins/puzzles/src/icons/lightup.sav
diff --git a/apps/plugins/puzzles/icons/loopy.sav b/apps/plugins/puzzles/src/icons/loopy.sav
index 11611818af..11611818af 100644
--- a/apps/plugins/puzzles/icons/loopy.sav
+++ b/apps/plugins/puzzles/src/icons/loopy.sav
diff --git a/apps/plugins/puzzles/icons/magnets.sav b/apps/plugins/puzzles/src/icons/magnets.sav
index 3c317b70ce..3c317b70ce 100644
--- a/apps/plugins/puzzles/icons/magnets.sav
+++ b/apps/plugins/puzzles/src/icons/magnets.sav
diff --git a/apps/plugins/puzzles/icons/map.sav b/apps/plugins/puzzles/src/icons/map.sav
index 33863e1eeb..33863e1eeb 100644
--- a/apps/plugins/puzzles/icons/map.sav
+++ b/apps/plugins/puzzles/src/icons/map.sav
diff --git a/apps/plugins/puzzles/icons/mines.sav b/apps/plugins/puzzles/src/icons/mines.sav
index a827541163..a827541163 100644
--- a/apps/plugins/puzzles/icons/mines.sav
+++ b/apps/plugins/puzzles/src/icons/mines.sav
diff --git a/apps/plugins/puzzles/icons/net.sav b/apps/plugins/puzzles/src/icons/net.sav
index 06a5426280..06a5426280 100644
--- a/apps/plugins/puzzles/icons/net.sav
+++ b/apps/plugins/puzzles/src/icons/net.sav
diff --git a/apps/plugins/puzzles/icons/netslide.sav b/apps/plugins/puzzles/src/icons/netslide.sav
index f37178ee0c..f37178ee0c 100644
--- a/apps/plugins/puzzles/icons/netslide.sav
+++ b/apps/plugins/puzzles/src/icons/netslide.sav
diff --git a/apps/plugins/puzzles/icons/palisade.sav b/apps/plugins/puzzles/src/icons/palisade.sav
index a935e890bb..a935e890bb 100644
--- a/apps/plugins/puzzles/icons/palisade.sav
+++ b/apps/plugins/puzzles/src/icons/palisade.sav
diff --git a/apps/plugins/puzzles/icons/pattern.sav b/apps/plugins/puzzles/src/icons/pattern.sav
index 97c2396052..97c2396052 100644
--- a/apps/plugins/puzzles/icons/pattern.sav
+++ b/apps/plugins/puzzles/src/icons/pattern.sav
diff --git a/apps/plugins/puzzles/icons/pearl.sav b/apps/plugins/puzzles/src/icons/pearl.sav
index 730ca85149..730ca85149 100644
--- a/apps/plugins/puzzles/icons/pearl.sav
+++ b/apps/plugins/puzzles/src/icons/pearl.sav
diff --git a/apps/plugins/puzzles/icons/pegs.sav b/apps/plugins/puzzles/src/icons/pegs.sav
index 22b8a0d82f..22b8a0d82f 100644
--- a/apps/plugins/puzzles/icons/pegs.sav
+++ b/apps/plugins/puzzles/src/icons/pegs.sav
diff --git a/apps/plugins/puzzles/icons/range.sav b/apps/plugins/puzzles/src/icons/range.sav
index 708e7db248..708e7db248 100644
--- a/apps/plugins/puzzles/icons/range.sav
+++ b/apps/plugins/puzzles/src/icons/range.sav
diff --git a/apps/plugins/puzzles/icons/rect.sav b/apps/plugins/puzzles/src/icons/rect.sav
index 17264daeeb..17264daeeb 100644
--- a/apps/plugins/puzzles/icons/rect.sav
+++ b/apps/plugins/puzzles/src/icons/rect.sav
diff --git a/apps/plugins/puzzles/icons/samegame.sav b/apps/plugins/puzzles/src/icons/samegame.sav
index f92b52d1b6..f92b52d1b6 100644
--- a/apps/plugins/puzzles/icons/samegame.sav
+++ b/apps/plugins/puzzles/src/icons/samegame.sav
diff --git a/apps/plugins/puzzles/icons/screenshot.sh b/apps/plugins/puzzles/src/icons/screenshot.sh
index 0e2a06eea7..0e2a06eea7 100755
--- a/apps/plugins/puzzles/icons/screenshot.sh
+++ b/apps/plugins/puzzles/src/icons/screenshot.sh
diff --git a/apps/plugins/puzzles/icons/signpost.sav b/apps/plugins/puzzles/src/icons/signpost.sav
index 9ad1958ddf..9ad1958ddf 100644
--- a/apps/plugins/puzzles/icons/signpost.sav
+++ b/apps/plugins/puzzles/src/icons/signpost.sav
diff --git a/apps/plugins/puzzles/icons/singles.sav b/apps/plugins/puzzles/src/icons/singles.sav
index 260fd1f2b3..260fd1f2b3 100644
--- a/apps/plugins/puzzles/icons/singles.sav
+++ b/apps/plugins/puzzles/src/icons/singles.sav
diff --git a/apps/plugins/puzzles/icons/sixteen.sav b/apps/plugins/puzzles/src/icons/sixteen.sav
index 076b1fbd4d..076b1fbd4d 100644
--- a/apps/plugins/puzzles/icons/sixteen.sav
+++ b/apps/plugins/puzzles/src/icons/sixteen.sav
diff --git a/apps/plugins/puzzles/icons/slant.sav b/apps/plugins/puzzles/src/icons/slant.sav
index 02017e5d48..02017e5d48 100644
--- a/apps/plugins/puzzles/icons/slant.sav
+++ b/apps/plugins/puzzles/src/icons/slant.sav
diff --git a/apps/plugins/puzzles/icons/solo.sav b/apps/plugins/puzzles/src/icons/solo.sav
index 385cc68fe5..385cc68fe5 100644
--- a/apps/plugins/puzzles/icons/solo.sav
+++ b/apps/plugins/puzzles/src/icons/solo.sav
diff --git a/apps/plugins/puzzles/icons/square.pl b/apps/plugins/puzzles/src/icons/square.pl
index 815b94b532..815b94b532 100755
--- a/apps/plugins/puzzles/icons/square.pl
+++ b/apps/plugins/puzzles/src/icons/square.pl
diff --git a/apps/plugins/puzzles/icons/tents.sav b/apps/plugins/puzzles/src/icons/tents.sav
index 292c2d2d75..292c2d2d75 100644
--- a/apps/plugins/puzzles/icons/tents.sav
+++ b/apps/plugins/puzzles/src/icons/tents.sav
diff --git a/apps/plugins/puzzles/icons/towers.sav b/apps/plugins/puzzles/src/icons/towers.sav
index 351d473a63..351d473a63 100644
--- a/apps/plugins/puzzles/icons/towers.sav
+++ b/apps/plugins/puzzles/src/icons/towers.sav
diff --git a/apps/plugins/puzzles/icons/tracks.sav b/apps/plugins/puzzles/src/icons/tracks.sav
index ca30644506..ca30644506 100644
--- a/apps/plugins/puzzles/icons/tracks.sav
+++ b/apps/plugins/puzzles/src/icons/tracks.sav
diff --git a/apps/plugins/puzzles/icons/twiddle.sav b/apps/plugins/puzzles/src/icons/twiddle.sav
index 2863033f99..2863033f99 100644
--- a/apps/plugins/puzzles/icons/twiddle.sav
+++ b/apps/plugins/puzzles/src/icons/twiddle.sav
diff --git a/apps/plugins/puzzles/icons/undead.sav b/apps/plugins/puzzles/src/icons/undead.sav
index 3c314dde8a..3c314dde8a 100644
--- a/apps/plugins/puzzles/icons/undead.sav
+++ b/apps/plugins/puzzles/src/icons/undead.sav
diff --git a/apps/plugins/puzzles/icons/unequal.sav b/apps/plugins/puzzles/src/icons/unequal.sav
index c414513a22..c414513a22 100644
--- a/apps/plugins/puzzles/icons/unequal.sav
+++ b/apps/plugins/puzzles/src/icons/unequal.sav
diff --git a/apps/plugins/puzzles/icons/unruly.sav b/apps/plugins/puzzles/src/icons/unruly.sav
index 0f7ca1b9dd..0f7ca1b9dd 100644
--- a/apps/plugins/puzzles/icons/unruly.sav
+++ b/apps/plugins/puzzles/src/icons/unruly.sav
diff --git a/apps/plugins/puzzles/icons/untangle.sav b/apps/plugins/puzzles/src/icons/untangle.sav
index 016318a521..016318a521 100644
--- a/apps/plugins/puzzles/icons/untangle.sav
+++ b/apps/plugins/puzzles/src/icons/untangle.sav
diff --git a/apps/plugins/puzzles/icons/win16pal.xpm b/apps/plugins/puzzles/src/icons/win16pal.xpm
index 66fd60a480..66fd60a480 100644
--- a/apps/plugins/puzzles/icons/win16pal.xpm
+++ b/apps/plugins/puzzles/src/icons/win16pal.xpm
diff --git a/apps/plugins/puzzles/src/index.html b/apps/plugins/puzzles/src/index.html
new file mode 100644
index 0000000000..460883a32c
--- /dev/null
+++ b/apps/plugins/puzzles/src/index.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Simon Tatham's Portable Puzzle Collection</title>
+<link rel="index" href="docindex.html">
+<link rel="next" href="intro.html">
+<meta name="AppleTitle" content="Puzzles Help"></head>
+<body>
+<p>Previous | Contents | <a href="docindex.html">Index</a> | <a href="intro.html">Next</a></p>
+<h1>Simon Tatham's Portable Puzzle Collection</h1>
+<p>
+This is a collection of small one-player puzzle games.
+</p>
+<p>
+This manual is copyright 2004-2014 Simon Tatham. All rights reserved. You may distribute this documentation under the MIT licence. See <a href="licence.html#AA">appendix A</a> for the licence text in full.
+</p>
+
+<ul>
+<li><a href="intro.html#C1">Chapter 1: Introduction</a></li>
+<li><a href="common.html#C2">Chapter 2: Common features</a></li>
+<li><a href="net.html#C3">Chapter 3: Net</a></li>
+<li><a href="cube.html#C4">Chapter 4: Cube</a></li>
+<li><a href="fifteen.html#C5">Chapter 5: Fifteen</a></li>
+<li><a href="sixteen.html#C6">Chapter 6: Sixteen</a></li>
+<li><a href="twiddle.html#C7">Chapter 7: Twiddle</a></li>
+<li><a href="rect.html#C8">Chapter 8: Rectangles</a></li>
+<li><a href="netslide.html#C9">Chapter 9: Netslide</a></li>
+<li><a href="pattern.html#C10">Chapter 10: Pattern</a></li>
+<li><a href="solo.html#C11">Chapter 11: Solo</a></li>
+<li><a href="mines.html#C12">Chapter 12: Mines</a></li>
+<li><a href="samegame.html#C13">Chapter 13: Same Game</a></li>
+<li><a href="flip.html#C14">Chapter 14: Flip</a></li>
+<li><a href="guess.html#C15">Chapter 15: Guess</a></li>
+<li><a href="pegs.html#C16">Chapter 16: Pegs</a></li>
+<li><a href="dominosa.html#C17">Chapter 17: Dominosa</a></li>
+<li><a href="untangle.html#C18">Chapter 18: Untangle</a></li>
+<li><a href="blackbox.html#C19">Chapter 19: Black Box</a></li>
+<li><a href="slant.html#C20">Chapter 20: Slant</a></li>
+<li><a href="lightup.html#C21">Chapter 21: Light Up</a></li>
+<li><a href="map.html#C22">Chapter 22: Map</a></li>
+<li><a href="loopy.html#C23">Chapter 23: Loopy</a></li>
+<li><a href="inertia.html#C24">Chapter 24: Inertia</a></li>
+<li><a href="tents.html#C25">Chapter 25: Tents</a></li>
+<li><a href="bridges.html#C26">Chapter 26: Bridges</a></li>
+<li><a href="unequal.html#C27">Chapter 27: Unequal</a></li>
+<li><a href="galaxies.html#C28">Chapter 28: Galaxies</a></li>
+<li><a href="filling.html#C29">Chapter 29: Filling</a></li>
+<li><a href="keen.html#C30">Chapter 30: Keen</a></li>
+<li><a href="towers.html#C31">Chapter 31: Towers</a></li>
+<li><a href="singles.html#C32">Chapter 32: Singles</a></li>
+<li><a href="magnets.html#C33">Chapter 33: Magnets</a></li>
+<li><a href="signpost.html#C34">Chapter 34: Signpost</a></li>
+<li><a href="range.html#C35">Chapter 35: Range</a></li>
+<li><a href="pearl.html#C36">Chapter 36: Pearl</a></li>
+<li><a href="undead.html#C37">Chapter 37: Undead</a></li>
+<li><a href="unruly.html#C38">Chapter 38: Unruly</a></li>
+<li><a href="flood.html#C39">Chapter 39: Flood</a></li>
+<li><a href="tracks.html#C40">Chapter 40: Tracks</a></li>
+<li><a href="palisade.html#C41">Chapter 41: Palisade</a></li>
+<li><a href="licence.html#AA">Appendix A: Licence</a></li>
+<li><a href="docindex.html#Index">Index</a></li>
+</ul>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/inertia.R b/apps/plugins/puzzles/src/inertia.R
index e6e86beaec..e6e86beaec 100644
--- a/apps/plugins/puzzles/inertia.R
+++ b/apps/plugins/puzzles/src/inertia.R
diff --git a/apps/plugins/puzzles/inertia.c b/apps/plugins/puzzles/src/inertia.c
index a0e1c45fb1..c22d2e17d4 100644
--- a/apps/plugins/puzzles/inertia.c
+++ b/apps/plugins/puzzles/src/inertia.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2213,7 +2213,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Inertia", "games.inertia", "inertia",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/inertia.html b/apps/plugins/puzzles/src/inertia.html
new file mode 100644
index 0000000000..a8cca75c37
--- /dev/null
+++ b/apps/plugins/puzzles/src/inertia.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Inertia</title>
+<link rel="previous" href="loopy.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="tents.html">
+</head>
+<body>
+<p><a href="loopy.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="tents.html">Next</a></p>
+<h1><a name="C24"></a>Chapter 24: <a name="i0"></a>Inertia</h1>
+<p>
+You are a small green ball sitting in a grid full of obstacles. Your aim is to collect all the gems without running into any mines.
+</p>
+<p>
+You can move the ball in any orthogonal <em>or diagonal</em> direction. Once the ball starts moving, it will continue until something stops it. A wall directly in its path will stop it (but if it is moving diagonally, it will move through a diagonal gap between two other walls without stopping). Also, some of the squares are &#8216;stops&#8217;; when the ball moves on to a stop, it will stop moving no matter what direction it was going in. Gems do <em>not</em> stop the ball; it picks them up and keeps on going.
+</p>
+<p>
+Running into a mine is fatal. Even if you picked up the last gem in the same move which then hit a mine, the game will count you as dead rather than victorious.
+</p>
+<p>
+This game was originally implemented for Windows by Ben Olmstead <a href="#p0">[11]</a>, who was kind enough to release his source code on request so that it could be re-implemented for this collection.
+</p>
+<p><a name="p0"></a>
+[11] <a href="http://xn13.com/"><code>http://xn13.com/</code></a>
+</p>
+<h2><a name="S24.1"></a>24.1 <a name="i1"></a>Inertia controls</h2>
+<p>
+You can move the ball in any of the eight directions using the numeric keypad. Alternatively, if you click the left mouse button on the grid, the ball will begin a move in the general direction of where you clicked.
+</p>
+<p>
+If you use the &#8216;Solve&#8217; function on this game, the program will compute a path through the grid which collects all the remaining gems and returns to the current position. A hint arrow will appear on the ball indicating the direction in which you should move to begin on this path. If you then move in that direction, the arrow will update to indicate the next direction on the path. You can also press Space to automatically move in the direction of the hint arrow. If you move in a different direction from the one shown by the arrow, arrows will be shown only if the puzzle is still solvable.
+</p>
+<p>
+All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available. In particular, if you do run into a mine and die, you can use the Undo function and resume playing from before the fatal move. The game will keep track of the number of times you have done this.
+</p>
+<h2><a name="S24.2"></a>24.2 <a name="i2"></a>Inertia parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/src/install-sh b/apps/plugins/puzzles/src/install-sh
new file mode 100755
index 0000000000..0b0fdcbba6
--- /dev/null
+++ b/apps/plugins/puzzles/src/install-sh
@@ -0,0 +1,501 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2013-12-25.23; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# 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
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+tab='   '
+nl='
+'
+IFS=" $tab$nl"
+
+# Set DOITPROG to "echo" to test this script.
+
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+is_target_a_directory=possibly
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
+
+    -o) chowncmd="$chownprog $2"
+        shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+
+    -T) is_target_a_directory=never;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --) shift
+        break;;
+
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      dstdir=`dirname "$dst"`
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            if (umask $mkdir_umask &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/d" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      set -f
+      set fnord $dstdir
+      shift
+      set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/apps/plugins/puzzles/src/intro.html b/apps/plugins/puzzles/src/intro.html
new file mode 100644
index 0000000000..cf82c837de
--- /dev/null
+++ b/apps/plugins/puzzles/src/intro.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Introduction</title>
+<link rel="previous" href="index.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="common.html">
+</head>
+<body>
+<p><a href="index.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="common.html">Next</a></p>
+<h1><a name="C1"></a>Chapter 1: Introduction</h1>
+<p>
+I wrote this collection because I thought there should be more small desktop toys available: little games you can pop up in a window and play for two or three minutes while you take a break from whatever else you were doing. And I was also annoyed that every time I found a good game on (say) <a name="i0"></a>Unix, it wasn't available the next time I was sitting at a <a name="i1"></a>Windows machine, or vice versa; so I arranged that everything in my personal puzzle collection will happily run on both, and have more recently done a port to <a name="i2"></a>Mac OS X as well. When I find (or perhaps invent) further puzzle games that I like, they'll be added to this collection and will immediately be available on both platforms. And if anyone feels like writing any other front ends &#8211; PocketPC, Mac OS pre-10, or whatever it might be &#8211; then all the games in this framework will immediately become available on another platform as well.
+</p>
+<p>
+The actual games in this collection were mostly not my invention; they are re-implementations of existing game concepts within my portable puzzle framework. I do not claim credit, in general, for inventing the rules of any of these puzzles. (I don't even claim authorship of all the code; some of the puzzles have been submitted by other authors.)
+</p>
+<p>
+This collection is distributed under the <a name="i3"></a>MIT licence (see <a href="licence.html#AA">appendix A</a>). This means that you can do pretty much anything you like with the game binaries or the code, except pretending you wrote them yourself, or suing me if anything goes wrong.
+</p>
+<p>
+The most recent versions, and <a name="i4"></a>source code, can be found at <a name="i5"></a><a href="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"><code>http://www.chiark.greenend.org.uk/~sgtatham/puzzles/</code></a>.
+</p>
+<p>
+Please report <a name="i6"></a><a name="i7"></a>bugs to <a href="mailto:anakin@pobox.com"><code>anakin@pobox.com</code></a>. You might find it helpful to read this article before reporting a bug:
+</p>
+<p>
+<a href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html"><code>http://www.chiark.greenend.org.uk/~sgtatham/bugs.html</code></a>
+</p>
+<p>
+<a name="i8"></a>Patches are welcome. Especially if they provide a new front end (to make all these games run on another platform), or a new game.
+</p>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/keen.R b/apps/plugins/puzzles/src/keen.R
index 77609bc7fa..77609bc7fa 100644
--- a/apps/plugins/puzzles/keen.R
+++ b/apps/plugins/puzzles/src/keen.R
diff --git a/apps/plugins/puzzles/keen.c b/apps/plugins/puzzles/src/keen.c
index 32d6288f88..fdaae32e5d 100644
--- a/apps/plugins/puzzles/keen.c
+++ b/apps/plugins/puzzles/src/keen.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2340,7 +2340,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Keen", "games.keen", "keen",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/keen.html b/apps/plugins/puzzles/src/keen.html
new file mode 100644
index 0000000000..062f0dd728
--- /dev/null
+++ b/apps/plugins/puzzles/src/keen.html
@@ -0,0 +1,102 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Keen</title>
+<link rel="previous" href="filling.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="towers.html">
+</head>
+<body>
+<p><a href="filling.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="towers.html">Next</a></p>
+<h1><a name="C30"></a>Chapter 30: <a name="i0"></a>Keen</h1>
+<p>
+You have a square grid; each square may contain a digit from 1 to the size of the grid. The grid is divided into blocks of varying shape and size, with arithmetic clues written in them. Your aim is to fully populate the grid with digits such that:
+</p>
+<ul><li>
+Each row contains only one occurrence of each digit
+</li>
+<li>
+Each column contains only one occurrence of each digit
+</li>
+<li>
+The digits in each block can be combined to form the number stated in the clue, using the arithmetic operation given in the clue. That is:
+<ul><li>
+An addition clue means that the sum of the digits in the block must be the given number. For example, &#8216;15+&#8217; means the contents of the block adds up to fifteen.
+</li>
+<li>
+A multiplication clue (e.g. &#8216;60&#215;&#8217;), similarly, means that the product of the digits in the block must be the given number.
+</li>
+<li>
+A subtraction clue will always be written in a block of size two, and it means that one of the digits in the block is greater than the other by the given amount. For example, &#8216;2&#8722;&#8217; means that one of the digits in the block is 2 more than the other, or equivalently that one digit minus the other one is 2. The two digits could be either way round, though.
+</li>
+<li>
+A division clue (e.g. &#8216;3&#247;&#8217;), similarly, is always in a block of size two and means that one digit divided by the other is equal to the given amount.
+</li>
+</ul>
+<p>
+Note that a block may contain the same digit more than once (provided the identical ones are not in the same row and column). This rule is precisely the opposite of the rule in Solo's &#8216;Killer&#8217; mode (see <a href="solo.html#C11">chapter 11</a>).
+</p>
+
+</li>
+</ul>
+<p>
+This puzzle appears in the Times under the name &#8216;<a name="i1"></a>KenKen&#8217;.
+</p>
+<h2><a name="S30.1"></a>30.1 <a name="i2"></a>Keen controls</h2>
+<p>
+Keen shares much of its control system with Solo (and Unequal).
+</p>
+<p>
+To play Keen, simply click the mouse in any empty square and then type a digit on the keyboard to fill that square. If you make a mistake, click the mouse in the incorrect square and press Space to clear it again (or use the Undo feature).
+</p>
+<p>
+If you <em>right</em>-click in a square and then type a number, that number will be entered in the square as a &#8216;pencil mark&#8217;. You can have pencil marks for multiple numbers in the same square. Squares containing filled-in numbers cannot also contain pencil marks.
+</p>
+<p>
+The game pays no attention to pencil marks, so exactly what you use them for is up to you: you can use them as reminders that a particular square needs to be re-examined once you know more about a particular number, or you can use them as lists of the possible numbers in a given square, or anything else you feel like.
+</p>
+<p>
+To erase a single pencil mark, right-click in the square and type the same number again.
+</p>
+<p>
+All pencil marks in a square are erased when you left-click and type a number, or when you left-click and press space. Right-clicking and pressing space will also erase pencil marks.
+</p>
+<p>
+As for Solo, the cursor keys can be used in conjunction with the digit keys to set numbers or pencil marks. Use the cursor keys to move a highlight around the grid, and type a digit to enter it in the highlighted square. Pressing return toggles the highlight into a mode in which you can enter or remove pencil marks.
+</p>
+<p>
+Pressing M will fill in a full set of pencil marks in every square that does not have a main digit in it.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S30.2"></a>30.2 <a name="i3"></a>Keen parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Grid size</em>
+</dt>
+<dd>
+Specifies the size of the grid. Lower limit is 3; upper limit is 9 (because the user interface would become more difficult with &#8216;digits&#8217; bigger than 9!).
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle. At Unreasonable level, some backtracking will be required, but the solution should still be unique. The remaining levels require increasingly complex reasoning to avoid having to backtrack.
+</dd>
+<dt>
+<em>Multiplication only</em>
+</dt>
+<dd>
+If this is enabled, all boxes will be multiplication boxes. With this rule, the puzzle is known as &#8216;Inshi No Heya&#8217;.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/latin.c b/apps/plugins/puzzles/src/latin.c
index f7e97a7fa6..03d78aff1f 100644
--- a/apps/plugins/puzzles/latin.c
+++ b/apps/plugins/puzzles/src/latin.c
@@ -1,4 +1,4 @@
-#include "rbassert.h"
+#include <assert.h>
 #include <string.h>
 #include <stdarg.h>
 
diff --git a/apps/plugins/puzzles/latin.h b/apps/plugins/puzzles/src/latin.h
index 4b09f16ce1..4b09f16ce1 100644
--- a/apps/plugins/puzzles/latin.h
+++ b/apps/plugins/puzzles/src/latin.h
diff --git a/apps/plugins/puzzles/laydomino.c b/apps/plugins/puzzles/src/laydomino.c
index 458027020b..cead5d5a7f 100644
--- a/apps/plugins/puzzles/laydomino.c
+++ b/apps/plugins/puzzles/src/laydomino.c
@@ -5,7 +5,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "rbassert.h"
+#include <assert.h>
 
 #include "puzzles.h"
 
diff --git a/apps/plugins/puzzles/src/licence.html b/apps/plugins/puzzles/src/licence.html
new file mode 100644
index 0000000000..17501348e4
--- /dev/null
+++ b/apps/plugins/puzzles/src/licence.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Licence</title>
+<link rel="previous" href="palisade.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="docindex.html">
+</head>
+<body>
+<p><a href="palisade.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="docindex.html">Next</a></p>
+<h1><a name="AA"></a>Appendix A: <a name="i0"></a><a name="i1"></a>Licence</h1>
+<p>
+This software is <a name="i2"></a>copyright 2004-2014 Simon Tatham.
+</p>
+<p>
+Portions copyright Richard Boulton, James Harvey, Mike Pinna, Jonas K&#246;lker, Dariusz Olszewski, Michael Schierl, Lambros Lambrou, Bernd Schmidt, Steffen Bauer, Lennard Sprong and Rogier Goossens.
+</p>
+<p>
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &#8216;Software&#8217;), 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:
+</p>
+<p>
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+</p>
+<p>
+THE SOFTWARE IS PROVIDED &#8216;AS IS&#8217;, 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.
+</p>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/lightup.R b/apps/plugins/puzzles/src/lightup.R
index a474de815d..a474de815d 100644
--- a/apps/plugins/puzzles/lightup.R
+++ b/apps/plugins/puzzles/src/lightup.R
diff --git a/apps/plugins/puzzles/lightup.c b/apps/plugins/puzzles/src/lightup.c
index 9ca37b19d2..4dd46c8392 100644
--- a/apps/plugins/puzzles/lightup.c
+++ b/apps/plugins/puzzles/src/lightup.c
@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2290,7 +2290,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Light Up", "games.lightup", "lightup",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/lightup.html b/apps/plugins/puzzles/src/lightup.html
new file mode 100644
index 0000000000..8cf1befa40
--- /dev/null
+++ b/apps/plugins/puzzles/src/lightup.html
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Light Up</title>
+<link rel="previous" href="slant.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="map.html">
+</head>
+<body>
+<p><a href="slant.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="map.html">Next</a></p>
+<h1><a name="C21"></a>Chapter 21: <a name="i0"></a>Light Up</h1>
+<p>
+You have a grid of squares. Some are filled in black; some of the black squares are numbered. Your aim is to &#8216;light up&#8217; all the empty squares by placing light bulbs in some of them.
+</p>
+<p>
+Each light bulb illuminates the square it is on, plus all squares in line with it horizontally or vertically unless a black square is blocking the way.
+</p>
+<p>
+To win the game, you must satisfy the following conditions:
+</p>
+<ul><li>
+All non-black squares are lit.
+</li>
+<li>
+No light is lit by another light.
+</li>
+<li>
+All numbered black squares have exactly that number of lights adjacent to them (in the four squares above, below, and to the side).
+</li>
+</ul>
+<p>
+Non-numbered black squares may have any number of lights adjacent to them.
+</p>
+<p>
+Credit for this puzzle goes to <a name="i1"></a>Nikoli <a href="#p0">[9]</a>.
+</p>
+<p>
+Light Up was contributed to this collection by James Harvey.
+</p>
+<p><a name="p0"></a>
+[9] <a href="http://www.nikoli.co.jp/en/puzzles/akari.html"><code>http://www.nikoli.co.jp/en/puzzles/akari.html</code></a> (beware of Flash)
+</p>
+<h2><a name="S21.1"></a>21.1 <a name="i2"></a>Light Up controls</h2>
+<p>
+Left-clicking in a non-black square will toggle the presence of a light in that square. Right-clicking in a non-black square toggles a mark there to aid solving; it can be used to highlight squares that cannot be lit, for example.
+</p>
+<p>
+You may not place a light in a marked square, nor place a mark in a lit square.
+</p>
+<p>
+The game will highlight obvious errors in red. Lights lit by other lights are highlighted in this way, as are numbered squares which do not (or cannot) have the right number of lights next to them.
+</p>
+<p>
+Thus, the grid is solved when all non-black squares have yellow highlights and there are no red lights.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S21.2"></a>21.2 <a name="i3"></a>Light Up parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>%age of black squares</em>
+</dt>
+<dd>
+Rough percentage of black squares in the grid.
+<p>
+This is a hint rather than an instruction. If the grid generator is unable to generate a puzzle to this precise specification, it will increase the proportion of black squares until it can.
+</p>
+
+</dd>
+<dt>
+<em>Symmetry</em>
+</dt>
+<dd>
+Allows you to specify the required symmetry of the black squares in the grid. (This does not affect the difficulty of the puzzles noticeably.)
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+&#8216;Easy&#8217; means that the puzzles should be soluble without backtracking or guessing, &#8216;Hard&#8217; means that some guesses will probably be necessary.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/list.c b/apps/plugins/puzzles/src/list.c
index ec019c31b2..ec019c31b2 100644
--- a/apps/plugins/puzzles/list.c
+++ b/apps/plugins/puzzles/src/list.c
diff --git a/apps/plugins/puzzles/loopgen.c b/apps/plugins/puzzles/src/loopgen.c
index 25b63906fa..0b6990455f 100644
--- a/apps/plugins/puzzles/loopgen.c
+++ b/apps/plugins/puzzles/src/loopgen.c
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
diff --git a/apps/plugins/puzzles/loopgen.h b/apps/plugins/puzzles/src/loopgen.h
index 079c87c576..079c87c576 100644
--- a/apps/plugins/puzzles/loopgen.h
+++ b/apps/plugins/puzzles/src/loopgen.h
diff --git a/apps/plugins/puzzles/loopy.R b/apps/plugins/puzzles/src/loopy.R
index f44560095d..f44560095d 100644
--- a/apps/plugins/puzzles/loopy.R
+++ b/apps/plugins/puzzles/src/loopy.R
diff --git a/apps/plugins/puzzles/loopy.c b/apps/plugins/puzzles/src/loopy.c
index a931b31c37..652b9ecc09 100644
--- a/apps/plugins/puzzles/loopy.c
+++ b/apps/plugins/puzzles/src/loopy.c
@@ -75,7 +75,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -243,32 +243,55 @@ static void check_caches(const solver_state* sstate);
 #define check_caches(s)
 #endif
 
-/* ------- List of grid generators ------- */
-#define GRIDLIST(A) \
-    A(Squares,GRID_SQUARE,3,3) \
-    A(Triangular,GRID_TRIANGULAR,3,3) \
-    A(Honeycomb,GRID_HONEYCOMB,3,3) \
-    A(Snub-Square,GRID_SNUBSQUARE,3,3) \
-    A(Cairo,GRID_CAIRO,3,4) \
-    A(Great-Hexagonal,GRID_GREATHEXAGONAL,3,3) \
-    A(Octagonal,GRID_OCTAGONAL,3,3) \
-    A(Kites,GRID_KITE,3,3) \
-    A(Floret,GRID_FLORET,1,2) \
-    A(Dodecagonal,GRID_DODECAGONAL,2,2) \
-    A(Great-Dodecagonal,GRID_GREATDODECAGONAL,2,2) \
-    A(Penrose (kite/dart),GRID_PENROSE_P2,3,3) \
-    A(Penrose (rhombs),GRID_PENROSE_P3,3,3)
-
-#define GRID_NAME(title,type,amin,omin) #title,
-#define GRID_CONFIG(title,type,amin,omin) ":" #title
-#define GRID_TYPE(title,type,amin,omin) type,
+/*
+ * Grid type config options available in Loopy.
+ *
+ * Annoyingly, we have to use an enum here which doesn't match up
+ * exactly to the grid-type enum in grid.h. Values in params->types
+ * are given by names such as LOOPY_GRID_SQUARE, which shouldn't be
+ * confused with GRID_SQUARE which is the value you pass to grid_new()
+ * and friends. So beware!
+ *
+ * (This is partly for historical reasons - Loopy's version of the
+ * enum is encoded in game parameter strings, so we keep it for
+ * backwards compatibility. But also, we need to store additional data
+ * here alongside each enum value, such as names for the presets menu,
+ * which isn't stored in grid.h; so we have to have our own list macro
+ * here anyway, and C doesn't make it easy to enforce that that lines
+ * up exactly with grid.h.)
+ *
+ * Do not add values to this list _except_ at the end, or old game ids
+ * will stop working!
+ */
+#define GRIDLIST(A)                                             \
+    A("Squares",SQUARE,3,3)                                     \
+    A("Triangular",TRIANGULAR,3,3)                              \
+    A("Honeycomb",HONEYCOMB,3,3)                                \
+    A("Snub-Square",SNUBSQUARE,3,3)                             \
+    A("Cairo",CAIRO,3,4)                                        \
+    A("Great-Hexagonal",GREATHEXAGONAL,3,3)                     \
+    A("Octagonal",OCTAGONAL,3,3)                                \
+    A("Kites",KITE,3,3)                                         \
+    A("Floret",FLORET,1,2)                                      \
+    A("Dodecagonal",DODECAGONAL,2,2)                            \
+    A("Great-Dodecagonal",GREATDODECAGONAL,2,2)                 \
+    A("Penrose (kite/dart)",PENROSE_P2,3,3)                     \
+    A("Penrose (rhombs)",PENROSE_P3,3,3)                        \
+    A("Great-Great-Dodecagonal",GREATGREATDODECAGONAL,2,2)      \
+    /* end of list */
+
+#define GRID_NAME(title,type,amin,omin) title,
+#define GRID_CONFIG(title,type,amin,omin) ":" title
+#define GRID_LOOPYTYPE(title,type,amin,omin) LOOPY_GRID_ ## type,
+#define GRID_GRIDTYPE(title,type,amin,omin) GRID_ ## type,
 #define GRID_SIZES(title,type,amin,omin) \
     {amin, omin, \
      "Width and height for this grid type must both be at least " #amin, \
      "At least one of width and height for this grid type must be at least " #omin,},
+enum { GRIDLIST(GRID_LOOPYTYPE) };
 static char const *const gridnames[] = { GRIDLIST(GRID_NAME) };
 #define GRID_CONFIGS GRIDLIST(GRID_CONFIG)
-static grid_type grid_types[] = { GRIDLIST(GRID_TYPE) };
+static grid_type grid_types[] = { GRIDLIST(GRID_GRIDTYPE) };
 #define NUM_GRID_TYPES (sizeof(grid_types) / sizeof(grid_types[0]))
 static const struct {
     int amin, omin;
@@ -490,61 +513,82 @@ static game_params *dup_params(const game_params *params)
     return ret;
 }
 
-static const game_params presets[] = {
+static const game_params loopy_presets_top[] = {
+#ifdef SMALL_SCREEN
+    {  7,  7, DIFF_EASY,   LOOPY_GRID_SQUARE },
+    {  7,  7, DIFF_NORMAL, LOOPY_GRID_SQUARE },
+    {  7,  7, DIFF_HARD,   LOOPY_GRID_SQUARE },
+    {  7,  7, DIFF_HARD,   LOOPY_GRID_TRIANGULAR },
+    {  5,  5, DIFF_HARD,   LOOPY_GRID_SNUBSQUARE },
+    {  7,  7, DIFF_HARD,   LOOPY_GRID_CAIRO },
+    {  5,  5, DIFF_HARD,   LOOPY_GRID_KITE },
+    {  6,  6, DIFF_HARD,   LOOPY_GRID_PENROSE_P2 },
+    {  6,  6, DIFF_HARD,   LOOPY_GRID_PENROSE_P3 },
+#else
+    {  7,  7, DIFF_EASY,   LOOPY_GRID_SQUARE },
+    { 10, 10, DIFF_EASY,   LOOPY_GRID_SQUARE },
+    {  7,  7, DIFF_NORMAL, LOOPY_GRID_SQUARE },
+    { 10, 10, DIFF_NORMAL, LOOPY_GRID_SQUARE },
+    {  7,  7, DIFF_HARD,   LOOPY_GRID_SQUARE },
+    { 10, 10, DIFF_HARD,   LOOPY_GRID_SQUARE },
+    { 12, 10, DIFF_HARD,   LOOPY_GRID_TRIANGULAR },
+    {  7,  7, DIFF_HARD,   LOOPY_GRID_SNUBSQUARE },
+    {  9,  9, DIFF_HARD,   LOOPY_GRID_CAIRO },
+    {  5,  5, DIFF_HARD,   LOOPY_GRID_KITE },
+    { 10, 10, DIFF_HARD,   LOOPY_GRID_PENROSE_P2 },
+    { 10, 10, DIFF_HARD,   LOOPY_GRID_PENROSE_P3 },
+#endif
+};
+
+static const game_params loopy_presets_more[] = {
 #ifdef SMALL_SCREEN
-    {  7,  7, DIFF_EASY, 0 },
-    {  7,  7, DIFF_NORMAL, 0 },
-    {  7,  7, DIFF_HARD, 0 },
-    {  7,  7, DIFF_HARD, 1 },
-    {  7,  7, DIFF_HARD, 2 },
-    {  5,  5, DIFF_HARD, 3 },
-    {  7,  7, DIFF_HARD, 4 },
-    {  5,  4, DIFF_HARD, 5 },
-    {  5,  5, DIFF_HARD, 6 },
-    {  5,  5, DIFF_HARD, 7 },
-    {  3,  3, DIFF_HARD, 8 },
-    {  3,  3, DIFF_HARD, 9 },
-    {  3,  3, DIFF_HARD, 10 },
-    {  6,  6, DIFF_HARD, 11 },
-    {  6,  6, DIFF_HARD, 12 },
+    {  7,  7, DIFF_HARD,   LOOPY_GRID_HONEYCOMB },
+    {  5,  4, DIFF_HARD,   LOOPY_GRID_GREATHEXAGONAL },
+    {  5,  5, DIFF_HARD,   LOOPY_GRID_OCTAGONAL },
+    {  3,  3, DIFF_HARD,   LOOPY_GRID_FLORET },
+    {  3,  3, DIFF_HARD,   LOOPY_GRID_DODECAGONAL },
+    {  3,  3, DIFF_HARD,   LOOPY_GRID_GREATDODECAGONAL },
+    {  3,  2, DIFF_HARD,   LOOPY_GRID_GREATGREATDODECAGONAL },
 #else
-    {  7,  7, DIFF_EASY, 0 },
-    {  10,  10, DIFF_EASY, 0 },
-    {  7,  7, DIFF_NORMAL, 0 },
-    {  10,  10, DIFF_NORMAL, 0 },
-    {  7,  7, DIFF_HARD, 0 },
-    {  10,  10, DIFF_HARD, 0 },
-    {  10,  10, DIFF_HARD, 1 },
-    {  12,  10, DIFF_HARD, 2 },
-    {  7,  7, DIFF_HARD, 3 },
-    {  9,  9, DIFF_HARD, 4 },
-    {  5,  4, DIFF_HARD, 5 },
-    {  7,  7, DIFF_HARD, 6 },
-    {  5,  5, DIFF_HARD, 7 },
-    {  5,  5, DIFF_HARD, 8 },
-    {  5,  4, DIFF_HARD, 9 },
-    {  5,  4, DIFF_HARD, 10 },
-    {  10, 10, DIFF_HARD, 11 },
-    {  10, 10, DIFF_HARD, 12 }
+    { 10, 10, DIFF_HARD,   LOOPY_GRID_HONEYCOMB },
+    {  5,  4, DIFF_HARD,   LOOPY_GRID_GREATHEXAGONAL },
+    {  7,  7, DIFF_HARD,   LOOPY_GRID_OCTAGONAL },
+    {  5,  5, DIFF_HARD,   LOOPY_GRID_FLORET },
+    {  5,  4, DIFF_HARD,   LOOPY_GRID_DODECAGONAL },
+    {  5,  4, DIFF_HARD,   LOOPY_GRID_GREATDODECAGONAL },
+    {  5,  3, DIFF_HARD,   LOOPY_GRID_GREATGREATDODECAGONAL },
 #endif
 };
 
-static int game_fetch_preset(int i, char **name, game_params **params)
+static void preset_menu_add_preset_with_title(struct preset_menu *menu,
+                                              const game_params *params)
 {
-    game_params *tmppar;
     char buf[80];
+    game_params *dup_params;
 
-    if (i < 0 || i >= lenof(presets))
-        return FALSE;
+    sprintf(buf, "%dx%d %s - %s", params->h, params->w,
+            gridnames[params->type], diffnames[params->diff]);
 
-    tmppar = snew(game_params);
-    *tmppar = presets[i];
-    *params = tmppar;
-    sprintf(buf, "%dx%d %s - %s", tmppar->h, tmppar->w,
-            gridnames[tmppar->type], diffnames[tmppar->diff]);
-    *name = dupstr(buf);
+    dup_params = snew(game_params);
+    *dup_params = *params;
 
-    return TRUE;
+    preset_menu_add_preset(menu, dupstr(buf), dup_params);
+}
+
+static struct preset_menu *game_preset_menu(void)
+{
+    struct preset_menu *top, *more;
+    int i;
+
+    top = preset_menu_new();
+    for (i = 0; i < lenof(loopy_presets_top); i++)
+        preset_menu_add_preset_with_title(top, &loopy_presets_top[i]);
+
+    more = preset_menu_add_submenu(top, dupstr("More..."));
+    for (i = 0; i < lenof(loopy_presets_more); i++)
+        preset_menu_add_preset_with_title(more, &loopy_presets_more[i]);
+
+    return top;
 }
 
 static void free_params(game_params *params)
@@ -2903,7 +2947,8 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     grid *g = state->game_grid;
     grid_edge *e;
     int i;
-    char *ret, buf[80];
+    char *movebuf;
+    int movelen, movesize;
     char button_char = ' ';
     enum line_state old_state;
 
@@ -2965,11 +3010,64 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         return NULL;
     }
 
+    movelen = 0;
+    movesize = 80;
+    movebuf = snewn(movesize, char);
+    movelen = sprintf(movebuf, "%d%c", i, (int)button_char);
+    {
+        static enum { OFF, FIXED, ADAPTIVE, DUNNO } autofollow = DUNNO;
+        if (autofollow == DUNNO) {
+            const char *env = getenv("LOOPY_AUTOFOLLOW");
+            if (env && !strcmp(env, "off"))
+                autofollow = OFF;
+            else if (env && !strcmp(env, "fixed"))
+                autofollow = FIXED;
+            else if (env && !strcmp(env, "adaptive"))
+                autofollow = ADAPTIVE;
+            else
+                autofollow = OFF;
+        }
 
-    sprintf(buf, "%d%c", i, (int)button_char);
-    ret = dupstr(buf);
+        if (autofollow != OFF) {
+            int dotid;
+            for (dotid = 0; dotid < 2; dotid++) {
+                grid_dot *dot = (dotid == 0 ? e->dot1 : e->dot2);
+                grid_edge *e_this = e;
+
+                while (1) {
+                    int j, n_found;
+                    grid_edge *e_next = NULL;
+
+                    for (j = n_found = 0; j < dot->order; j++) {
+                        grid_edge *e_candidate = dot->edges[j];
+                        int i_candidate = e_candidate - g->edges;
+                        if (e_candidate != e_this &&
+                            (autofollow == FIXED ||
+                             state->lines[i] == LINE_NO ||
+                             state->lines[i_candidate] != LINE_NO)) {
+                            e_next = e_candidate;
+                            n_found++;
+                        }
+                    }
 
-    return ret;
+                    if (n_found != 1 ||
+                        state->lines[e_next - g->edges] != state->lines[i])
+                        break;
+
+                    dot = (e_next->dot1 != dot ? e_next->dot1 : e_next->dot2);
+                    if (movelen > movesize - 40) {
+                        movesize = movesize * 5 / 4 + 128;
+                        movebuf = sresize(movebuf, movesize, char);
+                    }
+                    e_this = e_next;
+                    movelen += sprintf(movebuf+movelen, "%d%c",
+                                       (int)(e_this - g->edges), button_char);
+                }
+            }
+        }
+    }
+
+    return sresize(movebuf, movelen+1, char);
 }
 
 static game_state *execute_move(const game_state *state, const char *move)
@@ -3523,7 +3621,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Loopy", "games.loopy", "loopy",
     default_params,
-    game_fetch_preset,
+    NULL, game_preset_menu,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/loopy.html b/apps/plugins/puzzles/src/loopy.html
new file mode 100644
index 0000000000..6730e15664
--- /dev/null
+++ b/apps/plugins/puzzles/src/loopy.html
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Loopy</title>
+<link rel="previous" href="map.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="inertia.html">
+</head>
+<body>
+<p><a href="map.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="inertia.html">Next</a></p>
+<h1><a name="C23"></a>Chapter 23: <a name="i0"></a>Loopy</h1>
+<p>
+You are given a grid of dots, marked with yellow lines to indicate which dots you are allowed to connect directly together. Your aim is to use some subset of those yellow lines to draw a single unbroken loop from dot to dot within the grid.
+</p>
+<p>
+Some of the spaces between the lines contain numbers. These numbers indicate how many of the lines around that space form part of the loop. The loop you draw must correctly satisfy all of these clues to be considered a correct solution.
+</p>
+<p>
+In the default mode, the dots are arranged in a grid of squares; however, you can also play on triangular or hexagonal grids, or even more exotic ones.
+</p>
+<p>
+Credit for the basic puzzle idea goes to <a name="i1"></a>Nikoli <a href="#p0">[10]</a>.
+</p>
+<p>
+Loopy was originally contributed to this collection by Mike Pinna, and subsequently enhanced to handle various types of non-square grid by Lambros Lambrou.
+</p>
+<p><a name="p0"></a>
+[10] <a href="http://www.nikoli.co.jp/en/puzzles/slitherlink.html"><code>http://www.nikoli.co.jp/en/puzzles/slitherlink.html</code></a> (beware of Flash)
+</p>
+<h2><a name="S23.1"></a>23.1 <a name="i2"></a>Loopy controls</h2>
+<p>
+Click the left mouse button on a yellow line to turn it black, indicating that you think it is part of the loop. Click again to turn the line yellow again (meaning you aren't sure yet).
+</p>
+<p>
+If you are sure that a particular line segment is <em>not</em> part of the loop, you can click the right mouse button to remove it completely. Again, clicking a second time will turn the line back to yellow.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S23.2"></a>23.2 <a name="i3"></a>Loopy parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid, measured in number of regions across and down. For square grids, it's clear how this is counted; for other types of grid you may have to think a bit to see how the dimensions are measured.
+</dd>
+<dt>
+<em>Grid type</em>
+</dt>
+<dd>
+Allows you to choose between a selection of types of tiling. Some have all the faces the same but may have multiple different types of vertex (e.g. the <em>Cairo</em> or <em>Kites</em> mode); others have all the vertices the same but may have different types of face (e.g. the <em>Great Hexagonal</em>). The square, triangular and honeycomb grids are fully regular, and have all their vertices <em>and</em> faces the same; this makes them the least confusing to play.
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle. 
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/magnets.R b/apps/plugins/puzzles/src/magnets.R
index e55e4746ee..e55e4746ee 100644
--- a/apps/plugins/puzzles/magnets.R
+++ b/apps/plugins/puzzles/src/magnets.R
diff --git a/apps/plugins/puzzles/magnets.c b/apps/plugins/puzzles/src/magnets.c
index e51ae103c5..553ca0d0da 100644
--- a/apps/plugins/puzzles/magnets.c
+++ b/apps/plugins/puzzles/src/magnets.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2396,7 +2396,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Magnets", "games.magnets", "magnets",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/magnets.html b/apps/plugins/puzzles/src/magnets.html
new file mode 100644
index 0000000000..0e756f2555
--- /dev/null
+++ b/apps/plugins/puzzles/src/magnets.html
@@ -0,0 +1,76 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Magnets</title>
+<link rel="previous" href="singles.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="signpost.html">
+</head>
+<body>
+<p><a href="singles.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="signpost.html">Next</a></p>
+<h1><a name="C33"></a>Chapter 33: <a name="i0"></a>Magnets</h1>
+<p>
+A rectangular grid has been filled with a mixture of magnets (that is, dominoes with one positive end and one negative end) and blank dominoes (that is, dominoes with two neutral poles). These dominoes are initially only seen in silhouette. Around the grid are placed a number of clues indicating the number of positive and negative poles contained in certain columns and rows.
+</p>
+<p>
+Your aim is to correctly place the magnets and blank dominoes such that all the clues are satisfied, with the additional constraint that no two similar magnetic poles may be orthogonally adjacent (since they repel). Neutral poles do not repel, and can be adjacent to any other pole.
+</p>
+<p>
+Credit for this puzzle goes to <a name="i1"></a>Janko <a href="#p0">[16]</a>.
+</p>
+<p>
+Magnets was contributed to this collection by James Harvey.
+</p>
+<p><a name="p0"></a>
+[16] <a href="http://www.janko.at/Raetsel/Magnete/index.htm"><code>http://www.janko.at/Raetsel/Magnete/index.htm</code></a>
+</p>
+<h2><a name="S33.1"></a>33.1 <a name="i2"></a>Magnets controls</h2>
+<p>
+Left-clicking on an empty square places a magnet at that position with the positive pole on the square and the negative pole on the other half of the magnet; left-clicking again reverses the polarity, and a third click removes the magnet.
+</p>
+<p>
+Right-clicking on an empty square places a blank domino there. Right-clicking again places two question marks on the domino, signifying &#8216;this cannot be blank&#8217; (which can be useful to note deductions while solving), and right-clicking again empties the domino.
+</p>
+<p>
+Left-clicking a clue will mark it as done (grey it out), or unmark it if it is already marked.
+</p>
+<p>
+You can also use the cursor keys to move a cursor around the grid. Pressing the return key will lay a domino with a positive pole at that position; pressing again reverses the polarity and then removes the domino, as with left-clicking. Using the space bar allows placement of blank dominoes and cannot-be-blank hints, as for right-clicking.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S33.2"></a>33.2 <a name="i3"></a>Magnets parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares. There will be half <em>Width</em> &#215; <em>Height</em> dominoes in the grid: if this number is odd then one square will be blank.
+<p>
+(Grids with at least one odd dimension tend to be easier to solve.)
+</p>
+
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle. At Tricky level, you are required to make more deductions about empty dominoes and row/column counts.
+</dd>
+<dt>
+<em>Strip clues</em>
+</dt>
+<dd>
+If true, some of the clues around the grid are removed at generation time, making the puzzle more difficult.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/makedist.sh b/apps/plugins/puzzles/src/makedist.sh
index 22b4f5d0ae..22b4f5d0ae 100755
--- a/apps/plugins/puzzles/makedist.sh
+++ b/apps/plugins/puzzles/src/makedist.sh
diff --git a/apps/plugins/puzzles/src/malloc.c b/apps/plugins/puzzles/src/malloc.c
new file mode 100644
index 0000000000..a7fa7c5adc
--- /dev/null
+++ b/apps/plugins/puzzles/src/malloc.c
@@ -0,0 +1,53 @@
+/*
+ * malloc.c: safe wrappers around malloc, realloc, free, strdup
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "puzzles.h"
+
+/*
+ * smalloc should guarantee to return a useful pointer - Halibut
+ * can do nothing except die when it's out of memory anyway.
+ */
+void *smalloc(size_t size) {
+    void *p;
+    p = malloc(size);
+    if (!p)
+        fatal("out of memory");
+    return p;
+}
+
+/*
+ * sfree should guaranteeably deal gracefully with freeing NULL
+ */
+void sfree(void *p) {
+    if (p) {
+        free(p);
+    }
+}
+
+/*
+ * srealloc should guaranteeably be able to realloc NULL
+ */
+void *srealloc(void *p, size_t size) {
+    void *q;
+    if (p) {
+        q = realloc(p, size);
+    } else {
+        q = malloc(size);
+    }
+    if (!q)
+        fatal("out of memory");
+    return q;
+}
+
+/*
+ * dupstr is like strdup, but with the never-return-NULL property
+ * of smalloc (and also reliably defined in all environments :-)
+ */
+char *dupstr(const char *s) {
+    char *r = smalloc(1+strlen(s));
+    strcpy(r,s);
+    return r;
+}
diff --git a/apps/plugins/puzzles/map.R b/apps/plugins/puzzles/src/map.R
index 1e702aa19d..1e702aa19d 100644
--- a/apps/plugins/puzzles/map.R
+++ b/apps/plugins/puzzles/src/map.R
diff --git a/apps/plugins/puzzles/map.c b/apps/plugins/puzzles/src/map.c
index 6e9c12523a..f1af38ba5e 100644
--- a/apps/plugins/puzzles/map.c
+++ b/apps/plugins/puzzles/src/map.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -3199,7 +3199,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Map", "games.map", "map",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/map.html b/apps/plugins/puzzles/src/map.html
new file mode 100644
index 0000000000..d3aac337d8
--- /dev/null
+++ b/apps/plugins/puzzles/src/map.html
@@ -0,0 +1,76 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Map</title>
+<link rel="previous" href="lightup.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="loopy.html">
+</head>
+<body>
+<p><a href="lightup.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="loopy.html">Next</a></p>
+<h1><a name="C22"></a>Chapter 22: <a name="i0"></a>Map</h1>
+<p>
+You are given a map consisting of a number of regions. Your task is to colour each region with one of four colours, in such a way that no two regions sharing a boundary have the same colour. You are provided with some regions already coloured, sufficient to make the remainder of the solution unique.
+</p>
+<p>
+Only regions which share a length of border are required to be different colours. Two regions which meet at only one <em>point</em> (i.e. are diagonally separated) may be the same colour.
+</p>
+<p>
+I believe this puzzle is original; I've never seen an implementation of it anywhere else. The concept of a <a name="i1"></a>four-colouring puzzle was suggested by Owen Dunn; credit must also go to Nikoli and to Verity Allan for inspiring the train of thought that led to me realising Owen's suggestion was a viable puzzle. Thanks also to Gareth Taylor for many detailed suggestions.
+</p>
+<h2><a name="S22.1"></a>22.1 <a name="i2"></a>Map controls</h2>
+<p>
+To colour a region, click the left mouse button on an existing region of the desired colour and drag that colour into the new region.
+</p>
+<p>
+(The program will always ensure the starting puzzle has at least one region of each colour, so that this is always possible!)
+</p>
+<p>
+If you need to clear a region, you can drag from an empty region, or from the puzzle boundary if there are no empty regions left.
+</p>
+<p>
+Dragging a colour using the <em>right</em> mouse button will stipple the region in that colour, which you can use as a note to yourself that you think the region <em>might</em> be that colour. A region can contain stipples in multiple colours at once. (This is often useful at the harder difficulty levels.)
+</p>
+<p>
+You can also use the cursor keys to move around the map: the colour of the cursor indicates the position of the colour you would drag (which is not obvious if you're on a region's boundary, since it depends on the direction from which you approached the boundary). Pressing the return key starts a drag of that colour, as above, which you control with the cursor keys; pressing the return key again finishes the drag. The space bar can be used similarly to create a stippled region. Double-pressing the return key (without moving the cursor) will clear the region, as a drag from an empty region does: this is useful with the cursor mode if you have filled the entire map in but need to correct the layout.
+</p>
+<p>
+If you press L during play, the game will toggle display of a number in each region of the map. This is useful if you want to discuss a particular puzzle instance with a friend &#8211; having an unambiguous name for each region is much easier than trying to refer to them all by names such as &#8216;the one down and right of the brown one on the top border&#8217;.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S22.2"></a>22.2 <a name="i3"></a>Map parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>Regions</em>
+</dt>
+<dd>
+Number of regions in the generated map.
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+In &#8216;Easy&#8217; mode, there should always be at least one region whose colour can be determined trivially. In &#8216;Normal&#8217; and &#8216;Hard&#8217; modes, you will have to use increasingly complex logic to deduce the colour of some regions. However, it will always be possible without having to guess or backtrack.
+<p>
+In &#8216;Unreasonable&#8217; mode, the program will feel free to generate puzzles which are as hard as it can possibly make them: the only constraint is that they should still have a unique solution. Solving Unreasonable puzzles may require guessing and backtracking.
+</p>
+
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/maxflow.c b/apps/plugins/puzzles/src/maxflow.c
index 3a25654ff0..028946b9bd 100644
--- a/apps/plugins/puzzles/maxflow.c
+++ b/apps/plugins/puzzles/src/maxflow.c
@@ -10,7 +10,7 @@
  * anyway :-)
  */
 
-#include "rbassert.h"
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/apps/plugins/puzzles/maxflow.h b/apps/plugins/puzzles/src/maxflow.h
index d490f45421..d490f45421 100644
--- a/apps/plugins/puzzles/maxflow.h
+++ b/apps/plugins/puzzles/src/maxflow.h
diff --git a/apps/plugins/puzzles/midend.c b/apps/plugins/puzzles/src/midend.c
index e2938a45bc..2eb5ee93e8 100644
--- a/apps/plugins/puzzles/midend.c
+++ b/apps/plugins/puzzles/src/midend.c
@@ -4,10 +4,14 @@
  * Maintains a move list, takes care of Undo and Redo commands, and
  * processes standard keystrokes for undo/redo/new/quit.
  */
-#include "puzzles.h"
 
-#include "rbcompat.h"
-#include "rbassert.h"
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "puzzles.h"
 
 enum { DEF_PARAMS, DEF_SEED, DEF_DESC };   /* for midend_game_id_int */
 
@@ -26,9 +30,9 @@ struct midend {
     random_state *random;
     const game *ourgame;
 
-    game_params **presets;
-    char **preset_names, **preset_encodings;
-    int npresets, presetsize;
+    struct preset_menu *preset_menu;
+    char **encoded_presets; /* for midend_which_preset to check against */
+    int n_encoded_presets;
 
     /*
      * `desc' and `privdesc' deserve a comment.
@@ -154,10 +158,7 @@ midend *midend_new(frontend *fe, const game *ourgame,
     me->genmode = GOT_NOTHING;
     me->drawstate = NULL;
     me->oldstate = NULL;
-    me->presets = NULL;
-    me->preset_names = NULL;
-    me->preset_encodings = NULL;
-    me->npresets = me->presetsize = 0;
+    me->preset_menu = NULL;
     me->anim_time = me->anim_pos = 0.0F;
     me->flash_time = me->flash_pos = 0.0F;
     me->dir = 0;
@@ -205,10 +206,23 @@ static void midend_free_game(midend *me)
         me->ourgame->free_drawstate(me->drawing, me->drawstate);
 }
 
-void midend_free(midend *me)
+static void midend_free_preset_menu(midend *me, struct preset_menu *menu)
 {
-    int i;
+    if (menu) {
+        int i;
+        for (i = 0; i < menu->n_entries; i++) {
+            sfree(menu->entries[i].title);
+            if (menu->entries[i].params)
+                me->ourgame->free_params(menu->entries[i].params);
+            midend_free_preset_menu(me, menu->entries[i].submenu);
+        }
+        sfree(menu->entries);
+        sfree(menu);
+    }
+}
 
+void midend_free(midend *me)
+{
     midend_free_game(me);
 
     if (me->drawing)
@@ -220,16 +234,7 @@ void midend_free(midend *me)
     sfree(me->seedstr);
     sfree(me->aux_info);
     me->ourgame->free_params(me->params);
-    if (me->npresets) {
-        for (i = 0; i < me->npresets; i++) {
-            sfree(me->presets[i]);
-            sfree(me->preset_names[i]);
-            sfree(me->preset_encodings[i]);
-        }
-        sfree(me->presets);
-        sfree(me->preset_names);
-        sfree(me->preset_encodings);
-    }
+    midend_free_preset_menu(me, me->preset_menu);
     if (me->ui)
         me->ourgame->free_ui(me->ui);
     if (me->curparams)
@@ -923,40 +928,177 @@ float *midend_colours(midend *me, int *ncolours)
     return ret;
 }
 
-int midend_num_presets(midend *me)
+struct preset_menu *preset_menu_new(void)
 {
-    if (!me->npresets) {
-        char *name;
+    struct preset_menu *menu = snew(struct preset_menu);
+    menu->n_entries = 0;
+    menu->entries_size = 0;
+    menu->entries = NULL;
+    return menu;
+}
+
+static struct preset_menu_entry *preset_menu_add(struct preset_menu *menu,
+                                                 char *title)
+{
+    struct preset_menu_entry *toret;
+    if (menu->n_entries >= menu->entries_size) {
+        menu->entries_size = menu->n_entries * 5 / 4 + 10;
+        menu->entries = sresize(menu->entries, menu->entries_size,
+                                struct preset_menu_entry);
+    }
+    toret = &menu->entries[menu->n_entries++];
+    toret->title = title;
+    toret->params = NULL;
+    toret->submenu = NULL;
+    return toret;
+}
+
+struct preset_menu *preset_menu_add_submenu(struct preset_menu *parent,
+                                            char *title)
+{
+    struct preset_menu_entry *entry = preset_menu_add(parent, title);
+    entry->submenu = preset_menu_new();
+    return entry->submenu;
+}
+
+void preset_menu_add_preset(struct preset_menu *parent,
+                            char *title, game_params *params)
+{
+    struct preset_menu_entry *entry = preset_menu_add(parent, title);
+    entry->params = params;
+}
+
+game_params *preset_menu_lookup_by_id(struct preset_menu *menu, int id)
+{
+    int i;
+    game_params *retd;
+
+    for (i = 0; i < menu->n_entries; i++) {
+        if (id == menu->entries[i].id)
+            return menu->entries[i].params;
+        if (menu->entries[i].submenu &&
+            (retd = preset_menu_lookup_by_id(
+                 menu->entries[i].submenu, id)) != NULL)
+            return retd;
+    }
+
+    return NULL;
+}
+
+static char *preset_menu_add_from_user_env(
+    midend *me, struct preset_menu *menu, char *p, int top_level)
+{
+    while (*p) {
+        char *name, *val;
         game_params *preset;
 
-        while (me->ourgame->fetch_preset(me->npresets, &name, &preset)) {
-            if (me->presetsize <= me->npresets) {
-                me->presetsize = me->npresets + 10;
-                me->presets = sresize(me->presets, me->presetsize,
-                                      game_params *);
-                me->preset_names = sresize(me->preset_names, me->presetsize,
-                                           char *);
-                me->preset_encodings = sresize(me->preset_encodings,
-                                               me->presetsize, char *);
+        name = p;
+        while (*p && *p != ':') p++;
+        if (*p) *p++ = '\0';
+        val = p;
+        while (*p && *p != ':') p++;
+        if (*p) *p++ = '\0';
+
+        if (!strcmp(val, "#")) {
+            /*
+             * Special case: either open a new submenu with the given
+             * title, or terminate the current submenu.
+             */
+            if (*name) {
+                struct preset_menu *submenu =
+                    preset_menu_add_submenu(menu, dupstr(name));
+                p = preset_menu_add_from_user_env(me, submenu, p, FALSE);
+            } else {
+                /*
+                 * If we get a 'close submenu' indication at the top
+                 * level, there's not much we can do but quietly
+                 * ignore it.
+                 */
+                if (!top_level)
+                    return p;
             }
+            continue;
+        }
+
+        preset = me->ourgame->default_params();
+        me->ourgame->decode_params(preset, val);
+
+        if (me->ourgame->validate_params(preset, TRUE)) {
+            /* Drop this one from the list. */
+            me->ourgame->free_params(preset);
+            continue;
+        }
+
+        preset_menu_add_preset(menu, dupstr(name), preset);
+    }
+
+    return p;
+}
+
+static void preset_menu_alloc_ids(midend *me, struct preset_menu *menu)
+{
+    int i;
+
+    for (i = 0; i < menu->n_entries; i++)
+        menu->entries[i].id = me->n_encoded_presets++;
+
+    for (i = 0; i < menu->n_entries; i++)
+        if (menu->entries[i].submenu)
+            preset_menu_alloc_ids(me, menu->entries[i].submenu);
+}
 
-            me->presets[me->npresets] = preset;
-            me->preset_names[me->npresets] = name;
-            me->preset_encodings[me->npresets] =
-                me->ourgame->encode_params(preset, TRUE);;
-            me->npresets++;
+static void preset_menu_encode_params(midend *me, struct preset_menu *menu)
+{
+    int i;
+
+    for (i = 0; i < menu->n_entries; i++) {
+        if (menu->entries[i].params) {
+            me->encoded_presets[menu->entries[i].id] =
+                me->ourgame->encode_params(menu->entries[i].params, TRUE);
+        } else {
+            preset_menu_encode_params(me, menu->entries[i].submenu);
         }
     }
+}
+
+struct preset_menu *midend_get_presets(midend *me, int *id_limit)
+{
+    int i;
+
+    if (me->preset_menu)
+        return me->preset_menu;
+
+#if 0
+    /* Expect the game to implement exactly one of the two preset APIs */
+    assert(me->ourgame->fetch_preset || me->ourgame->preset_menu);
+    assert(!(me->ourgame->fetch_preset && me->ourgame->preset_menu));
+#endif
+
+    if (me->ourgame->fetch_preset) {
+        char *name;
+        game_params *preset;
+
+        /* Simple one-level menu */
+        assert(!me->ourgame->preset_menu);
+        me->preset_menu = preset_menu_new();
+        for (i = 0; me->ourgame->fetch_preset(i, &name, &preset); i++)
+            preset_menu_add_preset(me->preset_menu, name, preset);
+
+    } else {
+        /* Hierarchical menu provided by the game backend */
+        me->preset_menu = me->ourgame->preset_menu();
+    }
 
     {
         /*
-         * Allow environment-based extensions to the preset list by
-         * defining a variable along the lines of `SOLO_PRESETS=2x3
-         * Advanced:2x3da'. Colon-separated list of items,
-         * alternating between textual titles in the menu and
-         * encoded parameter strings.
+         * Allow user extensions to the preset list by defining an
+         * environment variable <gamename>_PRESETS whose value is a
+         * colon-separated list of items, alternating between textual
+         * titles in the menu and encoded parameter strings. For
+         * example, "SOLO_PRESETS=2x3 Advanced:2x3da" would define
+         * just one additional preset for Solo.
          */
-        char buf[80], *e, *p;
+        char buf[80], *e;
         int j, k;
 
         sprintf(buf, "%s_PRESETS", me->ourgame->name);
@@ -966,57 +1108,27 @@ int midend_num_presets(midend *me)
         buf[k] = '\0';
 
         if ((e = getenv(buf)) != NULL) {
-            p = e = dupstr(e);
-
-            while (*p) {
-                char *name, *val;
-                game_params *preset;
-
-                name = p;
-                while (*p && *p != ':') p++;
-                if (*p) *p++ = '\0';
-                val = p;
-                while (*p && *p != ':') p++;
-                if (*p) *p++ = '\0';
-
-                preset = me->ourgame->default_params();
-                me->ourgame->decode_params(preset, val);
-
-                if (me->ourgame->validate_params(preset, TRUE)) {
-                    /* Drop this one from the list. */
-                    me->ourgame->free_params(preset);
-                    continue;
-                }
-
-                if (me->presetsize <= me->npresets) {
-                    me->presetsize = me->npresets + 10;
-                    me->presets = sresize(me->presets, me->presetsize,
-                                          game_params *);
-                    me->preset_names = sresize(me->preset_names,
-                                               me->presetsize, char *);
-                    me->preset_encodings = sresize(me->preset_encodings,
-                                                   me->presetsize, char *);
-                }
-
-                me->presets[me->npresets] = preset;
-                me->preset_names[me->npresets] = dupstr(name);
-                me->preset_encodings[me->npresets] =
-                    me->ourgame->encode_params(preset, TRUE);
-                me->npresets++;
-            }
+            e = dupstr(e);
+            preset_menu_add_from_user_env(me, me->preset_menu, e, TRUE);
             sfree(e);
         }
     }
 
-    return me->npresets;
-}
-
-void midend_fetch_preset(midend *me, int n,
-                         char **name, game_params **params)
-{
-    assert(n >= 0 && n < me->npresets);
-    *name = me->preset_names[n];
-    *params = me->presets[n];
+    /*
+     * Finalise the menu: allocate an integer id to each entry, and
+     * store string encodings of the presets' parameters in
+     * me->encoded_presets.
+     */
+    me->n_encoded_presets = 0;
+    preset_menu_alloc_ids(me, me->preset_menu);
+    me->encoded_presets = snewn(me->n_encoded_presets, char *);
+    for (i = 0; i < me->n_encoded_presets; i++)
+        me->encoded_presets[i] = NULL;
+    preset_menu_encode_params(me, me->preset_menu);
+
+    if (id_limit)
+        *id_limit = me->n_encoded_presets;
+    return me->preset_menu;
 }
 
 int midend_which_preset(midend *me)
@@ -1025,8 +1137,9 @@ int midend_which_preset(midend *me)
     int i, ret;
 
     ret = -1;
-    for (i = 0; i < me->npresets; i++)
-        if (!strcmp(encoding, me->preset_encodings[i])) {
+    for (i = 0; i < me->n_encoded_presets; i++)
+        if (me->encoded_presets[i] &&
+            !strcmp(encoding, me->encoded_presets[i])) {
             ret = i;
             break;
         }
@@ -1479,18 +1592,6 @@ char *midend_rewrite_statusbar(midend *me, char *text)
 #define SERIALISE_MAGIC "Simon Tatham's Portable Puzzle Collection"
 #define SERIALISE_VERSION "1"
 
-/* rockbox kludge */
-static void copy_left_justified(char *buf, size_t sz, const char *str)
-{
-    memset(buf, ' ', sz - 1);
-    int len = strlen(str);
-    if(len <= sz - 1)
-        memcpy(buf, str, len);
-    else
-        fatal("overrun");
-    buf[sz - 1] = 0;
-}
-
 void midend_serialise(midend *me,
                       void (*write)(void *ctx, void *buf, int len),
                       void *wctx)
@@ -1509,7 +1610,7 @@ void midend_serialise(midend *me,
 #define wr(h,s) do { \
     char hbuf[80]; \
     char *str = (s); \
-    char lbuf[9]; \
+    char lbuf[9];                               \
     copy_left_justified(lbuf, sizeof(lbuf), h); \
     sprintf(hbuf, "%s:%d:", lbuf, (int)strlen(str)); \
     write(wctx, hbuf, strlen(hbuf)); \
diff --git a/apps/plugins/puzzles/mines.R b/apps/plugins/puzzles/src/mines.R
index 275c76c7ad..275c76c7ad 100644
--- a/apps/plugins/puzzles/mines.R
+++ b/apps/plugins/puzzles/src/mines.R
diff --git a/apps/plugins/puzzles/mines.c b/apps/plugins/puzzles/src/mines.c
index deb71aed6b..6a5ce029a0 100644
--- a/apps/plugins/puzzles/mines.c
+++ b/apps/plugins/puzzles/src/mines.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -3142,7 +3142,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Mines", "games.mines", "mines",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/mines.html b/apps/plugins/puzzles/src/mines.html
new file mode 100644
index 0000000000..15c8b3e9c8
--- /dev/null
+++ b/apps/plugins/puzzles/src/mines.html
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Mines</title>
+<link rel="previous" href="solo.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="samegame.html">
+</head>
+<body>
+<p><a href="solo.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="samegame.html">Next</a></p>
+<h1><a name="C12"></a>Chapter 12: <a name="i0"></a>Mines</h1>
+<p>
+You have a grid of covered squares, some of which contain mines, but you don't know which. Your job is to uncover every square which does <em>not</em> contain a mine. If you uncover a square containing a mine, you lose. If you uncover a square which does not contain a mine, you are told how many mines are contained within the eight surrounding squares.
+</p>
+<p>
+This game needs no introduction; popularised by Windows, it is perhaps the single best known desktop puzzle game in existence.
+</p>
+<p>
+This version of it has an unusual property. By default, it will generate its mine positions in such a way as to ensure that you never need to <em>guess</em> where a mine is: you will always be able to deduce it somehow. So you will never, as can happen in other versions, get to the last four squares and discover that there are two mines left but you have no way of knowing for sure where they are.
+</p>
+<h2><a name="S12.1"></a>12.1 <a name="i1"></a>Mines controls</h2>
+<p>
+This game is played with the mouse.
+</p>
+<p>
+If you left-click in a covered square, it will be uncovered.
+</p>
+<p>
+If you right-click in a covered square, it will place a flag which indicates that the square is believed to be a mine. Left-clicking in a marked square will not uncover it, for safety. You can right-click again to remove a mark placed in error.
+</p>
+<p>
+If you left-click in an <em>uncovered</em> square, it will &#8216;clear around&#8217; the square. This means: if the square has exactly as many flags surrounding it as it should have mines, then all the covered squares next to it which are <em>not</em> flagged will be uncovered. So once you think you know the location of all the mines around a square, you can use this function as a shortcut to avoid having to click on each of the remaining squares one by one.
+</p>
+<p>
+If you uncover a square which has <em>no</em> mines in the surrounding eight squares, then it is obviously safe to uncover those squares in turn, and so on if any of them also has no surrounding mines. This will be done for you automatically; so sometimes when you uncover a square, a whole new area will open up to be explored.
+</p>
+<p>
+You can also use the cursor keys to move around the minefield. Pressing the return key in a covered square uncovers it, and in an uncovered square will clear around it (so it acts as the left button), pressing the space bar in a covered square will place a flag (similarly, it acts as the right button).
+</p>
+<p>
+All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.
+</p>
+<p>
+Even Undo is available, although you might consider it cheating to use it. If you step on a mine, the program will only reveal the mine in question (unlike most other implementations, which reveal all of them). You can then Undo your fatal move and continue playing if you like. The program will track the number of times you died (and Undo will not reduce that counter), so when you get to the end of the game you know whether or not you did it without making any errors.
+</p>
+<p>
+(If you really want to know the full layout of the grid, which other implementations will show you after you die, you can always use the Solve menu option.)
+</p>
+<h2><a name="S12.2"></a>12.2 <a name="i2"></a>Mines parameters</h2>
+<p>
+The options available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu are:
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>Mines</em>
+</dt>
+<dd>
+Number of mines in the grid. You can enter this as an absolute mine count, or alternatively you can put a <code>%</code> sign on the end in which case the game will arrange for that proportion of the squares in the grid to be mines.
+<p>
+Beware of setting the mine count too high. At very high densities, the program may spend forever searching for a solvable grid.
+</p>
+
+</dd>
+<dt>
+<em>Ensure solubility</em>
+</dt>
+<dd>
+When this option is enabled (as it is by default), Mines will ensure that the entire grid can be fully deduced starting from the initial open space. If you prefer the riskier grids generated by other implementations, you can switch off this option.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/misc.c b/apps/plugins/puzzles/src/misc.c
index cd5c393b95..c721016563 100644
--- a/apps/plugins/puzzles/misc.c
+++ b/apps/plugins/puzzles/src/misc.c
@@ -2,7 +2,7 @@
  * misc.c: Miscellaneous helpful functions.
  */
 
-#include "rbassert.h"
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -201,7 +201,7 @@ void game_mkhighlight(frontend *fe, float *ret,
     game_mkhighlight_specific(fe, ret, background, highlight, lowlight);
 }
 
-static void memswap_puzzles(void *av, void *bv, int size)
+static void memswap(void *av, void *bv, int size)
 {
     char tmpbuf[512];
     char *a = av, *b = bv;
@@ -225,7 +225,7 @@ void shuffle(void *array, int nelts, int eltsize, random_state *rs)
     for (i = nelts; i-- > 1 ;) {
         int j = random_upto(rs, i+1);
         if (j != i)
-            memswap_puzzles(carray + eltsize * i, carray + eltsize * j, eltsize);
+            memswap(carray + eltsize * i, carray + eltsize * j, eltsize);
     }
 }
 
@@ -358,6 +358,19 @@ void draw_text_outline(drawing *dr, int x, int y, int fonttype,
         draw_text(dr, x, y+1, fonttype, fontsize, align, outline_colour, text);
     }
     draw_text(dr, x, y, fonttype, fontsize, align, text_colour, text);
+
+}
+
+/* kludge for non-compliant sprintf() */
+void copy_left_justified(char *buf, size_t sz, const char *str)
+{
+    memset(buf, ' ', sz - 1);
+    int len = strlen(str);
+    if(len <= sz - 1)
+        memcpy(buf, str, len);
+    else
+        fatal("overrun");
+    buf[sz - 1] = 0;
 }
 
 /* vim: set shiftwidth=4 tabstop=8: */
diff --git a/apps/plugins/puzzles/src/missing b/apps/plugins/puzzles/src/missing
new file mode 100755
index 0000000000..f62bbae306
--- /dev/null
+++ b/apps/plugins/puzzles/src/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2013-10-28.13; # UTC
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/apps/plugins/puzzles/mkauto.sh b/apps/plugins/puzzles/src/mkauto.sh
index 297212ad4d..297212ad4d 100755
--- a/apps/plugins/puzzles/mkauto.sh
+++ b/apps/plugins/puzzles/src/mkauto.sh
diff --git a/apps/plugins/puzzles/mkfiles.pl b/apps/plugins/puzzles/src/mkfiles.pl
index c1623dfd12..c1623dfd12 100755
--- a/apps/plugins/puzzles/mkfiles.pl
+++ b/apps/plugins/puzzles/src/mkfiles.pl
diff --git a/apps/plugins/puzzles/nestedvm.c b/apps/plugins/puzzles/src/nestedvm.c
index c61afecf6a..79b797116f 100644
--- a/apps/plugins/puzzles/nestedvm.c
+++ b/apps/plugins/puzzles/src/nestedvm.c
@@ -3,7 +3,7 @@
  */
 
 #include <stdio.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <stdlib.h>
 #include <time.h>
 #include <stdarg.h>
@@ -382,6 +382,23 @@ int jcallback_about_event()
     return 0;
 }
 
+void preset_menu_populate(struct preset_menu *menu, int menuid)
+{
+    int i;
+
+    for (i = 0; i < menu->n_entries; i++) {
+        struct preset_menu_entry *entry = &menu->entries[i];
+        if (entry->params) {
+            _call_java(5, (int)entry->params, 0, 0);
+            _call_java(1, (int)entry->title, menuid, entry->id);
+        } else {
+            _call_java(5, 0, 0, 0);
+            _call_java(1, (int)entry->title, menuid, entry->id);
+            preset_menu_populate(entry->submenu, entry->id);
+        }
+    }
+}
+
 int main(int argc, char **argv)
 {
     int i, n;
@@ -394,14 +411,12 @@ int main(int argc, char **argv)
         midend_game_id(_fe->me, argv[1]);   /* ignore failure */
     midend_new_game(_fe->me);
 
-    if ((n = midend_num_presets(_fe->me)) > 0) {
-        int i;
-        for (i = 0; i < n; i++) {
-            char *name;
-            game_params *params;
-            midend_fetch_preset(_fe->me, i, &name, &params);
-            _call_java(1, (int)name, (int)params, 0);
-        }
+    {
+        struct preset_menu *menu;
+        int nids, topmenu;
+        menu = midend_get_presets(_fe->me, &nids);
+        topmenu = _call_java(1, 0, nids, 0);
+        preset_menu_populate(menu, topmenu);
     }
 
     colours = midend_colours(_fe->me, &n);
diff --git a/apps/plugins/puzzles/net.R b/apps/plugins/puzzles/src/net.R
index 8e98216e03..8e98216e03 100644
--- a/apps/plugins/puzzles/net.R
+++ b/apps/plugins/puzzles/src/net.R
diff --git a/apps/plugins/puzzles/net.c b/apps/plugins/puzzles/src/net.c
index 18ba7760d5..de51f82fd7 100644
--- a/apps/plugins/puzzles/net.c
+++ b/apps/plugins/puzzles/src/net.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2390,24 +2390,31 @@ static game_state *execute_move(const game_state *from, const char *move)
     /*
      * Check whether the game has been completed.
      * 
-     * For this purpose it doesn't matter where the source square
-     * is, because we can start from anywhere and correctly
-     * determine whether the game is completed.
+     * For this purpose it doesn't matter where the source square is,
+     * because we can start from anywhere (or, at least, any square
+     * that's non-empty!), and correctly determine whether the game is
+     * completed.
      */
     {
-        unsigned char *active = compute_active(ret, 0, 0);
-        int x1, y1;
+        unsigned char *active;
+        int pos;
         int complete = TRUE;
 
-        for (x1 = 0; x1 < ret->width; x1++)
-            for (y1 = 0; y1 < ret->height; y1++)
-                if ((tile(ret, x1, y1) & 0xF) && !index(ret, active, x1, y1)) {
+        for (pos = 0; pos < ret->width * ret->height; pos++)
+            if (ret->tiles[pos] & 0xF)
+                break;
+
+        if (pos < ret->width * ret->height) {
+            active = compute_active(ret, pos % ret->width, pos / ret->width);
+
+            for (pos = 0; pos < ret->width * ret->height; pos++)
+                if ((ret->tiles[pos] & 0xF) && !active[pos]) {
                     complete = FALSE;
-                    goto break_label;  /* break out of two loops at once */
-                }
-        break_label:
+                    break;
+                }
 
-        sfree(active);
+            sfree(active);
+        }
 
         if (complete)
             ret->completed = TRUE;
@@ -2964,20 +2971,43 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
      * Update the status bar.
      */
     {
-        char statusbuf[256];
+        char statusbuf[256], *p;
         int i, n, n2, a;
+        int complete = FALSE;
+
+        p = statusbuf;
+        *p = '\0';     /* ensure even an empty status string is terminated */
 
-        n = state->width * state->height;
-        for (i = a = n2 = 0; i < n; i++) {
-            if (active[i])
-                a++;
-            if (state->tiles[i] & 0xF)
-                n2++;
+        if (state->used_solve) {
+            p += sprintf(p, "Auto-solved. ");
+            complete = TRUE;
+        } else if (state->completed) {
+            p += sprintf(p, "COMPLETED! ");
+            complete = TRUE;
         }
 
-        sprintf(statusbuf, "%sActive: %d/%d",
-                (state->used_solve ? "Auto-solved. " :
-                 state->completed ? "COMPLETED! " : ""), a, n2);
+        /*
+         * Omit the 'Active: n/N' counter completely if the source
+         * tile is a completely empty one, because then the active
+         * count can't help but read '1'.
+         */
+        if (tile(state, ui->cx, ui->cy) & 0xF) {
+            n = state->width * state->height;
+            for (i = a = n2 = 0; i < n; i++) {
+                if (active[i])
+                    a++;
+                if (state->tiles[i] & 0xF)
+                    n2++;
+            }
+
+            /*
+             * Also, if we're displaying a completion indicator and
+             * the game is still in its completed state (i.e. every
+             * tile is active), we might as well omit this too.
+             */
+            if (!complete || a < n2)
+                p += sprintf(p, "Active: %d/%d", a, n2);
+        }
 
         status_bar(dr, statusbuf);
     }
@@ -3174,7 +3204,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Net", "games.net", "net",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/net.html b/apps/plugins/puzzles/src/net.html
new file mode 100644
index 0000000000..30fe6a1bb5
--- /dev/null
+++ b/apps/plugins/puzzles/src/net.html
@@ -0,0 +1,108 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Net</title>
+<link rel="previous" href="common.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="cube.html">
+</head>
+<body>
+<p><a href="common.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="cube.html">Next</a></p>
+<h1><a name="C3"></a>Chapter 3: <a name="i0"></a>Net</h1>
+<p>
+(<em>Note:</em> the <a name="i1"></a>Windows version of this game is called <a name="i2"></a><code>NETGAME.EXE</code> to avoid clashing with Windows's own <code>NET.EXE</code>.)
+</p>
+<p>
+I originally saw this in the form of a Flash game called <a name="i3"></a>FreeNet <a href="#p0">[1]</a>, written by Pavils Jurjans; there are several other implementations under the name <a name="i4"></a>NetWalk. The computer prepares a network by connecting up the centres of squares in a grid, and then shuffles the network by rotating every tile randomly. Your job is to rotate it all back into place. The successful solution will be an entirely connected network, with no closed loops. As a visual aid, all tiles which are connected to the one in the middle are highlighted.
+</p>
+<p><a name="p0"></a>
+[1] <a href="http://www.jurjans.lv/stuff/net/FreeNet.htm"><code>http://www.jurjans.lv/stuff/net/FreeNet.htm</code></a>
+</p>
+<h2><a name="S3.1"></a>3.1 <a name="i5"></a>Net controls</h2>
+<p>
+This game can be played with either the keyboard or the mouse. The controls are:
+</p>
+<dl><dt>
+<em>Select tile</em>: mouse pointer, arrow keys
+</dt>
+<dt>
+<em>Rotate tile anticlockwise</em>: left mouse button, &#8216;A&#8217; key
+</dt>
+<dt>
+<em>Rotate tile clockwise</em>: right mouse button, &#8216;D&#8217; key
+</dt>
+<dt>
+<em>Rotate tile by 180 degrees</em>: &#8216;F&#8217; key
+</dt>
+<dt>
+<em>Lock (or unlock) tile</em>: middle mouse button, shift-click, &#8216;S&#8217; key
+</dt>
+<dd>
+You can lock a tile once you're sure of its orientation. You can also unlock it again, but while it's locked you can't accidentally turn it.
+</dd>
+</dl>
+<p>
+The following controls are not necessary to complete the game, but may be useful:
+</p>
+<dl><dt>
+<em>Shift grid</em>: Shift + arrow keys
+</dt>
+<dd>
+On grids that wrap, you can move the origin of the grid, so that tiles that were on opposite sides of the grid can be seen together.
+</dd>
+<dt>
+<em>Move centre</em>: Ctrl + arrow keys
+</dt>
+<dd>
+You can change which tile is used as the source of highlighting. (It doesn't ultimately matter which tile this is, as every tile will be connected to every other tile in a correct solution, but it may be helpful in the intermediate stages of solving the puzzle.)
+</dd>
+<dt>
+<em>Jumble tiles</em>: &#8216;J&#8217; key
+</dt>
+<dd>
+This key turns all tiles that are not locked to random orientations.
+</dd>
+</dl>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S3.2"></a>3.2 <a name="i6"></a>Net parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in tiles.
+</dd>
+<dt>
+<em>Walls wrap around</em>
+</dt>
+<dd>
+If checked, flow can pass from the left edge to the right edge, and from top to bottom, and vice versa.
+</dd>
+<dt>
+<em>Barrier probability</em>
+</dt>
+<dd>
+A number between 0.0 and 1.0 controlling whether an immovable barrier is placed between two tiles to prevent flow between them (a higher number gives more barriers). Since barriers are immovable, they act as constraints on the solution (i.e., hints).
+<p>
+The grid generation in Net has been carefully arranged so that the barriers are independent of the rest of the grid. This means that if you note down the random seed used to generate the current puzzle (see <a href="common.html#S2.2">section 2.2</a>), change the <em>Barrier probability</em> parameter, and then re-enter the same random seed, you should see exactly the same starting grid, with the only change being the number of barriers. So if you're stuck on a particular grid and need a hint, you could start up another instance of Net, set up the same parameters but a higher barrier probability, and enter the game seed from the original Net window.
+</p>
+
+</dd>
+<dt>
+<em>Ensure unique solution</em>
+</dt>
+<dd>
+Normally, Net will make sure that the puzzles it presents have only one solution. Puzzles with ambiguous sections can be more difficult and more subtle, so if you like you can turn off this feature and risk having ambiguous puzzles. (Also, finding <em>all</em> the possible solutions can be an additional challenge for an advanced player.)
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/netslide.R b/apps/plugins/puzzles/src/netslide.R
index ecfe7c3df8..ecfe7c3df8 100644
--- a/apps/plugins/puzzles/netslide.R
+++ b/apps/plugins/puzzles/src/netslide.R
diff --git a/apps/plugins/puzzles/netslide.c b/apps/plugins/puzzles/src/netslide.c
index e299b96eb3..c56e1abd6a 100644
--- a/apps/plugins/puzzles/netslide.c
+++ b/apps/plugins/puzzles/src/netslide.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1855,7 +1855,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Netslide", "games.netslide", "netslide",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/netslide.html b/apps/plugins/puzzles/src/netslide.html
new file mode 100644
index 0000000000..b63223745f
--- /dev/null
+++ b/apps/plugins/puzzles/src/netslide.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Netslide</title>
+<link rel="previous" href="rect.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="pattern.html">
+</head>
+<body>
+<p><a href="rect.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="pattern.html">Next</a></p>
+<h1><a name="C9"></a>Chapter 9: <a name="i0"></a>Netslide</h1>
+<p>
+This game combines the grid generation of Net (see <a href="net.html#C3">chapter 3</a>) with the movement of Sixteen (see <a href="sixteen.html#C6">chapter 6</a>): you have a Net grid, but instead of rotating tiles back into place you have to slide them into place by moving a whole row at a time.
+</p>
+<p>
+As in Sixteen, <a name="i1"></a>control is with the mouse or cursor keys. See <a href="sixteen.html#S6.1">section 6.1</a>.
+</p>
+<p>
+<a name="i2"></a>The available game parameters have similar meanings to those in Net (see <a href="net.html#S3.2">section 3.2</a>) and Sixteen (see <a href="sixteen.html#S6.2">section 6.2</a>).
+</p>
+<p>
+Netslide was contributed to this collection by Richard Boulton.
+</p>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/no-icon.c b/apps/plugins/puzzles/src/no-icon.c
index 114b2c57c7..114b2c57c7 100644
--- a/apps/plugins/puzzles/no-icon.c
+++ b/apps/plugins/puzzles/src/no-icon.c
diff --git a/apps/plugins/puzzles/noicon.rc b/apps/plugins/puzzles/src/noicon.rc
index 1de605d605..1de605d605 100644
--- a/apps/plugins/puzzles/noicon.rc
+++ b/apps/plugins/puzzles/src/noicon.rc
diff --git a/apps/plugins/puzzles/nullfe.c b/apps/plugins/puzzles/src/nullfe.c
index 4c9975b90e..ad381a135b 100644
--- a/apps/plugins/puzzles/nullfe.c
+++ b/apps/plugins/puzzles/src/nullfe.c
@@ -43,6 +43,11 @@ void print_line_width(drawing *dr, int width) {}
 void print_line_dotted(drawing *dr, int dotted) {}
 void midend_supersede_game_desc(midend *me, char *desc, char *privdesc) {}
 void status_bar(drawing *dr, char *text) {}
+struct preset_menu *preset_menu_new(void) {return NULL;}
+struct preset_menu *preset_menu_add_submenu(struct preset_menu *parent,
+                                            char *title) {return NULL;}
+void preset_menu_add_preset(struct preset_menu *parent,
+                            char *title, game_params *params) {}
 
 void fatal(char *fmt, ...)
 {
diff --git a/apps/plugins/puzzles/nullgame.R b/apps/plugins/puzzles/src/nullgame.R
index 41bdb85d57..41bdb85d57 100644
--- a/apps/plugins/puzzles/nullgame.R
+++ b/apps/plugins/puzzles/src/nullgame.R
diff --git a/apps/plugins/puzzles/nullgame.c b/apps/plugins/puzzles/src/nullgame.c
index 6e14c3237c..183b1e39c2 100644
--- a/apps/plugins/puzzles/nullgame.c
+++ b/apps/plugins/puzzles/src/nullgame.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -267,7 +267,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Null Game", NULL, NULL,
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/obfusc.c b/apps/plugins/puzzles/src/obfusc.c
index e95fa3f397..dc0656c20e 100644
--- a/apps/plugins/puzzles/obfusc.c
+++ b/apps/plugins/puzzles/src/obfusc.c
@@ -63,6 +63,8 @@ int main(int argc, char **argv)
                     outputmode = HEX;
                     break;
                   default:
+                    fprintf(stderr, "obfusc: unrecognised option '-%c'\n",
+                            *p);
                     return 1;
                 }
                 p++;
@@ -71,12 +73,14 @@ int main(int argc, char **argv)
             if (!inhex) {
                 inhex = p;
             } else {
+                fprintf(stderr, "obfusc: expected at most one argument\n");
                 return 1;
             }
         }
     }
 
     if (decode < 0) {
+        fprintf(stderr, "usage: obfusc < -e | -d > [ -b | -h ] [hex data]\n");
         return 0;
     }
 
diff --git a/apps/plugins/puzzles/osx-help.but b/apps/plugins/puzzles/src/osx-help.but
index fa45996aee..fa45996aee 100644
--- a/apps/plugins/puzzles/osx-help.but
+++ b/apps/plugins/puzzles/src/osx-help.but
diff --git a/apps/plugins/puzzles/osx-info.plist b/apps/plugins/puzzles/src/osx-info.plist
index 9f4aef8e53..9f4aef8e53 100644
--- a/apps/plugins/puzzles/osx-info.plist
+++ b/apps/plugins/puzzles/src/osx-info.plist
diff --git a/apps/plugins/puzzles/osx.icns b/apps/plugins/puzzles/src/osx.icns
index b4346a0da1..b4346a0da1 100644
--- a/apps/plugins/puzzles/osx.icns
+++ b/apps/plugins/puzzles/src/osx.icns
diff --git a/apps/plugins/puzzles/osx.m b/apps/plugins/puzzles/src/osx.m
index 4740124175..9d74da1574 100644
--- a/apps/plugins/puzzles/osx.m
+++ b/apps/plugins/puzzles/src/osx.m
@@ -426,6 +426,9 @@ struct frontend {
     NSView **cfg_controls;
     int cfg_ncontrols;
     NSTextField *status;
+    struct preset_menu *preset_menu;
+    NSMenuItem **preset_menu_items;
+    int n_preset_menu_items;
 }
 - (id)initWithGame:(const game *)g;
 - (void)dealloc;
@@ -540,6 +543,8 @@ struct frontend {
     int w, h;
 
     ourgame = g;
+    preset_menu = NULL;
+    preset_menu_items = NULL;
 
     fe.window = self;
 
@@ -618,6 +623,7 @@ struct frontend {
         [fe.colours[i] release];
     }
     sfree(fe.colours);
+    sfree(preset_menu_items);
     midend_free(me);
     [super dealloc];
 }
@@ -847,54 +853,99 @@ struct frontend {
 
 - (void)clearTypeMenu
 {
+    int i;
+
     while ([typemenu numberOfItems] > 1)
         [typemenu removeItemAtIndex:0];
     [[typemenu itemAtIndex:0] setState:NSOffState];
+
+    for (i = 0; i < n_preset_menu_items; i++)
+        preset_menu_items[i] = NULL;
 }
 
 - (void)updateTypeMenuTick
 {
-    int i, total, n;
+    int i, n;
 
-    total = [typemenu numberOfItems];
     n = midend_which_preset(me);
-    if (n < 0)
-        n = total - 1;                 /* that's always where "Custom" lives */
-    for (i = 0; i < total; i++)
-        [[typemenu itemAtIndex:i] setState:(i == n ? NSOnState : NSOffState)];
+
+    for (i = 0; i < n_preset_menu_items; i++)
+        if (preset_menu_items[i])
+            [preset_menu_items[i] setState:(i == n ? NSOnState : NSOffState)];
+
+    /*
+     * The Custom menu item is always right at the bottom of the
+     * Type menu.
+     */
+    [[typemenu itemAtIndex:[typemenu numberOfItems]-1]
+             setState:(n < 0 ? NSOnState : NSOffState)];
 }
 
-- (void)becomeKeyWindow
+- (void)populateTypeMenu:(NSMenu *)nsmenu from:(struct preset_menu *)menu
 {
-    int n;
+    int i;
+
+    /*
+     * We process the entries in reverse order so that (in the
+     * top-level Type menu at least) we don't disturb the 'Custom'
+     * item which remains fixed even when we change back and forth
+     * between puzzle type windows.
+     */
+    for (i = menu->n_entries; i-- > 0 ;) {
+        struct preset_menu_entry *entry = &menu->entries[i];
+        NSMenuItem *item;
+
+        if (entry->params) {
+            DataMenuItem *ditem;
+            ditem = [[[DataMenuItem alloc]
+                        initWithTitle:[NSString stringWithUTF8String:
+                                                    entry->title]
+                               action:NULL keyEquivalent:@""]
+                       autorelease];
+
+            [ditem setTarget:self];
+            [ditem setAction:@selector(presetGame:)];
+            [ditem setPayload:entry->params];
+
+            preset_menu_items[entry->id] = ditem;
+
+            item = ditem;
+        } else {
+            NSMenu *nssubmenu;
+
+            item = [[[NSMenuItem alloc]
+                        initWithTitle:[NSString stringWithUTF8String:
+                                                    entry->title]
+                               action:NULL keyEquivalent:@""]
+                       autorelease];
+            nssubmenu = newmenu(entry->title);
+            [item setSubmenu:nssubmenu];
+
+            [self populateTypeMenu:nssubmenu from:entry->submenu];
+        }
+
+        [item setEnabled:YES];
+        [nsmenu insertItem:item atIndex:0];
+    }
+}
 
+- (void)becomeKeyWindow
+{
     [self clearTypeMenu];
 
     [super becomeKeyWindow];
 
-    n = midend_num_presets(me);
+    if (!preset_menu) {
+        int i;
+        preset_menu = midend_get_presets(me, &n_preset_menu_items);
+        preset_menu_items = snewn(n_preset_menu_items, NSMenuItem *);
+        for (i = 0; i < n_preset_menu_items; i++)
+            preset_menu_items[i] = NULL;
+    }
 
-    if (n > 0) {
+    if (preset_menu->n_entries > 0) {
         [typemenu insertItem:[NSMenuItem separatorItem] atIndex:0];
-        while (n--) {
-            char *name;
-            game_params *params;
-            DataMenuItem *item;
-
-            midend_fetch_preset(me, n, &name, &params);
-
-            item = [[[DataMenuItem alloc]
-                     initWithTitle:[NSString stringWithUTF8String:name]
-                     action:NULL keyEquivalent:@""]
-                    autorelease];
-
-            [item setEnabled:YES];
-            [item setTarget:self];
-            [item setAction:@selector(presetGame:)];
-            [item setPayload:params];
-
-            [typemenu insertItem:item atIndex:0];
-        }
+        [self populateTypeMenu:typemenu from:preset_menu];
     }
 
     [self updateTypeMenuTick];
diff --git a/apps/plugins/puzzles/padtoolbar.bmp b/apps/plugins/puzzles/src/padtoolbar.bmp
index 46c3e0dcae..46c3e0dcae 100644
--- a/apps/plugins/puzzles/padtoolbar.bmp
+++ b/apps/plugins/puzzles/src/padtoolbar.bmp
diff --git a/apps/plugins/puzzles/palisade.R b/apps/plugins/puzzles/src/palisade.R
index de4bd83126..de4bd83126 100644
--- a/apps/plugins/puzzles/palisade.R
+++ b/apps/plugins/puzzles/src/palisade.R
diff --git a/apps/plugins/puzzles/palisade.c b/apps/plugins/puzzles/src/palisade.c
index c5f1b62022..b9d578d0f7 100644
--- a/apps/plugins/puzzles/palisade.c
+++ b/apps/plugins/puzzles/src/palisade.c
@@ -15,7 +15,7 @@
  *    - white-blink the edges (instead), a la loopy?
  */
 
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -1347,7 +1347,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Palisade", "games.palisade", "palisade",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/palisade.html b/apps/plugins/puzzles/src/palisade.html
new file mode 100644
index 0000000000..c0f19c5f5c
--- /dev/null
+++ b/apps/plugins/puzzles/src/palisade.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Palisade</title>
+<link rel="previous" href="tracks.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="licence.html">
+</head>
+<body>
+<p><a href="tracks.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="licence.html">Next</a></p>
+<h1><a name="C41"></a>Chapter 41: <a name="i0"></a>Palisade</h1>
+<p>
+You're given a grid of squares, some of which contain numbers. Your goal is to subdivide the grid into contiguous regions, all of the same (given) size, such that each square containing a number is adjacent to exactly that many edges (including those between the inside and the outside of the grid).
+</p>
+<p>
+Credit for this puzzle goes to <a name="i1"></a>Nikoli, who call it &#8216;Five Cells&#8217;. <a href="#p0">[22]</a>.
+</p>
+<p>
+Palisade was contributed to this collection by Jonas K&#246;lker.
+</p>
+<p><a name="p0"></a>
+[22] <a href="http://nikoli.co.jp/en/puzzles/five_cells.html"><code>http://nikoli.co.jp/en/puzzles/five_cells.html</code></a>
+</p>
+<h2><a name="S41.1"></a>41.1 <a name="i2"></a>Palisade controls</h2>
+<p>
+Left-click to place an edge. Right-click to indicate &#8216;no edge&#8217;. Alternatively, the arrow keys will move a keyboard cursor. Holding Control while pressing an arrow key will place an edge. Press Shift-arrowkey to switch off an edge. Repeat an action to perform its inverse.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S41.2"></a>41.2 <a name="i3"></a>Palisade parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>Region size</em>
+</dt>
+<dd>
+The size of the regions into which the grid must be subdivided.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/pattern.R b/apps/plugins/puzzles/src/pattern.R
index d6695715f9..d6695715f9 100644
--- a/apps/plugins/puzzles/pattern.R
+++ b/apps/plugins/puzzles/src/pattern.R
diff --git a/apps/plugins/puzzles/pattern.c b/apps/plugins/puzzles/src/pattern.c
index c741a2e3a4..9a74e55318 100644
--- a/apps/plugins/puzzles/pattern.c
+++ b/apps/plugins/puzzles/src/pattern.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1971,7 +1971,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Pattern", "games.pattern", "pattern",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/pattern.html b/apps/plugins/puzzles/src/pattern.html
new file mode 100644
index 0000000000..35f570ec85
--- /dev/null
+++ b/apps/plugins/puzzles/src/pattern.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Pattern</title>
+<link rel="previous" href="netslide.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="solo.html">
+</head>
+<body>
+<p><a href="netslide.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="solo.html">Next</a></p>
+<h1><a name="C10"></a>Chapter 10: <a name="i0"></a>Pattern</h1>
+<p>
+You have a grid of squares, which must all be filled in either black or white. Beside each row of the grid are listed the lengths of the runs of black squares on that row; above each column are listed the lengths of the runs of black squares in that column. Your aim is to fill in the entire grid black or white.
+</p>
+<p>
+I first saw this puzzle form around 1995, under the name &#8216;<a name="i1"></a>nonograms&#8217;. I've seen it in various places since then, under different names.
+</p>
+<p>
+Normally, puzzles of this type turn out to be a meaningful picture of something once you've solved them. However, since this version generates the puzzles automatically, they will just look like random groupings of squares. (One user has suggested that this is actually a <em>good</em> thing, since it prevents you from guessing the colour of squares based on the picture, and forces you to use logic instead.) The advantage, though, is that you never run out of them.
+</p>
+<h2><a name="S10.1"></a>10.1 <a name="i2"></a>Pattern controls</h2>
+<p>
+This game is played with the mouse.
+</p>
+<p>
+Left-click in a square to colour it black. Right-click to colour it white. If you make a mistake, you can middle-click, or hold down Shift while clicking with any button, to colour the square in the default grey (meaning &#8216;undecided&#8217;) again.
+</p>
+<p>
+You can click and drag with the left or right mouse button to colour a vertical or horizontal line of squares black or white at a time (respectively). If you click and drag with the middle button, or with Shift held down, you can colour a whole rectangle of squares grey.
+</p>
+<p>
+You can also move around the grid with the cursor keys. Pressing the return key will cycle the current cell through empty, then black, then white, then empty, and the space bar does the same cycle in reverse.
+</p>
+<p>
+Moving the cursor while holding Control will colour the moved-over squares black. Holding Shift will colour the moved-over squares white, and holding both will colour them grey.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S10.2"></a>10.2 <a name="i3"></a>Pattern parameters</h2>
+<p>
+The only options available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu are <em>Width</em> and <em>Height</em>, which are self-explanatory.
+</p>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/pearl.R b/apps/plugins/puzzles/src/pearl.R
index 79bc7325c7..79bc7325c7 100644
--- a/apps/plugins/puzzles/pearl.R
+++ b/apps/plugins/puzzles/src/pearl.R
diff --git a/apps/plugins/puzzles/pearl.c b/apps/plugins/puzzles/src/pearl.c
index 1f41f65af2..c6c305f3f2 100644
--- a/apps/plugins/puzzles/pearl.c
+++ b/apps/plugins/puzzles/src/pearl.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2608,7 +2608,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Pearl", "games.pearl", "pearl",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/pearl.html b/apps/plugins/puzzles/src/pearl.html
new file mode 100644
index 0000000000..c366ed3a4c
--- /dev/null
+++ b/apps/plugins/puzzles/src/pearl.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Pearl</title>
+<link rel="previous" href="range.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="undead.html">
+</head>
+<body>
+<p><a href="range.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="undead.html">Next</a></p>
+<h1><a name="C36"></a>Chapter 36: <a name="i0"></a>Pearl</h1>
+<p>
+You have a grid of squares. Your job is to draw lines between the centres of horizontally or vertically adjacent squares, so that the lines form a single closed loop. In the resulting grid, some of the squares that the loop passes through will contain corners, and some will be straight horizontal or vertical lines. (And some squares can be completely empty &#8211; the loop doesn't have to pass through every square.)
+</p>
+<p>
+Some of the squares contain black and white circles, which are clues that the loop must satisfy.
+</p>
+<p>
+A black circle in a square indicates that that square is a corner, but neither of the squares adjacent to it in the loop is also a corner.
+</p>
+<p>
+A white circle indicates that the square is a straight edge, but <em>at least one</em> of the squares adjacent to it in the loop is a corner.
+</p>
+<p>
+(In both cases, the clue only constrains the two squares adjacent <em>in the loop</em>, that is, the squares that the loop passes into after leaving the clue square. The squares that are only adjacent <em>in the grid</em> are not constrained.)
+</p>
+<p>
+Credit for this puzzle goes to <a name="i1"></a>Nikoli, who call it &#8216;Masyu&#8217;. <a href="#p0">[19]</a>
+</p>
+<p>
+Thanks to James Harvey for assistance with the implementation.
+</p>
+<p><a name="p0"></a>
+[19] <a href="http://www.nikoli.co.jp/en/puzzles/masyu.html"><code>http://www.nikoli.co.jp/en/puzzles/masyu.html</code></a> (beware of Flash)
+</p>
+<h2><a name="S36.1"></a>36.1 <a name="i2"></a>Pearl controls</h2>
+<p>
+Click with the left button on a grid edge to draw a segment of the loop through that edge, or to remove a segment once it is drawn.
+</p>
+<p>
+Drag with the left button through a series of squares to draw more than one segment of the loop in one go. Alternatively, drag over an existing part of the loop to undraw it, or to undraw part of it and then go in a different direction.
+</p>
+<p>
+Click with the right button on a grid edge to mark it with a cross, indicating that you are sure the loop does not go through that edge. (For instance, if you have decided which of the squares adjacent to a white clue has to be a corner, but don't yet know which way the corner turns, you might mark the one way it <em>can't</em> go with a cross.)
+</p>
+<p>
+Alternatively, use the cursor keys to move the cursor. Use the Enter key to begin and end keyboard &#8216;drag&#8217; operations. Use the Space, Escape or Backspace keys to cancel the drag. Or, hold Control while dragging with the cursor keys to toggle segments as you move between squares.
+</p>
+<p>
+Pressing Control-Shift-arrowkey or Shift-arrowkey simulates a left or right click, respectively, on the edge in the direction of the key.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S36.2"></a>36.2 <a name="i3"></a>Pearl parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/pegs.R b/apps/plugins/puzzles/src/pegs.R
index 1e79e99ca0..1e79e99ca0 100644
--- a/apps/plugins/puzzles/pegs.R
+++ b/apps/plugins/puzzles/src/pegs.R
diff --git a/apps/plugins/puzzles/pegs.c b/apps/plugins/puzzles/src/pegs.c
index f02e25cafa..8286851954 100644
--- a/apps/plugins/puzzles/pegs.c
+++ b/apps/plugins/puzzles/src/pegs.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1302,7 +1302,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Pegs", "games.pegs", "pegs",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/pegs.html b/apps/plugins/puzzles/src/pegs.html
new file mode 100644
index 0000000000..cfe2e76eeb
--- /dev/null
+++ b/apps/plugins/puzzles/src/pegs.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Pegs</title>
+<link rel="previous" href="guess.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="dominosa.html">
+</head>
+<body>
+<p><a href="guess.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="dominosa.html">Next</a></p>
+<h1><a name="C16"></a>Chapter 16: <a name="i0"></a>Pegs</h1>
+<p>
+A number of pegs are placed in holes on a board. You can remove a peg by jumping an adjacent peg over it (horizontally or vertically) to a vacant hole on the other side. Your aim is to remove all but one of the pegs initially present.
+</p>
+<p>
+This game, best known as <a name="i1"></a>&#8216;Peg Solitaire&#8217;, is possibly one of the oldest puzzle games still commonly known.
+</p>
+<h2><a name="S16.1"></a>16.1 <a name="i2"></a>Pegs controls</h2>
+<p>
+To move a peg, drag it with the mouse from its current position to its final position. If the final position is exactly two holes away from the initial position, is currently unoccupied by a peg, and there is a peg in the intervening square, the move will be permitted and the intervening peg will be removed.
+</p>
+<p>
+Vacant spaces which you can move a peg into are marked with holes. A space with no peg and no hole is not available for moving at all: it is an obstacle which you must work around.
+</p>
+<p>
+You can also use the cursor keys to move a position indicator around the board. Pressing the return key while over a peg, followed by a cursor key, will jump the peg in that direction (if that is a legal move).
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S16.2"></a>16.2 <a name="i3"></a>Pegs parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in holes.
+</dd>
+<dt>
+<em>Board type</em>
+</dt>
+<dd>
+Controls whether you are given a board of a standard shape or a randomly generated shape. The two standard shapes currently supported are &#8216;Cross&#8217; and &#8216;Octagon&#8217; (also commonly known as the English and European traditional board layouts respectively). Selecting &#8216;Random&#8217; will give you a different board shape every time (but always one that is known to have a solution).
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/penrose.c b/apps/plugins/puzzles/src/penrose.c
index 839b50a853..ccde30d8b4 100644
--- a/apps/plugins/puzzles/penrose.c
+++ b/apps/plugins/puzzles/src/penrose.c
@@ -7,7 +7,7 @@
  * http://tartarus.org/simon/20110412-penrose/penrose.xhtml
  */
 
-#include "rbassert.h"
+#include <assert.h>
 #include <string.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/apps/plugins/puzzles/penrose.h b/apps/plugins/puzzles/src/penrose.h
index ba5ae16f2c..ba5ae16f2c 100644
--- a/apps/plugins/puzzles/penrose.h
+++ b/apps/plugins/puzzles/src/penrose.h
diff --git a/apps/plugins/puzzles/printing.c b/apps/plugins/puzzles/src/printing.c
index e921a4d545..e921a4d545 100644
--- a/apps/plugins/puzzles/printing.c
+++ b/apps/plugins/puzzles/src/printing.c
diff --git a/apps/plugins/puzzles/ps.c b/apps/plugins/puzzles/src/ps.c
index 67d76b4daa..2394cc5e8e 100644
--- a/apps/plugins/puzzles/ps.c
+++ b/apps/plugins/puzzles/src/ps.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 
 #include "puzzles.h"
 
diff --git a/apps/plugins/puzzles/puzzles.but b/apps/plugins/puzzles/src/puzzles.but
index 2508fe3337..2508fe3337 100644
--- a/apps/plugins/puzzles/puzzles.but
+++ b/apps/plugins/puzzles/src/puzzles.but
diff --git a/apps/plugins/puzzles/src/puzzles.cnt b/apps/plugins/puzzles/src/puzzles.cnt
new file mode 100644
index 0000000000..fef32228ea
--- /dev/null
+++ b/apps/plugins/puzzles/src/puzzles.cnt
@@ -0,0 +1,167 @@
+:Title Simon Tatham's Portable Puzzle Collection
+1 Contents=Top
+1 Chapter 1: Introduction
+2 Chapter 1: Introduction=t00000000
+1 Chapter 2: Common features
+2 Chapter 2: Common features=t00000001
+2 Section 2.1: Common actions=t00000002
+2 Section 2.2: Specifying games with the game ID=t00000003
+2 Section 2.3: The ‘Type’ menu=t00000004
+2 Section 2.4: Specifying game parameters on the command line=t00000005
+2 Section 2.5: Unix command-line options=t00000006
+1 Chapter 3: Net
+2 Chapter 3: Net=games.net
+2 Section 3.1: Net controls=t00000007
+2 Section 3.2: Net parameters=t00000008
+1 Chapter 4: Cube
+2 Chapter 4: Cube=games.cube
+2 Section 4.1: Cube controls=t00000009
+2 Section 4.2: Cube parameters=t00000010
+1 Chapter 5: Fifteen
+2 Chapter 5: Fifteen=games.fifteen
+2 Section 5.1: Fifteen controls=t00000011
+2 Section 5.2: Fifteen parameters=t00000012
+1 Chapter 6: Sixteen
+2 Chapter 6: Sixteen=games.sixteen
+2 Section 6.1: Sixteen controls=t00000013
+2 Section 6.2: Sixteen parameters=t00000014
+1 Chapter 7: Twiddle
+2 Chapter 7: Twiddle=games.twiddle
+2 Section 7.1: Twiddle controls=t00000015
+2 Section 7.2: Twiddle parameters=t00000016
+1 Chapter 8: Rectangles
+2 Chapter 8: Rectangles=games.rectangles
+2 Section 8.1: Rectangles controls=t00000017
+2 Section 8.2: Rectangles parameters=t00000018
+1 Chapter 9: Netslide
+2 Chapter 9: Netslide=games.netslide
+1 Chapter 10: Pattern
+2 Chapter 10: Pattern=games.pattern
+2 Section 10.1: Pattern controls=t00000019
+2 Section 10.2: Pattern parameters=t00000020
+1 Chapter 11: Solo
+2 Chapter 11: Solo=games.solo
+2 Section 11.1: Solo controls=t00000021
+2 Section 11.2: Solo parameters=t00000022
+1 Chapter 12: Mines
+2 Chapter 12: Mines=games.mines
+2 Section 12.1: Mines controls=t00000023
+2 Section 12.2: Mines parameters=t00000024
+1 Chapter 13: Same Game
+2 Chapter 13: Same Game=games.samegame
+2 Section 13.1: Same Game controls=t00000025
+2 Section 13.2: Same Game parameters=t00000026
+1 Chapter 14: Flip
+2 Chapter 14: Flip=games.flip
+2 Section 14.1: Flip controls=t00000027
+2 Section 14.2: Flip parameters=t00000028
+1 Chapter 15: Guess
+2 Chapter 15: Guess=games.guess
+2 Section 15.1: Guess controls=t00000029
+2 Section 15.2: Guess parameters=t00000030
+1 Chapter 16: Pegs
+2 Chapter 16: Pegs=games.pegs
+2 Section 16.1: Pegs controls=t00000031
+2 Section 16.2: Pegs parameters=t00000032
+1 Chapter 17: Dominosa
+2 Chapter 17: Dominosa=games.dominosa
+2 Section 17.1: Dominosa controls=t00000033
+2 Section 17.2: Dominosa parameters=t00000034
+1 Chapter 18: Untangle
+2 Chapter 18: Untangle=games.untangle
+2 Section 18.1: Untangle controls=t00000035
+2 Section 18.2: Untangle parameters=t00000036
+1 Chapter 19: Black Box
+2 Chapter 19: Black Box=games.blackbox
+2 Section 19.1: Black Box controls=t00000037
+2 Section 19.2: Black Box parameters=t00000038
+1 Chapter 20: Slant
+2 Chapter 20: Slant=games.slant
+2 Section 20.1: Slant controls=t00000039
+2 Section 20.2: Slant parameters=t00000040
+1 Chapter 21: Light Up
+2 Chapter 21: Light Up=games.lightup
+2 Section 21.1: Light Up controls=t00000041
+2 Section 21.2: Light Up parameters=t00000042
+1 Chapter 22: Map
+2 Chapter 22: Map=games.map
+2 Section 22.1: Map controls=t00000043
+2 Section 22.2: Map parameters=t00000044
+1 Chapter 23: Loopy
+2 Chapter 23: Loopy=games.loopy
+2 Section 23.1: Loopy controls=t00000045
+2 Section 23.2: Loopy parameters=t00000046
+1 Chapter 24: Inertia
+2 Chapter 24: Inertia=games.inertia
+2 Section 24.1: Inertia controls=t00000047
+2 Section 24.2: Inertia parameters=t00000048
+1 Chapter 25: Tents
+2 Chapter 25: Tents=games.tents
+2 Section 25.1: Tents controls=t00000049
+2 Section 25.2: Tents parameters=t00000050
+1 Chapter 26: Bridges
+2 Chapter 26: Bridges=games.bridges
+2 Section 26.1: Bridges controls=t00000051
+2 Section 26.2: Bridges parameters=t00000052
+1 Chapter 27: Unequal
+2 Chapter 27: Unequal=games.unequal
+2 Section 27.1: Unequal controls=t00000053
+2 Section 27.2: Unequal parameters=t00000054
+1 Chapter 28: Galaxies
+2 Chapter 28: Galaxies=games.galaxies
+2 Section 28.1: Galaxies controls=t00000055
+2 Section 28.2: Galaxies parameters=t00000056
+1 Chapter 29: Filling
+2 Chapter 29: Filling=games.filling
+2 Section 29.1: Filling controls=t00000057
+2 Section 29.2: Filling parameters=t00000058
+1 Chapter 30: Keen
+2 Chapter 30: Keen=games.keen
+2 Section 30.1: Keen controls=t00000059
+2 Section 30.2: Keen parameters=t00000060
+1 Chapter 31: Towers
+2 Chapter 31: Towers=games.towers
+2 Section 31.1: Towers controls=t00000061
+2 Section 31.2: Towers parameters=t00000062
+1 Chapter 32: Singles
+2 Chapter 32: Singles=games.singles
+2 Section 32.1: Singles controls=t00000063
+2 Section 32.2: Singles parameters=t00000064
+1 Chapter 33: Magnets
+2 Chapter 33: Magnets=games.magnets
+2 Section 33.1: Magnets controls=t00000065
+2 Section 33.2: Magnets parameters=t00000066
+1 Chapter 34: Signpost
+2 Chapter 34: Signpost=games.signpost
+2 Section 34.1: Signpost controls=t00000067
+2 Section 34.2: Signpost parameters=t00000068
+1 Chapter 35: Range
+2 Chapter 35: Range=games.range
+2 Section 35.1: Range controls=t00000069
+2 Section 35.2: Range parameters=t00000070
+1 Chapter 36: Pearl
+2 Chapter 36: Pearl=games.pearl
+2 Section 36.1: Pearl controls=t00000071
+2 Section 36.2: Pearl parameters=t00000072
+1 Chapter 37: Undead
+2 Chapter 37: Undead=games.undead
+2 Section 37.1: Undead controls=t00000073
+2 Section 37.2: Undead parameters=t00000074
+1 Chapter 38: Unruly
+2 Chapter 38: Unruly=games.unruly
+2 Section 38.1: Unruly controls=t00000075
+2 Section 38.2: Unruly parameters=t00000076
+1 Chapter 39: Flood
+2 Chapter 39: Flood=games.flood
+2 Section 39.1: Flood controls=t00000077
+2 Section 39.2: Flood parameters=t00000078
+1 Chapter 40: Tracks
+2 Chapter 40: Tracks=games.tracks
+2 Section 40.1: Tracks controls=t00000079
+2 Section 40.2: Tracks parameters=t00000080
+1 Chapter 41: Palisade
+2 Chapter 41: Palisade=games.palisade
+2 Section 41.1: Palisade controls=t00000081
+2 Section 41.2: Palisade parameters=t00000082
+1 Appendix A: Licence
+2 Appendix A: Licence=t00000083
diff --git a/apps/plugins/puzzles/puzzles.h b/apps/plugins/puzzles/src/puzzles.h
index c70b33ccbf..03af2ca186 100644
--- a/apps/plugins/puzzles/puzzles.h
+++ b/apps/plugins/puzzles/src/puzzles.h
@@ -5,16 +5,9 @@
 #ifndef PUZZLES_PUZZLES_H
 #define PUZZLES_PUZZLES_H
 
-#include "plugin.h"
-#include <tlsf.h>
-#include "rbcompat.h"
-#include "lib/pluginlib_exit.h"
-
-#ifdef ROCKBOX
-#if LCD_WIDTH < LCD_HEIGHT
-#define PORTRAIT_SCREEN
-#endif
-#endif
+#include <stdio.h>  /* for FILE */
+#include <stdlib.h> /* for size_t */
+#include <limits.h> /* for UINT_MAX */
 
 #ifndef TRUE
 #define TRUE 1
@@ -27,7 +20,6 @@
 
 #define lenof(array) ( sizeof(array) / sizeof(*(array)) )
 
-#undef STR
 #define STR_INT(x) #x
 #define STR(x) STR_INT(x)
 
@@ -162,6 +154,54 @@ struct config_item {
 };
 
 /*
+ * Structure used to communicate the presets menu from midend to
+ * frontend. In principle, it's also used to pass the same information
+ * from game to midend, though games that don't specify a menu
+ * hierarchy (i.e. most of them) will use the simpler fetch_preset()
+ * function to return an unstructured list.
+ *
+ * A tree of these structures always belongs to the midend, and only
+ * the midend should ever need to free it. The front end should treat
+ * them as read-only.
+ */
+struct preset_menu_entry {
+    char *title;
+    /* Exactly one of the next two fields is NULL, depending on
+     * whether this entry is a submenu title or an actual preset */
+    game_params *params;
+    struct preset_menu *submenu;
+    /* Every preset menu entry has a number allocated by the mid-end,
+     * so that midend_which_preset() can return a value that
+     * identifies an entry anywhere in the menu hierarchy. The values
+     * will be allocated reasonably densely from 1 upwards (so it's
+     * reasonable for the front end to use them as array indices if it
+     * needs to store GUI state per menu entry), but no other
+     * guarantee is given about their ordering.
+     *
+     * Entries containing submenus have ids too - not only the actual
+     * presets are numbered. */
+    int id;
+};
+struct preset_menu {
+    int n_entries;             /* number of entries actually in use */
+    int entries_size;          /* space currently allocated in this array */
+    struct preset_menu_entry *entries;
+};
+/* For games which do want to directly return a tree of these, here
+ * are convenience routines (in midend.c) for constructing one. These
+ * assume that 'title' and 'encoded_params' are already dynamically
+ * allocated by the caller; the resulting preset_menu tree takes
+ * ownership of them. */
+struct preset_menu *preset_menu_new(void);
+struct preset_menu *preset_menu_add_submenu(struct preset_menu *parent,
+                                            char *title);
+void preset_menu_add_preset(struct preset_menu *menu,
+                            char *title, game_params *params);
+/* Helper routine front ends can use for one of the ways they might
+ * want to organise their preset menu usage */
+game_params *preset_menu_lookup_by_id(struct preset_menu *menu, int id);
+
+/*
  * Platform routines
  */
 
@@ -250,9 +290,7 @@ void midend_redraw(midend *me);
 float *midend_colours(midend *me, int *ncolours);
 void midend_freeze_timer(midend *me, float tprop);
 void midend_timer(midend *me, float tplus);
-int midend_num_presets(midend *me);
-void midend_fetch_preset(midend *me, int n,
-                         char **name, game_params **params);
+struct preset_menu *midend_get_presets(midend *me, int *id_limit);
 int midend_which_preset(midend *me);
 int midend_wants_statusbar(midend *me);
 enum { CFG_SETTINGS, CFG_SEED, CFG_DESC, CFG_FRONTEND_SPECIFIC };
@@ -338,6 +376,11 @@ void pos2c(int w, int h, int pos, int *cx, int *cy);
 void draw_text_outline(drawing *dr, int x, int y, int fonttype,
                        int fontsize, int align,
                        int text_colour, int outline_colour, char *text);
+
+/* Copies text left-justified with spaces. Length of string must be
+ * less than buffer size. */
+void copy_left_justified(char *buf, size_t sz, const char *str);
+
 /*
  * dsf.c
  */
@@ -451,9 +494,9 @@ void document_print(document *doc, drawing *dr);
 /*
  * ps.c
  */
-//psdata *ps_init(FILE *outfile, int colour);
-//void ps_free(psdata *ps);
-//drawing *ps_drawing_api(psdata *ps);
+psdata *ps_init(FILE *outfile, int colour);
+void ps_free(psdata *ps);
+drawing *ps_drawing_api(psdata *ps);
 
 /*
  * combi.c: provides a structure and functions for iterating over
@@ -522,6 +565,7 @@ struct game {
     const char *winhelp_topic, *htmlhelp_topic;
     game_params *(*default_params)(void);
     int (*fetch_preset)(int i, char **name, game_params **params);
+    struct preset_menu *(*preset_menu)(void);
     void (*decode_params)(game_params *, char const *string);
     char *(*encode_params)(const game_params *, int full);
     void (*free_params)(game_params *params);
diff --git a/apps/plugins/puzzles/src/puzzles.hlp b/apps/plugins/puzzles/src/puzzles.hlp
new file mode 100644
index 0000000000..f59292eb20
--- /dev/null
+++ b/apps/plugins/puzzles/src/puzzles.hlp
diff --git a/apps/plugins/puzzles/puzzles.rc2 b/apps/plugins/puzzles/src/puzzles.rc2
index 4442a9b138..4442a9b138 100644
--- a/apps/plugins/puzzles/puzzles.rc2
+++ b/apps/plugins/puzzles/src/puzzles.rc2
diff --git a/apps/plugins/puzzles/src/puzzles.txt b/apps/plugins/puzzles/src/puzzles.txt
new file mode 100644
index 0000000000..88d83f791d
--- /dev/null
+++ b/apps/plugins/puzzles/src/puzzles.txt
@@ -0,0 +1,3163 @@
+                 Simon Tatham's Portable Puzzle Collection
+                 =========================================
+
+This is a collection of small one-player puzzle games.
+
+This manual is copyright 2004-2014 Simon Tatham. All rights reserved. You
+may distribute this documentation under the MIT licence. See appendix A for
+the licence text in full.
+
+Chapter 1: Introduction
+-----------------------
+
+       I wrote this collection because I thought there should be more small
+       desktop toys available: little games you can pop up in a window and
+       play for two or three minutes while you take a break from whatever
+       else you were doing. And I was also annoyed that every time I found
+       a good game on (say) Unix, it wasn't available the next time I was
+       sitting at a Windows machine, or vice versa; so I arranged that
+       everything in my personal puzzle collection will happily run on
+       both, and have more recently done a port to Mac OS X as well. When I
+       find (or perhaps invent) further puzzle games that I like, they'll
+       be added to this collection and will immediately be available on
+       both platforms. And if anyone feels like writing any other front
+       ends - PocketPC, Mac OS pre-10, or whatever it might be - then all
+       the games in this framework will immediately become available on
+       another platform as well.
+
+       The actual games in this collection were mostly not my invention;
+       they are re-implementations of existing game concepts within my
+       portable puzzle framework. I do not claim credit, in general, for
+       inventing the rules of any of these puzzles. (I don't even claim
+       authorship of all the code; some of the puzzles have been submitted
+       by other authors.)
+
+       This collection is distributed under the MIT licence (see appendix
+       A). This means that you can do pretty much anything you like with
+       the game binaries or the code, except pretending you wrote them
+       yourself, or suing me if anything goes wrong.
+
+       The most recent versions, and source code, can be found at
+       http://www.chiark.greenend.org.uk/~sgtatham/puzzles/.
+
+       Please report bugs to anakin@pobox.com. You might find it helpful to
+       read this article before reporting a bug:
+
+       http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
+
+       Patches are welcome. Especially if they provide a new front end (to
+       make all these games run on another platform), or a new game.
+
+Chapter 2: Common features
+--------------------------
+
+       This chapter describes features that are common to all the games.
+
+   2.1 Common actions
+
+       These actions are all available from the `Game' menu and via
+       keyboard shortcuts, in addition to any game-specific actions.
+
+       (On Mac OS X, to conform with local user interface standards, these
+       actions are situated on the `File' and `Edit' menus instead.)
+
+       _New game_ (`N', Ctrl+`N')
+
+           Starts a new game, with a random initial state.
+
+       _Restart game_
+
+           Resets the current game to its initial state. (This can be
+           undone.)
+
+       _Load_
+
+           Loads a saved game from a file on disk.
+
+       _Save_
+
+           Saves the current state of your game to a file on disk.
+
+           The Load and Save operations preserve your entire game history
+           (so you can save, reload, and still Undo and Redo things you had
+           done before saving).
+
+       _Print_
+
+           Where supported (currently only on Windows), brings up a dialog
+           allowing you to print an arbitrary number of puzzles randomly
+           generated from the current parameters, optionally including
+           the current puzzle. (Only for puzzles which make sense to
+           print, of course - it's hard to think of a sensible printable
+           representation of Fifteen!)
+
+       _Undo_ (`U', Ctrl+`Z', Ctrl+`_')
+
+           Undoes a single move. (You can undo moves back to the start of
+           the session.)
+
+       _Redo_ (`R', Ctrl+`R')
+
+           Redoes a previously undone move.
+
+       _Copy_
+
+           Copies the current state of your game to the clipboard in text
+           format, so that you can paste it into (say) an e-mail client or
+           a web message board if you're discussing the game with someone
+           else. (Not all games support this feature.)
+
+       _Solve_
+
+           Transforms the puzzle instantly into its solved state. For some
+           games (Cube) this feature is not supported at all because it is
+           of no particular use. For other games (such as Pattern), the
+           solved state can be used to give you information, if you can't
+           see how a solution can exist at all or you want to know where
+           you made a mistake. For still other games (such as Sixteen),
+           automatic solution tells you nothing about how to _get_ to
+           the solution, but it does provide a useful way to get there
+           quickly so that you can experiment with set-piece moves and
+           transformations.
+
+           Some games (such as Solo) are capable of solving a game ID you
+           have typed in from elsewhere. Other games (such as Rectangles)
+           cannot solve a game ID they didn't invent themself, but when
+           they did invent the game ID they know what the solution is
+           already. Still other games (Pattern) can solve _some_ external
+           game IDs, but only if they aren't too difficult.
+
+           The `Solve' command adds the solved state to the end of the undo
+           chain for the puzzle. In other words, if you want to go back to
+           solving it yourself after seeing the answer, you can just press
+           Undo.
+
+       _Quit_ (`Q', Ctrl+`Q')
+
+           Closes the application entirely.
+
+   2.2 Specifying games with the game ID
+
+       There are two ways to save a game specification out of a puzzle and
+       recreate it later, or recreate it in somebody else's copy of the
+       same puzzle.
+
+       The `Specific' and `Random Seed' options from the `Game' menu (or
+       the `File' menu, on Mac OS X) each show a piece of text (a `game
+       ID') which is sufficient to reconstruct precisely the same game at a
+       later date.
+
+       You can enter either of these pieces of text back into the program
+       (via the same `Specific' or `Random Seed' menu options) at a later
+       point, and it will recreate the same game. You can also use either
+       one as a command line argument (on Windows or Unix); see section 2.4
+       for more detail.
+
+       The difference between the two forms is that a descriptive game ID
+       is a literal _description_ of the initial state of the game, whereas
+       a random seed is just a piece of arbitrary text which was provided
+       as input to the random number generator used to create the puzzle.
+       This means that:
+
+        -  Descriptive game IDs tend to be longer in many puzzles
+           (although some, such as Cube (chapter 4), only need very short
+           descriptions). So a random seed is often a _quicker_ way to
+           note down the puzzle you're currently playing, or to tell it to
+           somebody else so they can play the same one as you.
+
+        -  Any text at all is a valid random seed. The automatically
+           generated ones are fifteen-digit numbers, but anything will do;
+           you can type in your full name, or a word you just made up, and
+           a valid puzzle will be generated from it. This provides a way
+           for two or more people to race to complete the same puzzle:
+           you think of a random seed, then everybody types it in at the
+           same time, and nobody has an advantage due to having seen the
+           generated puzzle before anybody else.
+
+        -  It is often possible to convert puzzles from other sources (such
+           as `nonograms' or `sudoku' from newspapers) into descriptive
+           game IDs suitable for use with these programs.
+
+        -  Random seeds are not guaranteed to produce the same result
+           if you use them with a different _version_ of the puzzle
+           program. This is because the generation algorithm might have
+           been improved or modified in later versions of the code, and
+           will therefore produce a different result when given the same
+           sequence of random numbers. Use a descriptive game ID if you
+           aren't sure that it will be used on the same version of the
+           program as yours.
+
+           (Use the `About' menu option to find out the version number of
+           the program. Programs with the same version number running on
+           different platforms should still be random-seed compatible.)
+
+       A descriptive game ID starts with a piece of text which encodes the
+       _parameters_ of the current game (such as grid size). Then there is
+       a colon, and after that is the description of the game's initial
+       state. A random seed starts with a similar string of parameters, but
+       then it contains a hash sign followed by arbitrary data.
+
+       If you enter a descriptive game ID, the program will not be able
+       to show you the random seed which generated it, since it wasn't
+       generated _from_ a random seed. If you _enter_ a random seed,
+       however, the program will be able to show you the descriptive game
+       ID derived from that random seed.
+
+       Note that the game parameter strings are not always identical
+       between the two forms. For some games, there will be parameter
+       data provided with the random seed which is not included in the
+       descriptive game ID. This is because that parameter information is
+       only relevant when _generating_ puzzle grids, and is not important
+       when playing them. Thus, for example, the difficulty level in Solo
+       (chapter 11) is not mentioned in the descriptive game ID.
+
+       These additional parameters are also not set permanently if you type
+       in a game ID. For example, suppose you have Solo set to `Advanced'
+       difficulty level, and then a friend wants your help with a `Trivial'
+       puzzle; so the friend reads out a random seed specifying `Trivial'
+       difficulty, and you type it in. The program will generate you the
+       same `Trivial' grid which your friend was having trouble with, but
+       once you have finished playing it, when you ask for a new game it
+       will automatically go back to the `Advanced' difficulty which it was
+       previously set on.
+
+   2.3 The `Type' menu
+
+       The `Type' menu, if present, may contain a list of preset game
+       settings. Selecting one of these will start a new random game with
+       the parameters specified.
+
+       The `Type' menu may also contain a `Custom' option which allows you
+       to fine-tune game parameters. The parameters available are specific
+       to each game and are described in the following sections.
+
+   2.4 Specifying game parameters on the command line
+
+       (This section does not apply to the Mac OS X version.)
+
+       The games in this collection deliberately do not ever save
+       information on to the computer they run on: they have no high score
+       tables and no saved preferences. (This is because I expect at least
+       some people to play them at work, and those people will probably
+       appreciate leaving as little evidence as possible!)
+
+       However, if you do want to arrange for one of these games to default
+       to a particular set of parameters, you can specify them on the
+       command line.
+
+       The easiest way to do this is to set up the parameters you want
+       using the `Type' menu (see section 2.3), and then to select `Random
+       Seed' from the `Game' or `File' menu (see section 2.2). The text
+       in the `Game ID' box will be composed of two parts, separated by a
+       hash. The first of these parts represents the game parameters (the
+       size of the playing area, for example, and anything else you set
+       using the `Type' menu).
+
+       If you run the game with just that parameter text on the command
+       line, it will start up with the settings you specified.
+
+       For example: if you run Cube (see chapter 4), select `Octahedron'
+       from the `Type' menu, and then go to the game ID selection, you
+       will see a string of the form `o2x2#338686542711620'. Take only the
+       part before the hash (`o2x2'), and start Cube with that text on the
+       command line: `PREFIX-cube o2x2'.
+
+       If you copy the _entire_ game ID on to the command line, the game
+       will start up in the specific game that was described. This is
+       occasionally a more convenient way to start a particular game ID
+       than by pasting it into the game ID selection box.
+
+       (You could also retrieve the encoded game parameters using the
+       `Specific' menu option instead of `Random Seed', but if you do then
+       some options, such as the difficulty level in Solo, will be missing.
+       See section 2.2 for more details on this.)
+
+   2.5 Unix command-line options
+
+       (This section only applies to the Unix port.)
+
+       In addition to being able to specify game parameters on the command
+       line (see section 2.4), there are various other options:
+
+       --game
+
+       --load
+
+           These options respectively determine whether the command-line
+           argument is treated as specifying game parameters or a save
+           file to load. Only one should be specified. If neither of these
+           options is specified, a guess is made based on the format of the
+           argument.
+
+       --generate _n_
+
+           If this option is specified, instead of a puzzle being
+           displayed, a number of descriptive game IDs will be invented and
+           printed on standard output. This is useful for gaining access
+           to the game generation algorithms without necessarily using the
+           frontend.
+
+           If game parameters are specified on the command-line, they will
+           be used to generate the game IDs; otherwise a default set of
+           parameters will be used.
+
+           The most common use of this option is in conjunction with `--
+           print', in which case its behaviour is slightly different; see
+           below.
+
+       --print _w_x_h_
+
+           If this option is specified, instead of a puzzle being
+           displayed, a printed representation of one or more unsolved
+           puzzles is sent to standard output, in PostScript format.
+
+           On each page of puzzles, there will be _w_ across and _h_ down.
+           If there are more puzzles than _w_x_h_, more than one page will
+           be printed.
+
+           If `--generate' has also been specified, the invented game
+           IDs will be used to generate the printed output. Otherwise,
+           a list of game IDs is expected on standard input (which can
+           be descriptive or random seeds; see section 2.2), in the same
+           format produced by `--generate'.
+
+           For example:
+
+             PREFIX-net --generate 12 --print 2x3 7x7w | lpr
+
+           will generate two pages of printed Net puzzles (each of which
+           will have a 7x7 wrapping grid), and pipe the output to the `lpr'
+           command, which on many systems will send them to an actual
+           printer.
+
+           There are various other options which affect printing; see
+           below.
+
+       --save _file-prefix_ [ --save-suffix _file-suffix_ ]
+
+           If this option is specified, instead of a puzzle being
+           displayed, saved-game files for one or more unsolved puzzles are
+           written to files constructed from the supplied prefix and/or
+           suffix.
+
+           If `--generate' has also been specified, the invented game
+           IDs will be used to generate the printed output. Otherwise,
+           a list of game IDs is expected on standard input (which can
+           be descriptive or random seeds; see section 2.2), in the same
+           format produced by `--generate'.
+
+           For example:
+
+             PREFIX-net --generate 12 --save game --save-suffix .sav
+
+           will generate twelve Net saved-game files with the names
+           game0.sav to game11.sav.
+
+       --version
+
+           Prints version information about the game, and then quits.
+
+       The following options are only meaningful if `--print' is also
+       specified:
+
+       --with-solutions
+
+           The set of pages filled with unsolved puzzles will be followed
+           by the solutions to those puzzles.
+
+       --scale _n_
+
+           Adjusts how big each puzzle is when printed. Larger numbers make
+           puzzles bigger; the default is 1.0.
+
+       --colour
+
+           Puzzles will be printed in colour, rather than in black and
+           white (if supported by the puzzle).
+
+Chapter 3: Net
+--------------
+
+       (_Note:_ the Windows version of this game is called NETGAME.EXE to
+       avoid clashing with Windows's own NET.EXE.)
+
+       I originally saw this in the form of a Flash game called
+       FreeNet [1], written by Pavils Jurjans; there are several other
+       implementations under the name NetWalk. The computer prepares a
+       network by connecting up the centres of squares in a grid, and then
+       shuffles the network by rotating every tile randomly. Your job is
+       to rotate it all back into place. The successful solution will be
+       an entirely connected network, with no closed loops. As a visual
+       aid, all tiles which are connected to the one in the middle are
+       highlighted.
+
+       [1] http://www.jurjans.lv/stuff/net/FreeNet.htm
+
+   3.1 Net controls
+
+       This game can be played with either the keyboard or the mouse. The
+       controls are:
+
+       _Select tile_: mouse pointer, arrow keys
+
+       _Rotate tile anticlockwise_: left mouse button, `A' key
+
+       _Rotate tile clockwise_: right mouse button, `D' key
+
+       _Rotate tile by 180 degrees_: `F' key
+
+       _Lock (or unlock) tile_: middle mouse button, shift-click, `S' key
+
+           You can lock a tile once you're sure of its orientation. You
+           can also unlock it again, but while it's locked you can't
+           accidentally turn it.
+
+       The following controls are not necessary to complete the game, but
+       may be useful:
+
+       _Shift grid_: Shift + arrow keys
+
+           On grids that wrap, you can move the origin of the grid, so
+           that tiles that were on opposite sides of the grid can be seen
+           together.
+
+       _Move centre_: Ctrl + arrow keys
+
+           You can change which tile is used as the source of highlighting.
+           (It doesn't ultimately matter which tile this is, as every tile
+           will be connected to every other tile in a correct solution,
+           but it may be helpful in the intermediate stages of solving the
+           puzzle.)
+
+       _Jumble tiles_: `J' key
+
+           This key turns all tiles that are not locked to random
+           orientations.
+
+       (All the actions described in section 2.1 are also available.)
+
+   3.2 Net parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in tiles.
+
+       _Walls wrap around_
+
+           If checked, flow can pass from the left edge to the right edge,
+           and from top to bottom, and vice versa.
+
+       _Barrier probability_
+
+           A number between 0.0 and 1.0 controlling whether an immovable
+           barrier is placed between two tiles to prevent flow between
+           them (a higher number gives more barriers). Since barriers
+           are immovable, they act as constraints on the solution (i.e.,
+           hints).
+
+           The grid generation in Net has been carefully arranged so that
+           the barriers are independent of the rest of the grid. This
+           means that if you note down the random seed used to generate
+           the current puzzle (see section 2.2), change the _Barrier
+           probability_ parameter, and then re-enter the same random seed,
+           you should see exactly the same starting grid, with the only
+           change being the number of barriers. So if you're stuck on a
+           particular grid and need a hint, you could start up another
+           instance of Net, set up the same parameters but a higher barrier
+           probability, and enter the game seed from the original Net
+           window.
+
+       _Ensure unique solution_
+
+           Normally, Net will make sure that the puzzles it presents have
+           only one solution. Puzzles with ambiguous sections can be more
+           difficult and more subtle, so if you like you can turn off this
+           feature and risk having ambiguous puzzles. (Also, finding _all_
+           the possible solutions can be an additional challenge for an
+           advanced player.)
+
+Chapter 4: Cube
+---------------
+
+       This is another one I originally saw as a web game. This one was a
+       Java game [2], by Paul Scott. You have a grid of 16 squares, six of
+       which are blue; on one square rests a cube. Your move is to use the
+       arrow keys to roll the cube through 90 degrees so that it moves to
+       an adjacent square. If you roll the cube on to a blue square, the
+       blue square is picked up on one face of the cube; if you roll a blue
+       face of the cube on to a non-blue square, the blueness is put down
+       again. (In general, whenever you roll the cube, the two faces that
+       come into contact swap colours.) Your job is to get all six blue
+       squares on to the six faces of the cube at the same time. Count your
+       moves and try to do it in as few as possible.
+
+       Unlike the original Java game, my version has an additional feature:
+       once you've mastered the game with a cube rolling on a square grid,
+       you can change to a triangular grid and roll any of a tetrahedron,
+       an octahedron or an icosahedron.
+
+       [2] http://www3.sympatico.ca/paulscott/cube/cube.htm
+
+   4.1 Cube controls
+
+       This game can be played with either the keyboard or the mouse.
+
+       Left-clicking anywhere on the window will move the cube (or other
+       solid) towards the mouse pointer.
+
+       The arrow keys can also used to roll the cube on its square grid in
+       the four cardinal directions. On the triangular grids, the mapping
+       of arrow keys to directions is more approximate. Vertical movement
+       is disallowed where it doesn't make sense. The four keys surrounding
+       the arrow keys on the numeric keypad (`7', `9', `1', `3') can be
+       used for diagonal movement.
+
+       (All the actions described in section 2.1 are also available.)
+
+   4.2 Cube parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Type of solid_
+
+           Selects the solid to roll (and hence the shape of the grid):
+           tetrahedron, cube, octahedron, or icosahedron.
+
+       _Width / top_, _Height / bottom_
+
+           On a square grid, horizontal and vertical dimensions. On a
+           triangular grid, the number of triangles on the top and bottom
+           rows respectively.
+
+Chapter 5: Fifteen
+------------------
+
+       The old ones are the best: this is the good old `15-puzzle' with
+       sliding tiles. You have a 4x4 square grid; 15 squares contain
+       numbered tiles, and the sixteenth is empty. Your move is to choose a
+       tile next to the empty space, and slide it into the space. The aim
+       is to end up with the tiles in numerical order, with the space in
+       the bottom right (so that the top row reads 1,2,3,4 and the bottom
+       row reads 13,14,15,_space_).
+
+   5.1 Fifteen controls
+
+       This game can be controlled with the mouse or the keyboard.
+
+       A left-click with the mouse in the row or column containing the
+       empty space will move as many tiles as necessary to move the space
+       to the mouse pointer.
+
+       The arrow keys will move a tile adjacent to the space in the
+       direction indicated (moving the space in the _opposite_ direction).
+
+       Pressing `h' will make a suggested move. Pressing `h' enough times
+       will solve the game, but it may scramble your progress while doing
+       so.
+
+       (All the actions described in section 2.1 are also available.)
+
+   5.2 Fifteen parameters
+
+       The only options available from the `Custom...' option on the `Type'
+       menu are _Width_ and _Height_, which are self-explanatory. (Once
+       you've changed these, it's not a `15-puzzle' any more, of course!)
+
+Chapter 6: Sixteen
+------------------
+
+       Another sliding tile puzzle, visually similar to Fifteen (see
+       chapter 5) but with a different type of move. This time, there is no
+       hole: all 16 squares on the grid contain numbered squares. Your move
+       is to shift an entire row left or right, or shift an entire column
+       up or down; every time you do that, the tile you shift off the grid
+       re-appears at the other end of the same row, in the space you just
+       vacated. To win, arrange the tiles into numerical order (1,2,3,4 on
+       the top row, 13,14,15,16 on the bottom). When you've done that, try
+       playing on different sizes of grid.
+
+       I _might_ have invented this game myself, though only by accident
+       if so (and I'm sure other people have independently invented it). I
+       thought I was imitating a screensaver I'd seen, but I have a feeling
+       that the screensaver might actually have been a Fifteen-type puzzle
+       rather than this slightly different kind. So this might be the one
+       thing in my puzzle collection which represents creativity on my part
+       rather than just engineering.
+
+   6.1 Sixteen controls
+
+       Left-clicking on an arrow will move the appropriate row or column in
+       the direction indicated. Right-clicking will move it in the opposite
+       direction.
+
+       Alternatively, use the cursor keys to move the position indicator
+       around the edge of the grid, and use the return key to move the
+       row/column in the direction indicated.
+
+       You can also move the tiles directly. Move the cursor onto a tile,
+       hold Control and press an arrow key to move the tile under the
+       cursor and move the cursor along with the tile. Or, hold Shift to
+       move only the tile. Pressing Enter simulates holding down Control
+       (press Enter again to release), while pressing Space simulates
+       holding down shift.
+
+       (All the actions described in section 2.1 are also available.)
+
+   6.2 Sixteen parameters
+
+       The parameters available from the `Custom...' option on the `Type'
+       menu are:
+
+        -  _Width_ and _Height_, which are self-explanatory.
+
+        -  You can ask for a limited shuffling operation to be performed on
+           the grid. By default, Sixteen will shuffle the grid in such a
+           way that any arrangement is about as probable as any other. You
+           can override this by requesting a precise number of shuffling
+           moves to be performed. Typically your aim is then to determine
+           the precise set of shuffling moves and invert them exactly,
+           so that you answer (say) a four-move shuffle with a four-move
+           solution. Note that the more moves you ask for, the more likely
+           it is that solutions shorter than the target length will turn
+           out to be possible.
+
+Chapter 7: Twiddle
+------------------
+
+       Twiddle is a tile-rearrangement puzzle, visually similar to Sixteen
+       (see chapter 6): you are given a grid of square tiles, each
+       containing a number, and your aim is to arrange the numbers into
+       ascending order.
+
+       In basic Twiddle, your move is to rotate a square group of four
+       tiles about their common centre. (Orientation is not significant
+       in the basic puzzle, although you can select it.) On more advanced
+       settings, you can rotate a larger square group of tiles.
+
+       I first saw this type of puzzle in the GameCube game `Metroid
+       Prime 2'. In the Main Gyro Chamber in that game, there is a puzzle
+       you solve to unlock a door, which is a special case of Twiddle. I
+       developed this game as a generalisation of that puzzle.
+
+   7.1 Twiddle controls
+
+       To play Twiddle, click the mouse in the centre of the square group
+       you wish to rotate. In the basic mode, you rotate a 2x2 square,
+       which means you have to click at a corner point where four tiles
+       meet.
+
+       In more advanced modes you might be rotating 3x3 or even more at a
+       time; if the size of the square is odd then you simply click in the
+       centre tile of the square you want to rotate.
+
+       Clicking with the left mouse button rotates the group anticlockwise.
+       Clicking with the right button rotates it clockwise.
+
+       You can also move an outline square around the grid with the cursor
+       keys; the square is the size above (2x2 by default, or larger).
+       Pressing the return key or space bar will rotate the current square
+       anticlockwise or clockwise respectively.
+
+       (All the actions described in section 2.1 are also available.)
+
+   7.2 Twiddle parameters
+
+       Twiddle provides several configuration options via the `Custom'
+       option on the `Type' menu:
+
+        -  You can configure the width and height of the puzzle grid.
+
+        -  You can configure the size of square block that rotates at a
+           time.
+
+        -  You can ask for every square in the grid to be distinguishable
+           (the default), or you can ask for a simplified puzzle in which
+           there are groups of identical numbers. In the simplified puzzle
+           your aim is just to arrange all the 1s into the first row, all
+           the 2s into the second row, and so on.
+
+        -  You can configure whether the orientation of tiles matters. If
+           you ask for an orientable puzzle, each tile will have a triangle
+           drawn in it. All the triangles must be pointing upwards to
+           complete the puzzle.
+
+        -  You can ask for a limited shuffling operation to be performed
+           on the grid. By default, Twiddle will shuffle the grid so much
+           that any arrangement is about as probable as any other. You can
+           override this by requesting a precise number of shuffling moves
+           to be performed. Typically your aim is then to determine the
+           precise set of shuffling moves and invert them exactly, so that
+           you answer (say) a four-move shuffle with a four-move solution.
+           Note that the more moves you ask for, the more likely it is that
+           solutions shorter than the target length will turn out to be
+           possible.
+
+Chapter 8: Rectangles
+---------------------
+
+       You have a grid of squares, with numbers written in some (but
+       not all) of the squares. Your task is to subdivide the grid into
+       rectangles of various sizes, such that (a) every rectangle contains
+       exactly one numbered square, and (b) the area of each rectangle is
+       equal to the number written in its numbered square.
+
+       Credit for this game goes to the Japanese puzzle magazine Nikoli [3]
+       ; I've also seen a Palm implementation at Puzzle Palace [4]. Unlike
+       Puzzle Palace's implementation, my version automatically generates
+       random grids of any size you like. The quality of puzzle design is
+       therefore not quite as good as hand-crafted puzzles would be, but on
+       the plus side you get an inexhaustible supply of puzzles tailored to
+       your own specification.
+
+       [3] http://www.nikoli.co.jp/en/puzzles/shikaku.html (beware of
+       Flash)
+
+       [4]
+       https://web.archive.org/web/20041024001459/http://www.puzzle.gr.jp/puzzle/sikaku/palm/index.html.en
+
+   8.1 Rectangles controls
+
+       This game is played with the mouse or cursor keys.
+
+       Left-click any edge to toggle it on or off, or left-click and
+       drag to draw an entire rectangle (or line) on the grid in one go
+       (removing any existing edges within that rectangle). Right-clicking
+       and dragging will allow you to erase the contents of a rectangle
+       without affecting its edges.
+
+       Alternatively, use the cursor keys to move the position indicator
+       around the board. Pressing the return key then allows you to use the
+       cursor keys to drag a rectangle out from that position, and pressing
+       the return key again completes the rectangle. Using the space bar
+       instead of the return key allows you to erase the contents of a
+       rectangle without affecting its edges, as above. Pressing escape
+       cancels a drag.
+
+       When a rectangle of the correct size is completed, it will be
+       shaded.
+
+       (All the actions described in section 2.1 are also available.)
+
+   8.2 Rectangles parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid, in squares.
+
+       _Expansion factor_
+
+           This is a mechanism for changing the type of grids generated by
+           the program. Some people prefer a grid containing a few large
+           rectangles to one containing many small ones. So you can ask
+           Rectangles to essentially generate a _smaller_ grid than the
+           size you specified, and then to expand it by adding rows and
+           columns.
+
+           The default expansion factor of zero means that Rectangles will
+           simply generate a grid of the size you ask for, and do nothing
+           further. If you set an expansion factor of (say) 0.5, it means
+           that each dimension of the grid will be expanded to half again
+           as big after generation. In other words, the initial grid will
+           be 2/3 the size in each dimension, and will be expanded to its
+           full size without adding any more rectangles.
+
+           Setting an expansion factor of around 0.5 tends to make the
+           game more difficult, and also (in my experience) rewards a
+           less deductive and more intuitive playing style. If you set it
+           _too_ high, though, the game simply cannot generate more than a
+           few rectangles to cover the entire grid, and the game becomes
+           trivial.
+
+       _Ensure unique solution_
+
+           Normally, Rectangles will make sure that the puzzles it presents
+           have only one solution. Puzzles with ambiguous sections can be
+           more difficult and more subtle, so if you like you can turn off
+           this feature and risk having ambiguous puzzles. Also, finding
+           _all_ the possible solutions can be an additional challenge for
+           an advanced player. Turning off this option can also speed up
+           puzzle generation.
+
+Chapter 9: Netslide
+-------------------
+
+       This game combines the grid generation of Net (see chapter 3) with
+       the movement of Sixteen (see chapter 6): you have a Net grid, but
+       instead of rotating tiles back into place you have to slide them
+       into place by moving a whole row at a time.
+
+       As in Sixteen, control is with the mouse or cursor keys. See section
+       6.1.
+
+       The available game parameters have similar meanings to those in Net
+       (see section 3.2) and Sixteen (see section 6.2).
+
+       Netslide was contributed to this collection by Richard Boulton.
+
+Chapter 10: Pattern
+-------------------
+
+       You have a grid of squares, which must all be filled in either black
+       or white. Beside each row of the grid are listed the lengths of the
+       runs of black squares on that row; above each column are listed the
+       lengths of the runs of black squares in that column. Your aim is to
+       fill in the entire grid black or white.
+
+       I first saw this puzzle form around 1995, under the name
+       `nonograms'. I've seen it in various places since then, under
+       different names.
+
+       Normally, puzzles of this type turn out to be a meaningful picture
+       of something once you've solved them. However, since this version
+       generates the puzzles automatically, they will just look like random
+       groupings of squares. (One user has suggested that this is actually
+       a _good_ thing, since it prevents you from guessing the colour of
+       squares based on the picture, and forces you to use logic instead.)
+       The advantage, though, is that you never run out of them.
+
+  10.1 Pattern controls
+
+       This game is played with the mouse.
+
+       Left-click in a square to colour it black. Right-click to colour it
+       white. If you make a mistake, you can middle-click, or hold down
+       Shift while clicking with any button, to colour the square in the
+       default grey (meaning `undecided') again.
+
+       You can click and drag with the left or right mouse button to colour
+       a vertical or horizontal line of squares black or white at a time
+       (respectively). If you click and drag with the middle button, or
+       with Shift held down, you can colour a whole rectangle of squares
+       grey.
+
+       You can also move around the grid with the cursor keys. Pressing the
+       return key will cycle the current cell through empty, then black,
+       then white, then empty, and the space bar does the same cycle in
+       reverse.
+
+       Moving the cursor while holding Control will colour the moved-over
+       squares black. Holding Shift will colour the moved-over squares
+       white, and holding both will colour them grey.
+
+       (All the actions described in section 2.1 are also available.)
+
+  10.2 Pattern parameters
+
+       The only options available from the `Custom...' option on the `Type'
+       menu are _Width_ and _Height_, which are self-explanatory.
+
+Chapter 11: Solo
+----------------
+
+       You have a square grid, which is divided into as many equally sized
+       sub-blocks as the grid has rows. Each square must be filled in with
+       a digit from 1 to the size of the grid, in such a way that
+
+        -  every row contains only one occurrence of each digit
+
+        -  every column contains only one occurrence of each digit
+
+        -  every block contains only one occurrence of each digit.
+
+        -  (optionally, by default off) each of the square's two main
+           diagonals contains only one occurrence of each digit.
+
+       You are given some of the numbers as clues; your aim is to place the
+       rest of the numbers correctly.
+
+       Under the default settings, the sub-blocks are square or
+       rectangular. The default puzzle size is 3x3 (a 9x9 actual grid,
+       divided into nine 3x3 blocks). You can also select sizes with
+       rectangular blocks instead of square ones, such as 2x3 (a 6x6 grid
+       divided into six 3x2 blocks). Alternatively, you can select `jigsaw'
+       mode, in which the sub-blocks are arbitrary shapes which differ
+       between individual puzzles.
+
+       Another available mode is `killer'. In this mode, clues are not
+       given in the form of filled-in squares; instead, the grid is divided
+       into `cages' by coloured lines, and for each cage the game tells
+       you what the sum of all the digits in that cage should be. Also,
+       no digit may appear more than once within a cage, even if the cage
+       crosses the boundaries of existing regions.
+
+       If you select a puzzle size which requires more than 9 digits, the
+       additional digits will be letters of the alphabet. For example, if
+       you select 3x4 then the digits which go in your grid will be 1 to 9,
+       plus `a', `b' and `c'. This cannot be selected for killer puzzles.
+
+       I first saw this puzzle in Nikoli [5], although it's also been
+       popularised by various newspapers under the name `Sudoku' or `Su
+       Doku'. Howard Garns is considered the inventor of the modern form of
+       the puzzle, and it was first published in _Dell Pencil Puzzles and
+       Word Games_. A more elaborate treatment of the history of the puzzle
+       can be found on Wikipedia [6].
+
+       [5] http://www.nikoli.co.jp/en/puzzles/sudoku.html (beware of Flash)
+
+       [6] http://en.wikipedia.org/wiki/Sudoku
+
+  11.1 Solo controls
+
+       To play Solo, simply click the mouse in any empty square and then
+       type a digit or letter on the keyboard to fill that square. If you
+       make a mistake, click the mouse in the incorrect square and press
+       Space to clear it again (or use the Undo feature).
+
+       If you _right_-click in a square and then type a number, that
+       number will be entered in the square as a `pencil mark'. You can
+       have pencil marks for multiple numbers in the same square. Squares
+       containing filled-in numbers cannot also contain pencil marks.
+
+       The game pays no attention to pencil marks, so exactly what you
+       use them for is up to you: you can use them as reminders that a
+       particular square needs to be re-examined once you know more about
+       a particular number, or you can use them as lists of the possible
+       numbers in a given square, or anything else you feel like.
+
+       To erase a single pencil mark, right-click in the square and type
+       the same number again.
+
+       All pencil marks in a square are erased when you left-click and type
+       a number, or when you left-click and press space. Right-clicking and
+       pressing space will also erase pencil marks.
+
+       Alternatively, use the cursor keys to move the mark around the grid.
+       Pressing the return key toggles the mark (from a normal mark to a
+       pencil mark), and typing a number in is entered in the square in the
+       appropriate way; typing in a 0 or using the space bar will clear a
+       filled square.
+
+       (All the actions described in section 2.1 are also available.)
+
+  11.2 Solo parameters
+
+       Solo allows you to configure two separate dimensions of the puzzle
+       grid on the `Type' menu: the number of columns, and the number of
+       rows, into which the main grid is divided. (The size of a block is
+       the inverse of this: for example, if you select 2 columns and 3
+       rows, each actual block will have 3 columns and 2 rows.)
+
+       If you tick the `X' checkbox, Solo will apply the optional extra
+       constraint that the two main diagonals of the grid also contain
+       one of every digit. (This is sometimes known as `Sudoku-X' in
+       newspapers.) In this mode, the squares on the two main diagonals
+       will be shaded slightly so that you know it's enabled.
+
+       If you tick the `Jigsaw' checkbox, Solo will generate randomly
+       shaped sub-blocks. In this mode, the actual grid size will be taken
+       to be the product of the numbers entered in the `Columns' and `Rows'
+       boxes. There is no reason why you have to enter a number greater
+       than 1 in both boxes; Jigsaw mode has no constraint on the grid
+       size, and it can even be a prime number if you feel like it.
+
+       If you tick the `Killer' checkbox, Solo will generate a set of
+       of cages, which are randomly shaped and drawn in an outline of a
+       different colour. Each of these regions contains a smaller clue
+       which shows the digit sum of all the squares in this region.
+
+       You can also configure the type of symmetry shown in the generated
+       puzzles. More symmetry makes the puzzles look prettier but may also
+       make them easier, since the symmetry constraints can force more
+       clues than necessary to be present. Completely asymmetric puzzles
+       have the freedom to contain as few clues as possible.
+
+       Finally, you can configure the difficulty of the generated puzzles.
+       Difficulty levels are judged by the complexity of the techniques
+       of deduction required to solve the puzzle: each level requires a
+       mode of reasoning which was not necessary in the previous one. In
+       particular, on difficulty levels `Trivial' and `Basic' there will be
+       a square you can fill in with a single number at all times, whereas
+       at `Intermediate' level and beyond you will have to make partial
+       deductions about the _set_ of squares a number could be in (or the
+       set of numbers that could be in a square). At `Unreasonable' level,
+       even this is not enough, and you will eventually have to make a
+       guess, and then backtrack if it turns out to be wrong.
+
+       Generating difficult puzzles is itself difficult: if you select one
+       of the higher difficulty levels, Solo may have to make many attempts
+       at generating a puzzle before it finds one hard enough for you. Be
+       prepared to wait, especially if you have also configured a large
+       puzzle size.
+
+Chapter 12: Mines
+-----------------
+
+       You have a grid of covered squares, some of which contain mines, but
+       you don't know which. Your job is to uncover every square which does
+       _not_ contain a mine. If you uncover a square containing a mine, you
+       lose. If you uncover a square which does not contain a mine, you
+       are told how many mines are contained within the eight surrounding
+       squares.
+
+       This game needs no introduction; popularised by Windows, it is
+       perhaps the single best known desktop puzzle game in existence.
+
+       This version of it has an unusual property. By default, it will
+       generate its mine positions in such a way as to ensure that you
+       never need to _guess_ where a mine is: you will always be able
+       to deduce it somehow. So you will never, as can happen in other
+       versions, get to the last four squares and discover that there are
+       two mines left but you have no way of knowing for sure where they
+       are.
+
+  12.1 Mines controls
+
+       This game is played with the mouse.
+
+       If you left-click in a covered square, it will be uncovered.
+
+       If you right-click in a covered square, it will place a flag which
+       indicates that the square is believed to be a mine. Left-clicking in
+       a marked square will not uncover it, for safety. You can right-click
+       again to remove a mark placed in error.
+
+       If you left-click in an _uncovered_ square, it will `clear around'
+       the square. This means: if the square has exactly as many flags
+       surrounding it as it should have mines, then all the covered squares
+       next to it which are _not_ flagged will be uncovered. So once you
+       think you know the location of all the mines around a square, you
+       can use this function as a shortcut to avoid having to click on each
+       of the remaining squares one by one.
+
+       If you uncover a square which has _no_ mines in the surrounding
+       eight squares, then it is obviously safe to uncover those squares in
+       turn, and so on if any of them also has no surrounding mines. This
+       will be done for you automatically; so sometimes when you uncover a
+       square, a whole new area will open up to be explored.
+
+       You can also use the cursor keys to move around the minefield.
+       Pressing the return key in a covered square uncovers it, and in
+       an uncovered square will clear around it (so it acts as the left
+       button), pressing the space bar in a covered square will place a
+       flag (similarly, it acts as the right button).
+
+       All the actions described in section 2.1 are also available.
+
+       Even Undo is available, although you might consider it cheating to
+       use it. If you step on a mine, the program will only reveal the mine
+       in question (unlike most other implementations, which reveal all of
+       them). You can then Undo your fatal move and continue playing if you
+       like. The program will track the number of times you died (and Undo
+       will not reduce that counter), so when you get to the end of the
+       game you know whether or not you did it without making any errors.
+
+       (If you really want to know the full layout of the grid, which other
+       implementations will show you after you die, you can always use the
+       Solve menu option.)
+
+  12.2 Mines parameters
+
+       The options available from the `Custom...' option on the `Type' menu
+       are:
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _Mines_
+
+           Number of mines in the grid. You can enter this as an absolute
+           mine count, or alternatively you can put a % sign on the end
+           in which case the game will arrange for that proportion of the
+           squares in the grid to be mines.
+
+           Beware of setting the mine count too high. At very high
+           densities, the program may spend forever searching for a
+           solvable grid.
+
+       _Ensure solubility_
+
+           When this option is enabled (as it is by default), Mines will
+           ensure that the entire grid can be fully deduced starting
+           from the initial open space. If you prefer the riskier grids
+           generated by other implementations, you can switch off this
+           option.
+
+Chapter 13: Same Game
+---------------------
+
+       You have a grid of coloured squares, which you have to clear by
+       highlighting contiguous regions of more than one coloured square;
+       the larger the region you highlight, the more points you get (and
+       the faster you clear the arena).
+
+       If you clear the grid you win. If you end up with nothing but single
+       squares (i.e., there are no more clickable regions left) you lose.
+
+       Removing a region causes the rest of the grid to shuffle up: blocks
+       that are suspended will fall down (first), and then empty columns
+       are filled from the right.
+
+       Same Game was contributed to this collection by James Harvey.
+
+  13.1 Same Game controls
+
+       This game can be played with either the keyboard or the mouse.
+
+       If you left-click an unselected region, it becomes selected
+       (possibly clearing the current selection).
+
+       If you left-click the selected region, it will be removed (and the
+       rest of the grid shuffled immediately).
+
+       If you right-click the selected region, it will be unselected.
+
+       The cursor keys move a cursor around the grid. Pressing the Space or
+       Enter keys while the cursor is in an unselected region selects it;
+       pressing Space or Enter again removes it as above.
+
+       (All the actions described in section 2.1 are also available.)
+
+  13.2 Same Game parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _No. of colours_
+
+           Number of different colours used to fill the grid; the more
+           colours, the fewer large regions of colour and thus the more
+           difficult it is to successfully clear the grid.
+
+       _Scoring system_
+
+           Controls the precise mechanism used for scoring. With the
+           default system, `(n-2)^2', only regions of three squares or more
+           will score any points at all. With the alternative `(n-1)^2'
+           system, regions of two squares score a point each, and larger
+           regions score relatively more points.
+
+       _Ensure solubility_
+
+           If this option is ticked (the default state), generated grids
+           will be guaranteed to have at least one solution.
+
+           If you turn it off, the game generator will not try to guarantee
+           soluble grids; it will, however, still ensure that there are at
+           least 2 squares of each colour on the grid at the start (since a
+           grid with exactly one square of a given colour is _definitely_
+           insoluble). Grids generated with this option disabled may
+           contain more large areas of contiguous colour, leading to
+           opportunities for higher scores; they can also take less time to
+           generate.
+
+Chapter 14: Flip
+----------------
+
+       You have a grid of squares, some light and some dark. Your aim is to
+       light all the squares up at the same time. You can choose any square
+       and flip its state from light to dark or dark to light, but when you
+       do so, other squares around it change state as well.
+
+       Each square contains a small diagram showing which other squares
+       change when you flip it.
+
+  14.1 Flip controls
+
+       This game can be played with either the keyboard or the mouse.
+
+       Left-click in a square to flip it and its associated squares, or use
+       the cursor keys to choose a square and the space bar or Enter key to
+       flip.
+
+       If you use the `Solve' function on this game, it will mark some of
+       the squares in red. If you click once in every square with a red
+       mark, the game should be solved. (If you click in a square _without_
+       a red mark, a red mark will appear in it to indicate that you will
+       need to reverse that operation to reach the solution.)
+
+       (All the actions described in section 2.1 are also available.)
+
+  14.2 Flip parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _Shape type_
+
+           This control determines the shape of the region which is flipped
+           by clicking in any given square. The default setting, `Crosses',
+           causes every square to flip itself and its four immediate
+           neighbours (or three or two if it's at an edge or corner). The
+           other setting, `Random', causes a random shape to be chosen for
+           every square, so the game is different every time.
+
+Chapter 15: Guess
+-----------------
+
+       You have a set of coloured pegs, and have to reproduce a
+       predetermined sequence of them (chosen by the computer) within a
+       certain number of guesses.
+
+       Each guess gets marked with the number of correctly-coloured pegs
+       in the correct places (in black), and also the number of correctly-
+       coloured pegs in the wrong places (in white).
+
+       This game is also known (and marketed, by Hasbro, mainly) as a board
+       game `Mastermind', with 6 colours, 4 pegs per row, and 10 guesses.
+       However, this version allows custom settings of number of colours
+       (up to 10), number of pegs per row, and number of guesses.
+
+       Guess was contributed to this collection by James Harvey.
+
+  15.1 Guess controls
+
+       This game can be played with either the keyboard or the mouse.
+
+       With the mouse, drag a coloured peg from the tray on the left-hand
+       side to its required position in the current guess; pegs may also
+       be dragged from current and past guesses to copy them elsewhere. To
+       remove a peg, drag it off its current position to somewhere invalid.
+
+       Right-clicking in the current guess adds a `hold' marker; pegs that
+       have hold markers will be automatically added to the next guess
+       after marking.
+
+       Alternatively, with the keyboard, the up and down cursor keys can
+       be used to select a peg colour, the left and right keys to select a
+       peg position, and the space bar or Enter key to place a peg of the
+       selected colour in the chosen position. `D' or Backspace removes a
+       peg, and Space adds a hold marker.
+
+       Pressing `h' or `?' will fill the current guess with a suggested
+       guess. Using this is not recommended for 10 or more pegs as it is
+       slow.
+
+       When the guess is complete, the smaller feedback pegs will be
+       highlighted; clicking on these (or moving the peg cursor to them
+       with the arrow keys and pressing the space bar or Enter key) will
+       mark the current guess, copy any held pegs to the next guess, and
+       move the `current guess' marker.
+
+       If you correctly position all the pegs the solution will be
+       displayed below; if you run out of guesses (or select `Solve...')
+       the solution will also be revealed.
+
+       (All the actions described in section 2.1 are also available.)
+
+  15.2 Guess parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu. The default game matches the parameters for the board
+       game `Mastermind'.
+
+       _Colours_
+
+           Number of colours the solution is chosen from; from 2 to 10
+           (more is harder).
+
+       _Pegs per guess_
+
+           Number of pegs per guess (more is harder).
+
+       _Guesses_
+
+           Number of guesses you have to find the solution in (fewer is
+           harder).
+
+       _Allow blanks_
+
+           Allows blank pegs to be given as part of a guess (makes it
+           easier, because you know that those will never be counted as
+           part of the solution). This is turned off by default.
+
+           Note that this doesn't allow blank pegs in the solution; if you
+           really wanted that, use one extra colour.
+
+       _Allow duplicates_
+
+           Allows the solution (and the guesses) to contain colours more
+           than once; this increases the search space (making things
+           harder), and is turned on by default.
+
+Chapter 16: Pegs
+----------------
+
+       A number of pegs are placed in holes on a board. You can remove a
+       peg by jumping an adjacent peg over it (horizontally or vertically)
+       to a vacant hole on the other side. Your aim is to remove all but
+       one of the pegs initially present.
+
+       This game, best known as `Peg Solitaire', is possibly one of the
+       oldest puzzle games still commonly known.
+
+  16.1 Pegs controls
+
+       To move a peg, drag it with the mouse from its current position to
+       its final position. If the final position is exactly two holes away
+       from the initial position, is currently unoccupied by a peg, and
+       there is a peg in the intervening square, the move will be permitted
+       and the intervening peg will be removed.
+
+       Vacant spaces which you can move a peg into are marked with holes. A
+       space with no peg and no hole is not available for moving at all: it
+       is an obstacle which you must work around.
+
+       You can also use the cursor keys to move a position indicator around
+       the board. Pressing the return key while over a peg, followed by a
+       cursor key, will jump the peg in that direction (if that is a legal
+       move).
+
+       (All the actions described in section 2.1 are also available.)
+
+  16.2 Pegs parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in holes.
+
+       _Board type_
+
+           Controls whether you are given a board of a standard shape or
+           a randomly generated shape. The two standard shapes currently
+           supported are `Cross' and `Octagon' (also commonly known as the
+           English and European traditional board layouts respectively).
+           Selecting `Random' will give you a different board shape every
+           time (but always one that is known to have a solution).
+
+Chapter 17: Dominosa
+--------------------
+
+       A normal set of dominoes - that is, one instance of every
+       (unordered) pair of numbers from 0 to 6 - has been arranged
+       irregularly into a rectangle; then the number in each square has
+       been written down and the dominoes themselves removed. Your task is
+       to reconstruct the pattern by arranging the set of dominoes to match
+       the provided array of numbers.
+
+       This puzzle is widely credited to O. S. Adler, and takes part of its
+       name from those initials.
+
+  17.1 Dominosa controls
+
+       Left-clicking between any two adjacent numbers places a domino
+       covering them, or removes one if it is already present. Trying to
+       place a domino which overlaps existing dominoes will remove the ones
+       it overlaps.
+
+       Right-clicking between two adjacent numbers draws a line between
+       them, which you can use to remind yourself that you know those two
+       numbers are _not_ covered by a single domino. Right-clicking again
+       removes the line.
+
+       You can also use the cursor keys to move a cursor around the grid.
+       When the cursor is half way between two adjacent numbers, pressing
+       the return key will place a domino covering those numbers, or
+       pressing the space bar will lay a line between the two squares.
+       Repeating either action removes the domino or line.
+
+       Pressing a number key will highlight all occurrences of that number.
+       Pressing that number again will clear the highlighting. Up to two
+       different numbers can be highlighted at any given time.
+
+       (All the actions described in section 2.1 are also available.)
+
+  17.2 Dominosa parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Maximum number on dominoes_
+
+           Controls the size of the puzzle, by controlling the size of the
+           set of dominoes used to make it. Dominoes with numbers going
+           up to N will give rise to an (N+2) x (N+1) rectangle; so, in
+           particular, the default value of 6 gives an 8x7 grid.
+
+       _Ensure unique solution_
+
+           Normally, Dominosa will make sure that the puzzles it presents
+           have only one solution. Puzzles with ambiguous sections can be
+           more difficult and sometimes more subtle, so if you like you
+           can turn off this feature. Also, finding _all_ the possible
+           solutions can be an additional challenge for an advanced player.
+           Turning off this option can also speed up puzzle generation.
+
+Chapter 18: Untangle
+--------------------
+
+       You are given a number of points, some of which have lines drawn
+       between them. You can move the points about arbitrarily; your aim is
+       to position the points so that no line crosses another.
+
+       I originally saw this in the form of a Flash game called Planarity
+       [7], written by John Tantalo.
+
+       [7] http://planarity.net
+
+  18.1 Untangle controls
+
+       To move a point, click on it with the left mouse button and drag it
+       into a new position.
+
+       (All the actions described in section 2.1 are also available.)
+
+  18.2 Untangle parameters
+
+       There is only one parameter available from the `Custom...' option on
+       the `Type' menu:
+
+       _Number of points_
+
+           Controls the size of the puzzle, by specifying the number of
+           points in the generated graph.
+
+Chapter 19: Black Box
+---------------------
+
+       A number of balls are hidden in a rectangular arena. You have to
+       deduce the positions of the balls by firing lasers positioned at the
+       edges of the arena and observing how their beams are deflected.
+
+       Beams will travel straight from their origin until they hit the
+       opposite side of the arena (at which point they emerge), unless
+       affected by balls in one of the following ways:
+
+        -  A beam that hits a ball head-on is absorbed and will never re-
+           emerge. This includes beams that meet a ball on the first rank
+           of the arena.
+
+        -  A beam with a ball in its front-left square and no ball ahead of
+           it gets deflected 90 degrees to the right.
+
+        -  A beam with a ball in its front-right square and no ball ahead
+           of it gets similarly deflected to the left.
+
+        -  A beam that would re-emerge from its entry location is
+           considered to be `reflected'.
+
+        -  A beam which would get deflected before entering the arena by a
+           ball to the front-left or front-right of its entry point is also
+           considered to be `reflected'.
+
+       Beams that are reflected appear as a `R'; beams that hit balls head-
+       on appear as `H'. Otherwise, a number appears at the firing point
+       and the location where the beam emerges (this number is unique to
+       that shot).
+
+       You can place guesses as to the location of the balls, based on the
+       entry and exit patterns of the beams; once you have placed enough
+       balls a button appears enabling you to have your guesses checked.
+
+       Here is a diagram showing how the positions of balls can create each
+       of the beam behaviours shown above:
+
+          1RHR---- 
+         |..O.O...|
+         2........3
+         |........|
+         |........|
+         3........|
+         |......O.|
+         H........|
+         |.....O..|
+          12-RR---
+
+       As shown, it is possible for a beam to receive multiple reflections
+       before re-emerging (see turn 3). Similarly, a beam may be reflected
+       (possibly more than once) before receiving a hit (the `H' on the
+       left side of the example).
+
+       Note that any layout with more than 4 balls may have a non-unique
+       solution. The following diagram illustrates this; if you know the
+       board contains 5 balls, it is impossible to determine where the
+       fifth ball is (possible positions marked with an x):
+
+          -------- 
+         |........|
+         |........|
+         |..O..O..|
+         |...xx...|
+         |...xx...|
+         |..O..O..|
+         |........|
+         |........|
+          --------
+
+       For this reason, when you have your guesses checked, the game
+       will check that your solution _produces the same results_ as the
+       computer's, rather than that your solution is identical to the
+       computer's. So in the above example, you could put the fifth ball at
+       _any_ of the locations marked with an x, and you would still win.
+
+       Black Box was contributed to this collection by James Harvey.
+
+  19.1 Black Box controls
+
+       To fire a laser beam, left-click in a square around the edge of
+       the arena. The results will be displayed immediately. Clicking or
+       holding the left button on one of these squares will highlight the
+       current go (or a previous go) to confirm the exit point for that
+       laser, if applicable.
+
+       To guess the location of a ball, left-click within the arena and a
+       black circle will appear marking the guess; click again to remove
+       the guessed ball.
+
+       Locations in the arena may be locked against modification by right-
+       clicking; whole rows and columns may be similarly locked by right-
+       clicking in the laser square above/below that column, or to the
+       left/right of that row.
+
+       The cursor keys may also be used to move around the grid. Pressing
+       the Enter key will fire a laser or add a new ball-location guess,
+       and pressing Space will lock a cell, row, or column.
+
+       When an appropriate number of balls have been guessed, a button will
+       appear at the top-left corner of the grid; clicking that (with mouse
+       or cursor) will check your guesses.
+
+       If you click the `check' button and your guesses are not correct,
+       the game will show you the minimum information necessary to
+       demonstrate this to you, so you can try again. If your ball
+       positions are not consistent with the beam paths you already know
+       about, one beam path will be circled to indicate that it proves you
+       wrong. If your positions match all the existing beam paths but are
+       still wrong, one new beam path will be revealed (written in red)
+       which is not consistent with your current guesses.
+
+       If you decide to give up completely, you can select Solve to reveal
+       the actual ball positions. At this point, correctly-placed balls
+       will be displayed as filled black circles, incorrectly-placed balls
+       as filled black circles with red crosses, and missing balls as
+       filled red circles. In addition, a red circle marks any laser you
+       had already fired which is not consistent with your ball layout
+       (just as when you press the `check' button), and red text marks
+       any laser you _could_ have fired in order to distinguish your ball
+       layout from the correct one.
+
+       (All the actions described in section 2.1 are also available.)
+
+  19.2 Black Box parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares. There are 2 x _Width_ x _Height_ lasers
+           per grid, two per row and two per column.
+
+       _No. of balls_
+
+           Number of balls to place in the grid. This can be a single
+           number, or a range (separated with a hyphen, like `2-6'),
+           and determines the number of balls to place on the grid.
+           The `reveal' button is only enabled if you have guessed an
+           appropriate number of balls; a guess using a different number
+           to the original solution is still acceptable, if all the beam
+           inputs and outputs match.
+
+Chapter 20: Slant
+-----------------
+
+       You have a grid of squares. Your aim is to draw a diagonal line
+       through each square, and choose which way each line slants so that
+       the following conditions are met:
+
+        -  The diagonal lines never form a loop.
+
+        -  Any point with a circled number has precisely that many lines
+           meeting at it. (Thus, a 4 is the centre of a cross shape,
+           whereas a zero is the centre of a diamond shape - or rather, a
+           partial diamond shape, because a zero can never appear in the
+           middle of the grid because that would immediately cause a loop.)
+
+       Credit for this puzzle goes to Nikoli [8].
+
+       [8] http://www.nikoli.co.jp/ja/puzzles/gokigen_naname (in Japanese)
+
+  20.1 Slant controls
+
+       Left-clicking in a blank square will place a \ in it (a line leaning
+       to the left, i.e. running from the top left of the square to the
+       bottom right). Right-clicking in a blank square will place a / in it
+       (leaning to the right, running from top right to bottom left).
+
+       Continuing to click either button will cycle between the three
+       possible square contents. Thus, if you left-click repeatedly in a
+       blank square it will change from blank to \ to / back to blank, and
+       if you right-click repeatedly the square will change from blank to /
+       to \ back to blank. (Therefore, you can play the game entirely with
+       one button if you need to.)
+
+       You can also use the cursor keys to move around the grid. Pressing
+       the return or space keys will place a \ or a /, respectively, and
+       will then cycle them as above. You can also press / or \ to place a
+       / or \, respectively, independent of what is already in the cursor
+       square. Backspace removes any line from the cursor square.
+
+       (All the actions described in section 2.1 are also available.)
+
+  20.2 Slant parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle. At Hard
+           level, you are required to do deductions based on knowledge of
+           _relationships_ between squares rather than always being able to
+           deduce the exact contents of one square at a time. (For example,
+           you might know that two squares slant in the same direction,
+           even if you don't yet know what that direction is, and this
+           might enable you to deduce something about still other squares.)
+           Even at Hard level, guesswork and backtracking should never be
+           necessary.
+
+Chapter 21: Light Up
+--------------------
+
+       You have a grid of squares. Some are filled in black; some of the
+       black squares are numbered. Your aim is to `light up' all the empty
+       squares by placing light bulbs in some of them.
+
+       Each light bulb illuminates the square it is on, plus all squares
+       in line with it horizontally or vertically unless a black square is
+       blocking the way.
+
+       To win the game, you must satisfy the following conditions:
+
+        -  All non-black squares are lit.
+
+        -  No light is lit by another light.
+
+        -  All numbered black squares have exactly that number of lights
+           adjacent to them (in the four squares above, below, and to the
+           side).
+
+       Non-numbered black squares may have any number of lights adjacent to
+       them.
+
+       Credit for this puzzle goes to Nikoli [9].
+
+       Light Up was contributed to this collection by James Harvey.
+
+       [9] http://www.nikoli.co.jp/en/puzzles/akari.html (beware of Flash)
+
+  21.1 Light Up controls
+
+       Left-clicking in a non-black square will toggle the presence of a
+       light in that square. Right-clicking in a non-black square toggles a
+       mark there to aid solving; it can be used to highlight squares that
+       cannot be lit, for example.
+
+       You may not place a light in a marked square, nor place a mark in a
+       lit square.
+
+       The game will highlight obvious errors in red. Lights lit by other
+       lights are highlighted in this way, as are numbered squares which do
+       not (or cannot) have the right number of lights next to them.
+
+       Thus, the grid is solved when all non-black squares have yellow
+       highlights and there are no red lights.
+
+       (All the actions described in section 2.1 are also available.)
+
+  21.2 Light Up parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _%age of black squares_
+
+           Rough percentage of black squares in the grid.
+
+           This is a hint rather than an instruction. If the grid generator
+           is unable to generate a puzzle to this precise specification, it
+           will increase the proportion of black squares until it can.
+
+       _Symmetry_
+
+           Allows you to specify the required symmetry of the black squares
+           in the grid. (This does not affect the difficulty of the puzzles
+           noticeably.)
+
+       _Difficulty_
+
+           `Easy' means that the puzzles should be soluble without
+           backtracking or guessing, `Hard' means that some guesses will
+           probably be necessary.
+
+Chapter 22: Map
+---------------
+
+       You are given a map consisting of a number of regions. Your task is
+       to colour each region with one of four colours, in such a way that
+       no two regions sharing a boundary have the same colour. You are
+       provided with some regions already coloured, sufficient to make the
+       remainder of the solution unique.
+
+       Only regions which share a length of border are required to be
+       different colours. Two regions which meet at only one _point_ (i.e.
+       are diagonally separated) may be the same colour.
+
+       I believe this puzzle is original; I've never seen an implementation
+       of it anywhere else. The concept of a four-colouring puzzle was
+       suggested by Owen Dunn; credit must also go to Nikoli and to Verity
+       Allan for inspiring the train of thought that led to me realising
+       Owen's suggestion was a viable puzzle. Thanks also to Gareth Taylor
+       for many detailed suggestions.
+
+  22.1 Map controls
+
+       To colour a region, click the left mouse button on an existing
+       region of the desired colour and drag that colour into the new
+       region.
+
+       (The program will always ensure the starting puzzle has at least one
+       region of each colour, so that this is always possible!)
+
+       If you need to clear a region, you can drag from an empty region, or
+       from the puzzle boundary if there are no empty regions left.
+
+       Dragging a colour using the _right_ mouse button will stipple the
+       region in that colour, which you can use as a note to yourself that
+       you think the region _might_ be that colour. A region can contain
+       stipples in multiple colours at once. (This is often useful at the
+       harder difficulty levels.)
+
+       You can also use the cursor keys to move around the map: the colour
+       of the cursor indicates the position of the colour you would drag
+       (which is not obvious if you're on a region's boundary, since it
+       depends on the direction from which you approached the boundary).
+       Pressing the return key starts a drag of that colour, as above,
+       which you control with the cursor keys; pressing the return key
+       again finishes the drag. The space bar can be used similarly to
+       create a stippled region. Double-pressing the return key (without
+       moving the cursor) will clear the region, as a drag from an empty
+       region does: this is useful with the cursor mode if you have filled
+       the entire map in but need to correct the layout.
+
+       If you press L during play, the game will toggle display of a number
+       in each region of the map. This is useful if you want to discuss a
+       particular puzzle instance with a friend - having an unambiguous
+       name for each region is much easier than trying to refer to them all
+       by names such as `the one down and right of the brown one on the top
+       border'.
+
+       (All the actions described in section 2.1 are also available.)
+
+  22.2 Map parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _Regions_
+
+           Number of regions in the generated map.
+
+       _Difficulty_
+
+           In `Easy' mode, there should always be at least one region whose
+           colour can be determined trivially. In `Normal' and `Hard'
+           modes, you will have to use increasingly complex logic to deduce
+           the colour of some regions. However, it will always be possible
+           without having to guess or backtrack.
+
+           In `Unreasonable' mode, the program will feel free to generate
+           puzzles which are as hard as it can possibly make them: the
+           only constraint is that they should still have a unique
+           solution. Solving Unreasonable puzzles may require guessing and
+           backtracking.
+
+Chapter 23: Loopy
+-----------------
+
+       You are given a grid of dots, marked with yellow lines to indicate
+       which dots you are allowed to connect directly together. Your aim is
+       to use some subset of those yellow lines to draw a single unbroken
+       loop from dot to dot within the grid.
+
+       Some of the spaces between the lines contain numbers. These numbers
+       indicate how many of the lines around that space form part of the
+       loop. The loop you draw must correctly satisfy all of these clues to
+       be considered a correct solution.
+
+       In the default mode, the dots are arranged in a grid of squares;
+       however, you can also play on triangular or hexagonal grids, or even
+       more exotic ones.
+
+       Credit for the basic puzzle idea goes to Nikoli [10].
+
+       Loopy was originally contributed to this collection by Mike Pinna,
+       and subsequently enhanced to handle various types of non-square grid
+       by Lambros Lambrou.
+
+       [10] http://www.nikoli.co.jp/en/puzzles/slitherlink.html (beware of
+       Flash)
+
+  23.1 Loopy controls
+
+       Click the left mouse button on a yellow line to turn it black,
+       indicating that you think it is part of the loop. Click again to
+       turn the line yellow again (meaning you aren't sure yet).
+
+       If you are sure that a particular line segment is _not_ part of the
+       loop, you can click the right mouse button to remove it completely.
+       Again, clicking a second time will turn the line back to yellow.
+
+       (All the actions described in section 2.1 are also available.)
+
+  23.2 Loopy parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid, measured in number of regions across and down. For
+           square grids, it's clear how this is counted; for other types of
+           grid you may have to think a bit to see how the dimensions are
+           measured.
+
+       _Grid type_
+
+           Allows you to choose between a selection of types of tiling.
+           Some have all the faces the same but may have multiple different
+           types of vertex (e.g. the _Cairo_ or _Kites_ mode); others
+           have all the vertices the same but may have different types of
+           face (e.g. the _Great Hexagonal_). The square, triangular and
+           honeycomb grids are fully regular, and have all their vertices
+           _and_ faces the same; this makes them the least confusing to
+           play.
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle.
+
+Chapter 24: Inertia
+-------------------
+
+       You are a small green ball sitting in a grid full of obstacles. Your
+       aim is to collect all the gems without running into any mines.
+
+       You can move the ball in any orthogonal _or diagonal_ direction.
+       Once the ball starts moving, it will continue until something stops
+       it. A wall directly in its path will stop it (but if it is moving
+       diagonally, it will move through a diagonal gap between two other
+       walls without stopping). Also, some of the squares are `stops'; when
+       the ball moves on to a stop, it will stop moving no matter what
+       direction it was going in. Gems do _not_ stop the ball; it picks
+       them up and keeps on going.
+
+       Running into a mine is fatal. Even if you picked up the last gem in
+       the same move which then hit a mine, the game will count you as dead
+       rather than victorious.
+
+       This game was originally implemented for Windows by Ben Olmstead
+       [11], who was kind enough to release his source code on request so
+       that it could be re-implemented for this collection.
+
+       [11] http://xn13.com/
+
+  24.1 Inertia controls
+
+       You can move the ball in any of the eight directions using the
+       numeric keypad. Alternatively, if you click the left mouse button
+       on the grid, the ball will begin a move in the general direction of
+       where you clicked.
+
+       If you use the `Solve' function on this game, the program will
+       compute a path through the grid which collects all the remaining
+       gems and returns to the current position. A hint arrow will appear
+       on the ball indicating the direction in which you should move to
+       begin on this path. If you then move in that direction, the arrow
+       will update to indicate the next direction on the path. You can
+       also press Space to automatically move in the direction of the hint
+       arrow. If you move in a different direction from the one shown
+       by the arrow, arrows will be shown only if the puzzle is still
+       solvable.
+
+       All the actions described in section 2.1 are also available. In
+       particular, if you do run into a mine and die, you can use the Undo
+       function and resume playing from before the fatal move. The game
+       will keep track of the number of times you have done this.
+
+  24.2 Inertia parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+Chapter 25: Tents
+-----------------
+
+       You have a grid of squares, some of which contain trees. Your aim is
+       to place tents in some of the remaining squares, in such a way that
+       the following conditions are met:
+
+        -  There are exactly as many tents as trees.
+
+        -  The tents and trees can be matched up in such a way that each
+           tent is directly adjacent (horizontally or vertically, but not
+           diagonally) to its own tree. However, a tent may be adjacent to
+           other trees as well as its own.
+
+        -  No two tents are adjacent horizontally, vertically _or
+           diagonally_.
+
+        -  The number of tents in each row, and in each column, matches the
+           numbers given round the sides of the grid.
+
+       This puzzle can be found in several places on the Internet, and was
+       brought to my attention by e-mail. I don't know who I should credit
+       for inventing it.
+
+  25.1 Tents controls
+
+       Left-clicking in a blank square will place a tent in it. Right-
+       clicking in a blank square will colour it green, indicating that you
+       are sure it _isn't_ a tent. Clicking either button in an occupied
+       square will clear it.
+
+       If you _drag_ with the right button along a row or column, every
+       blank square in the region you cover will be turned green, and no
+       other squares will be affected. (This is useful for clearing the
+       remainder of a row once you have placed all its tents.)
+
+       You can also use the cursor keys to move around the grid. Pressing
+       the return key over an empty square will place a tent, and pressing
+       the space bar over an empty square will colour it green; either key
+       will clear an occupied square. Holding Shift and pressing the cursor
+       keys will colour empty squares green. Holding Control and pressing
+       the cursor keys will colour green both empty squares and squares
+       with tents.
+
+       (All the actions described in section 2.1 are also available.)
+
+  25.2 Tents parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle. More difficult
+           puzzles require more complex deductions, but at present none
+           of the available difficulty levels requires guesswork or
+           backtracking.
+
+Chapter 26: Bridges
+-------------------
+
+       You have a set of islands distributed across the playing area.
+       Each island contains a number. Your aim is to connect the islands
+       together with bridges, in such a way that:
+
+        -  Bridges run horizontally or vertically.
+
+        -  The number of bridges terminating at any island is equal to the
+           number written in that island.
+
+        -  Two bridges may run in parallel between the same two islands,
+           but no more than two may do so.
+
+        -  No bridge crosses another bridge.
+
+        -  All the islands are connected together.
+
+       There are some configurable alternative modes, which involve
+       changing the parallel-bridge limit to something other than 2, and
+       introducing the additional constraint that no sequence of bridges
+       may form a loop from one island back to the same island. The rules
+       stated above are the default ones.
+
+       Credit for this puzzle goes to Nikoli [12].
+
+       Bridges was contributed to this collection by James Harvey.
+
+       [12] http://www.nikoli.co.jp/en/puzzles/hashiwokakero.html (beware
+       of Flash)
+
+  26.1 Bridges controls
+
+       To place a bridge between two islands, click the mouse down on one
+       island and drag it towards the other. You do not need to drag all
+       the way to the other island; you only need to move the mouse far
+       enough for the intended bridge direction to be unambiguous. (So you
+       can keep the mouse near the starting island and conveniently throw
+       bridges out from it in many directions.)
+
+       Doing this again when a bridge is already present will add another
+       parallel bridge. If there are already as many bridges between the
+       two islands as permitted by the current game rules (i.e. two by
+       default), the same dragging action will remove all of them.
+
+       If you want to remind yourself that two islands definitely _do not_
+       have a bridge between them, you can right-drag between them in the
+       same way to draw a `non-bridge' marker.
+
+       If you think you have finished with an island (i.e. you have placed
+       all its bridges and are confident that they are in the right
+       places), you can mark the island as finished by left-clicking on it.
+       This will highlight it and all the bridges connected to it, and you
+       will be prevented from accidentally modifying any of those bridges
+       in future. Left-clicking again on a highlighted island will unmark
+       it and restore your ability to modify it.
+
+       You can also use the cursor keys to move around the grid: if
+       possible the cursor will always move orthogonally, otherwise it
+       will move towards the nearest island to the indicated direction.
+       Holding Control and pressing a cursor key will lay a bridge in that
+       direction (if available); Shift and a cursor key will lay a `non-
+       bridge' marker. Pressing the return key followed by a cursor key
+       will also lay a bridge in that direction.
+
+       You can mark an island as finished by pressing the space bar or by
+       pressing the return key twice.
+
+       By pressing a number key, you can jump to the nearest island with
+       that number. Letters `a', ..., `f' count as 10, ..., 15 and `0' as
+       16.
+
+       Violations of the puzzle rules will be marked in red:
+
+        -  An island with too many bridges will be highlighted in red.
+
+        -  An island with too few bridges will be highlighted in red if it
+           is definitely an error (as opposed to merely not being finished
+           yet): if adding enough bridges would involve having to cross
+           another bridge or remove a non-bridge marker, or if the island
+           has been highlighted as complete.
+
+        -  A group of islands and bridges may be highlighted in red if it
+           is a closed subset of the puzzle with no way to connect it to
+           the rest of the islands. For example, if you directly connect
+           two 1s together with a bridge and they are not the only two
+           islands on the grid, they will light up red to indicate that
+           such a group cannot be contained in any valid solution.
+
+        -  If you have selected the (non-default) option to disallow loops
+           in the solution, a group of bridges which forms a loop will be
+           highlighted.
+
+       (All the actions described in section 2.1 are also available.)
+
+  26.2 Bridges parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _Difficulty_
+
+           Difficulty level of puzzle.
+
+       _Allow loops_
+
+           This is set by default. If cleared, puzzles will be generated in
+           such a way that they are always soluble without creating a loop,
+           and solutions which do involve a loop will be disallowed.
+
+       _Max. bridges per direction_
+
+           Maximum number of bridges in any particular direction. The
+           default is 2, but you can change it to 1, 3 or 4. In general,
+           fewer is easier.
+
+       _%age of island squares_
+
+           Gives a rough percentage of islands the generator will try and
+           lay before finishing the puzzle. Certain layouts will not manage
+           to lay enough islands; this is an upper bound.
+
+       _Expansion factor (%age)_
+
+           The grid generator works by picking an existing island at random
+           (after first creating an initial island somewhere). It then
+           decides on a direction (at random), and then works out how far
+           it could extend before creating another island. This parameter
+           determines how likely it is to extend as far as it can, rather
+           than choosing somewhere closer.
+
+           High expansion factors usually mean easier puzzles with fewer
+           possible islands; low expansion factors can create lots of
+           tightly-packed islands.
+
+Chapter 27: Unequal
+-------------------
+
+       You have a square grid; each square may contain a digit from 1 to
+       the size of the grid, and some squares have clue signs between them.
+       Your aim is to fully populate the grid with numbers such that:
+
+        -  Each row contains only one occurrence of each digit
+
+        -  Each column contains only one occurrence of each digit
+
+        -  All the clue signs are satisfied.
+
+       There are two modes for this game, `Unequal' and `Adjacent'.
+
+       In `Unequal' mode, the clue signs are greater-than symbols
+       indicating one square's value is greater than its neighbour's. In
+       this mode not all clues may be visible, particularly at higher
+       difficulty levels.
+
+       In `Adjacent' mode, the clue signs are bars indicating one square's
+       value is numerically adjacent (i.e. one higher or one lower) than
+       its neighbour. In this mode all clues are always visible: absence of
+       a bar thus means that a square's value is definitely not numerically
+       adjacent to that neighbour's.
+
+       In `Trivial' difficulty level (available via the `Custom' game type
+       selector), there are no greater-than signs in `Unequal' mode; the
+       puzzle is to solve the Latin square only.
+
+       At the time of writing, the `Unequal' mode of this puzzle is
+       appearing in the Guardian weekly under the name `Futoshiki'.
+
+       Unequal was contributed to this collection by James Harvey.
+
+  27.1 Unequal controls
+
+       Unequal shares much of its control system with Solo.
+
+       To play Unequal, simply click the mouse in any empty square and then
+       type a digit or letter on the keyboard to fill that square. If you
+       make a mistake, click the mouse in the incorrect square and press
+       Space to clear it again (or use the Undo feature).
+
+       If you _right_-click in a square and then type a number, that
+       number will be entered in the square as a `pencil mark'. You can
+       have pencil marks for multiple numbers in the same square. Squares
+       containing filled-in numbers cannot also contain pencil marks.
+
+       The game pays no attention to pencil marks, so exactly what you
+       use them for is up to you: you can use them as reminders that a
+       particular square needs to be re-examined once you know more about
+       a particular number, or you can use them as lists of the possible
+       numbers in a given square, or anything else you feel like.
+
+       To erase a single pencil mark, right-click in the square and type
+       the same number again.
+
+       All pencil marks in a square are erased when you left-click and type
+       a number, or when you left-click and press space. Right-clicking and
+       pressing space will also erase pencil marks.
+
+       As for Solo, the cursor keys can be used in conjunction with the
+       digit keys to set numbers or pencil marks. You can also use the `M'
+       key to auto-fill every numeric hint, ready for removal as required,
+       or the `H' key to do the same but also to remove all obvious hints.
+
+       Alternatively, use the cursor keys to move the mark around the grid.
+       Pressing the return key toggles the mark (from a normal mark to a
+       pencil mark), and typing a number in is entered in the square in the
+       appropriate way; typing in a 0 or using the space bar will clear a
+       filled square.
+
+       Left-clicking a clue will mark it as done (grey it out), or unmark
+       it if it is already marked. Holding Control or Shift and pressing
+       an arrow key likewise marks any clue adjacent to the cursor in the
+       given direction.
+
+       (All the actions described in section 2.1 are also available.)
+
+  27.2 Unequal parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Mode_
+
+           Mode of the puzzle (`Unequal' or `Adjacent')
+
+       _Size (s*s)_
+
+           Size of grid.
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle. At Trivial
+           level, there are no greater-than signs; the puzzle is to solve
+           the Latin square only. At Recursive level (only available via
+           the `Custom' game type selector) backtracking will be required,
+           but the solution should still be unique. The levels in between
+           require increasingly complex reasoning to avoid having to
+           backtrack.
+
+Chapter 28: Galaxies
+--------------------
+
+       You have a rectangular grid containing a number of dots. Your aim is
+       to draw edges along the grid lines which divide the rectangle into
+       regions in such a way that every region is 180-degree rotationally
+       symmetric, and contains exactly one dot which is located at its
+       centre of symmetry.
+
+       This puzzle was invented by Nikoli [13], under the name `Tentai
+       Show'; its name is commonly translated into English as `Spiral
+       Galaxies'.
+
+       Galaxies was contributed to this collection by James Harvey.
+
+       [13] http://www.nikoli.co.jp/en/puzzles/astronomical_show.html
+
+  28.1 Galaxies controls
+
+       Left-click on any grid line to draw an edge if there isn't one
+       already, or to remove one if there is. When you create a valid
+       region (one which is closed, contains exactly one dot, is 180-degree
+       symmetric about that dot, and contains no extraneous edges inside
+       it) it will be highlighted automatically; so your aim is to have the
+       whole grid highlighted in that way.
+
+       During solving, you might know that a particular grid square belongs
+       to a specific dot, but not be sure of where the edges go and which
+       other squares are connected to the dot. In order to mark this so you
+       don't forget, you can right-click on the dot and drag, which will
+       create an arrow marker pointing at the dot. Drop that in a square of
+       your choice and it will remind you which dot it's associated with.
+       You can also right-click on existing arrows to pick them up and move
+       them, or destroy them by dropping them off the edge of the grid.
+       (Also, if you're not sure which dot an arrow is pointing at, you can
+       pick it up and move it around to make it clearer. It will swivel
+       constantly as you drag it, to stay pointed at its parent dot.)
+
+       You can also use the cursor keys to move around the grid squares and
+       lines. Pressing the return key when over a grid line will draw or
+       clear its edge, as above. Pressing the return key when over a dot
+       will pick up an arrow, to be dropped the next time the return key
+       is pressed; this can also be used to move existing arrows around,
+       removing them by dropping them on a dot or another arrow.
+
+       (All the actions described in section 2.1 are also available.)
+
+  28.2 Galaxies parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle. More difficult
+           puzzles require more complex deductions, and the `Unreasonable'
+           difficulty level may require backtracking.
+
+Chapter 29: Filling
+-------------------
+
+       You have a grid of squares, some of which contain digits, and the
+       rest of which are empty. Your job is to fill in digits in the empty
+       squares, in such a way that each connected region of squares all
+       containing the same digit has an area equal to that digit.
+
+       (`Connected region', for the purposes of this game, does not count
+       diagonally separated squares as adjacent.)
+
+       For example, it follows that no square can contain a zero, and that
+       two adjacent squares can not both contain a one. No region has an
+       area greater than 9 (because then its area would not be a single
+       digit).
+
+       Credit for this puzzle goes to Nikoli [14].
+
+       Filling was contributed to this collection by Jonas Koelker.
+
+       [14] http://www.nikoli.co.jp/en/puzzles/fillomino.html
+
+  29.1 Filling controls
+
+       To play Filling, simply click the mouse in any empty square and
+       then type a digit on the keyboard to fill that square. By dragging
+       the mouse, you can select multiple squares to fill with a single
+       keypress. If you make a mistake, click the mouse in the incorrect
+       square and press 0, Space, Backspace or Enter to clear it again (or
+       use the Undo feature).
+
+       You can also move around the grid with the cursor keys; typing a
+       digit will fill the square containing the cursor with that number;
+       typing 0 will clear it. You can also select multiple squares for
+       numbering or clearing with the return and arrow keys, before typing
+       a digit to fill or clear the highlighted squares (as above). The
+       space bar adds and removes single squares to and from the selection.
+       Backspace and escape remove all squares from the selection.
+
+       (All the actions described in section 2.1 are also available.)
+
+  29.2 Filling parameters
+
+       Filling allows you to configure the number of rows and columns of
+       the grid, through the `Type' menu.
+
+Chapter 30: Keen
+----------------
+
+       You have a square grid; each square may contain a digit from 1 to
+       the size of the grid. The grid is divided into blocks of varying
+       shape and size, with arithmetic clues written in them. Your aim is
+       to fully populate the grid with digits such that:
+
+        -  Each row contains only one occurrence of each digit
+
+        -  Each column contains only one occurrence of each digit
+
+        -  The digits in each block can be combined to form the number
+           stated in the clue, using the arithmetic operation given in the
+           clue. That is:
+
+            -  An addition clue means that the sum of the digits in the
+               block must be the given number. For example, `15+' means the
+               contents of the block adds up to fifteen.
+
+            -  A multiplication clue (e.g. `60*'), similarly, means that
+               the product of the digits in the block must be the given
+               number.
+
+            -  A subtraction clue will always be written in a block of
+               size two, and it means that one of the digits in the block
+               is greater than the other by the given amount. For example,
+               `2-' means that one of the digits in the block is 2 more
+               than the other, or equivalently that one digit minus the
+               other one is 2. The two digits could be either way round,
+               though.
+
+            -  A division clue (e.g. `3/'), similarly, is always in a block
+               of size two and means that one digit divided by the other is
+               equal to the given amount.
+
+           Note that a block may contain the same digit more than once
+           (provided the identical ones are not in the same row and
+           column). This rule is precisely the opposite of the rule in
+           Solo's `Killer' mode (see chapter 11).
+
+       This puzzle appears in the Times under the name `KenKen'.
+
+  30.1 Keen controls
+
+       Keen shares much of its control system with Solo (and Unequal).
+
+       To play Keen, simply click the mouse in any empty square and then
+       type a digit on the keyboard to fill that square. If you make a
+       mistake, click the mouse in the incorrect square and press Space to
+       clear it again (or use the Undo feature).
+
+       If you _right_-click in a square and then type a number, that
+       number will be entered in the square as a `pencil mark'. You can
+       have pencil marks for multiple numbers in the same square. Squares
+       containing filled-in numbers cannot also contain pencil marks.
+
+       The game pays no attention to pencil marks, so exactly what you
+       use them for is up to you: you can use them as reminders that a
+       particular square needs to be re-examined once you know more about
+       a particular number, or you can use them as lists of the possible
+       numbers in a given square, or anything else you feel like.
+
+       To erase a single pencil mark, right-click in the square and type
+       the same number again.
+
+       All pencil marks in a square are erased when you left-click and type
+       a number, or when you left-click and press space. Right-clicking and
+       pressing space will also erase pencil marks.
+
+       As for Solo, the cursor keys can be used in conjunction with the
+       digit keys to set numbers or pencil marks. Use the cursor keys to
+       move a highlight around the grid, and type a digit to enter it in
+       the highlighted square. Pressing return toggles the highlight into a
+       mode in which you can enter or remove pencil marks.
+
+       Pressing M will fill in a full set of pencil marks in every square
+       that does not have a main digit in it.
+
+       (All the actions described in section 2.1 are also available.)
+
+  30.2 Keen parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Grid size_
+
+           Specifies the size of the grid. Lower limit is 3; upper limit is
+           9 (because the user interface would become more difficult with
+           `digits' bigger than 9!).
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle. At Unreasonable
+           level, some backtracking will be required, but the solution
+           should still be unique. The remaining levels require
+           increasingly complex reasoning to avoid having to backtrack.
+
+       _Multiplication only_
+
+           If this is enabled, all boxes will be multiplication boxes. With
+           this rule, the puzzle is known as `Inshi No Heya'.
+
+Chapter 31: Towers
+------------------
+
+       You have a square grid. On each square of the grid you can build
+       a tower, with its height ranging from 1 to the size of the grid.
+       Around the edge of the grid are some numeric clues.
+
+       Your task is to build a tower on every square, in such a way that:
+
+        -  Each row contains every possible height of tower once
+
+        -  Each column contains every possible height of tower once
+
+        -  Each numeric clue describes the number of towers that can be
+           seen if you look into the square from that direction, assuming
+           that shorter towers are hidden behind taller ones. For example,
+           in a 5x5 grid, a clue marked `5' indicates that the five tower
+           heights must appear in increasing order (otherwise you would
+           not be able to see all five towers), whereas a clue marked `1'
+           indicates that the tallest tower (the one marked 5) must come
+           first.
+
+       In harder or larger puzzles, some towers will be specified for you
+       as well as the clues round the edge, and some edge clues may be
+       missing.
+
+       This puzzle appears on the web under various names, particularly
+       `Skyscrapers', but I don't know who first invented it.
+
+  31.1 Towers controls
+
+       Towers shares much of its control system with Solo, Unequal and
+       Keen.
+
+       To play Towers, simply click the mouse in any empty square and then
+       type a digit on the keyboard to fill that square with a tower of
+       the given height. If you make a mistake, click the mouse in the
+       incorrect square and press Space to clear it again (or use the Undo
+       feature).
+
+       If you _right_-click in a square and then type a number, that
+       number will be entered in the square as a `pencil mark'. You can
+       have pencil marks for multiple numbers in the same square. A square
+       containing a tower cannot also contain pencil marks.
+
+       The game pays no attention to pencil marks, so exactly what you
+       use them for is up to you: you can use them as reminders that a
+       particular square needs to be re-examined once you know more about
+       a particular number, or you can use them as lists of the possible
+       numbers in a given square, or anything else you feel like.
+
+       To erase a single pencil mark, right-click in the square and type
+       the same number again.
+
+       All pencil marks in a square are erased when you left-click and type
+       a number, or when you left-click and press space. Right-clicking and
+       pressing space will also erase pencil marks.
+
+       As for Solo, the cursor keys can be used in conjunction with the
+       digit keys to set numbers or pencil marks. Use the cursor keys to
+       move a highlight around the grid, and type a digit to enter it in
+       the highlighted square. Pressing return toggles the highlight into a
+       mode in which you can enter or remove pencil marks.
+
+       Pressing M will fill in a full set of pencil marks in every square
+       that does not have a main digit in it.
+
+       Left-clicking a clue will mark it as done (grey it out), or unmark
+       it if it is already marked. Holding Control or Shift and pressing an
+       arrow key likewise marks any clue in the given direction.
+
+       (All the actions described in section 2.1 are also available.)
+
+  31.2 Towers parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Grid size_
+
+           Specifies the size of the grid. Lower limit is 3; upper limit is
+           9 (because the user interface would become more difficult with
+           `digits' bigger than 9!).
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle. At Unreasonable
+           level, some backtracking will be required, but the solution
+           should still be unique. The remaining levels require
+           increasingly complex reasoning to avoid having to backtrack.
+
+Chapter 32: Singles
+-------------------
+
+       You have a grid of white squares, all of which contain numbers. Your
+       task is to colour some of the squares black (removing the number) so
+       as to satisfy all of the following conditions:
+
+        -  No number occurs more than once in any row or column.
+
+        -  No black square is horizontally or vertically adjacent to any
+           other black square.
+
+        -  The remaining white squares must all form one contiguous region
+           (connected by edges, not just touching at corners).
+
+       Credit for this puzzle goes to Nikoli [15] who call it Hitori.
+
+       Singles was contributed to this collection by James Harvey.
+
+       [15] http://www.nikoli.com/en/puzzles/hitori.html (beware of Flash)
+
+  32.1 Singles controls
+
+       Left-clicking on an empty square will colour it black; left-clicking
+       again will restore the number. Right-clicking will add a circle
+       (useful for indicating that a cell is definitely not black).
+
+       You can also use the cursor keys to move around the grid. Pressing
+       the return or space keys will turn a square black or add a circle
+       respectively, and pressing the key again will restore the number or
+       remove the circle.
+
+       (All the actions described in section 2.1 are also available.)
+
+  32.2 Singles parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle.
+
+Chapter 33: Magnets
+-------------------
+
+       A rectangular grid has been filled with a mixture of magnets (that
+       is, dominoes with one positive end and one negative end) and blank
+       dominoes (that is, dominoes with two neutral poles). These dominoes
+       are initially only seen in silhouette. Around the grid are placed a
+       number of clues indicating the number of positive and negative poles
+       contained in certain columns and rows.
+
+       Your aim is to correctly place the magnets and blank dominoes such
+       that all the clues are satisfied, with the additional constraint
+       that no two similar magnetic poles may be orthogonally adjacent
+       (since they repel). Neutral poles do not repel, and can be adjacent
+       to any other pole.
+
+       Credit for this puzzle goes to Janko [16].
+
+       Magnets was contributed to this collection by James Harvey.
+
+       [16] http://www.janko.at/Raetsel/Magnete/index.htm
+
+  33.1 Magnets controls
+
+       Left-clicking on an empty square places a magnet at that position
+       with the positive pole on the square and the negative pole on the
+       other half of the magnet; left-clicking again reverses the polarity,
+       and a third click removes the magnet.
+
+       Right-clicking on an empty square places a blank domino there.
+       Right-clicking again places two question marks on the domino,
+       signifying `this cannot be blank' (which can be useful to note
+       deductions while solving), and right-clicking again empties the
+       domino.
+
+       Left-clicking a clue will mark it as done (grey it out), or unmark
+       it if it is already marked.
+
+       You can also use the cursor keys to move a cursor around the grid.
+       Pressing the return key will lay a domino with a positive pole at
+       that position; pressing again reverses the polarity and then removes
+       the domino, as with left-clicking. Using the space bar allows
+       placement of blank dominoes and cannot-be-blank hints, as for right-
+       clicking.
+
+       (All the actions described in section 2.1 are also available.)
+
+  33.2 Magnets parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares. There will be half _Width_ x _Height_
+           dominoes in the grid: if this number is odd then one square will
+           be blank.
+
+           (Grids with at least one odd dimension tend to be easier to
+           solve.)
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle. At Tricky
+           level, you are required to make more deductions about empty
+           dominoes and row/column counts.
+
+       _Strip clues_
+
+           If true, some of the clues around the grid are removed at
+           generation time, making the puzzle more difficult.
+
+Chapter 34: Signpost
+--------------------
+
+       You have a grid of squares; each square (except the last one)
+       contains an arrow, and some squares also contain numbers. Your job
+       is to connect the squares to form a continuous list of numbers
+       starting at 1 and linked in the direction of the arrows - so the
+       arrow inside the square with the number 1 will point to the square
+       containing the number 2, which will point to the square containing
+       the number 3, etc. Each square can be any distance away from the
+       previous one, as long as it is somewhere in the direction of the
+       arrow.
+
+       By convention the first and last numbers are shown; one or more
+       interim numbers may also appear at the beginning.
+
+       Credit for this puzzle goes to Janko [17], who call it `Pfeilpfad'
+       (`arrow path').
+
+       Signpost was contributed to this collection by James Harvey.
+
+       [17] http://janko.at/Raetsel/Pfeilpfad/index.htm
+
+  34.1 Signpost controls
+
+       To play Signpost, you connect squares together by dragging from
+       one square to another, indicating that they are adjacent in the
+       sequence. Drag with the left button from a square to its successor,
+       or with the right button from a square to its predecessor.
+
+       If you connect together two squares in this way and one of them has
+       a number in it, the appropriate number will appear in the other
+       square. If you connect two non-numbered squares, they will be
+       assigned temporary algebraic labels: on the first occasion, they
+       will be labelled `a' and `a+1', and then `b' and `b+1', and so on.
+       Connecting more squares on to the ends of such a chain will cause
+       them all to be labelled with the same letter.
+
+       When you left-click or right-click in a square, the legal squares to
+       connect it to will be shown.
+
+       The arrow in each square starts off black, and goes grey once you
+       connect the square to its successor. Also, each square which needs
+       a predecessor has a small dot in the bottom left corner, which
+       vanishes once you link a square to it. So your aim is always to
+       connect a square with a black arrow to a square with a dot.
+
+       To remove any links for a particular square (both incoming and
+       outgoing), left-drag it off the grid. To remove a whole chain,
+       right-drag any square in the chain off the grid.
+
+       You can also use the cursor keys to move around the grid squares
+       and lines. Pressing the return key when over a square starts a link
+       operation, and pressing the return key again over a square will
+       finish the link, if allowable. Pressing the space bar over a square
+       will show the other squares pointing to it, and allow you to form a
+       backward link, and pressing the space bar again cancels this.
+
+       (All the actions described in section 2.1 are also available.)
+
+  34.2 Signpost parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _Force start/end to corners_
+
+           If true, the start and end squares are always placed in opposite
+           corners (the start at the top left, and the end at the bottom
+           right). If false the start and end squares are placed randomly
+           (although always both shown).
+
+Chapter 35: Range
+-----------------
+
+       You have a grid of squares; some squares contain numbers. Your job
+       is to colour some of the squares black, such that several criteria
+       are satisfied:
+
+        -  no square with a number is coloured black.
+
+        -  no two black squares are adjacent (horizontally or vertically).
+
+        -  for any two white squares, there is a path between them using
+           only white squares.
+
+        -  for each square with a number, that number denotes the total
+           number of white squares reachable from that square going in a
+           straight line in any horizontal or vertical direction until
+           hitting a wall or a black square; the square with the number is
+           included in the total (once).
+
+       For instance, a square containing the number one must have four
+       black squares as its neighbours by the last criterion; but then it's
+       impossible for it to be connected to any outside white square, which
+       violates the second to last criterion. So no square will contain the
+       number one.
+
+       Credit for this puzzle goes to Nikoli, who have variously called it
+       `Kurodoko', `Kuromasu' or `Where is Black Cells'. [18].
+
+       Range was contributed to this collection by Jonas Koelker.
+
+       [18] http://www.nikoli.co.jp/en/puzzles/where_is_black_cells.html
+
+  35.1 Range controls
+
+       Click with the left button to paint a square black, or with the
+       right button to mark a square with a dot to indicate that you are
+       sure it should _not_ be painted black. Repeated clicking with either
+       button will cycle the square through the three possible states
+       (filled, dotted or empty) in opposite directions.
+
+       You can also use the cursor keys to move around the grid squares.
+       Pressing Return does the same as clicking with the left button,
+       while pressing Space does the same as a right button click. Moving
+       with the cursor keys while holding Shift will place dots in all
+       squares that are moved through.
+
+       (All the actions described in section 2.1 are also available.)
+
+  35.2 Range parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+Chapter 36: Pearl
+-----------------
+
+       You have a grid of squares. Your job is to draw lines between the
+       centres of horizontally or vertically adjacent squares, so that the
+       lines form a single closed loop. In the resulting grid, some of the
+       squares that the loop passes through will contain corners, and some
+       will be straight horizontal or vertical lines. (And some squares can
+       be completely empty - the loop doesn't have to pass through every
+       square.)
+
+       Some of the squares contain black and white circles, which are clues
+       that the loop must satisfy.
+
+       A black circle in a square indicates that that square is a corner,
+       but neither of the squares adjacent to it in the loop is also a
+       corner.
+
+       A white circle indicates that the square is a straight edge, but _at
+       least one_ of the squares adjacent to it in the loop is a corner.
+
+       (In both cases, the clue only constrains the two squares adjacent
+       _in the loop_, that is, the squares that the loop passes into after
+       leaving the clue square. The squares that are only adjacent _in the
+       grid_ are not constrained.)
+
+       Credit for this puzzle goes to Nikoli, who call it `Masyu'. [19]
+
+       Thanks to James Harvey for assistance with the implementation.
+
+       [19] http://www.nikoli.co.jp/en/puzzles/masyu.html (beware of Flash)
+
+  36.1 Pearl controls
+
+       Click with the left button on a grid edge to draw a segment of the
+       loop through that edge, or to remove a segment once it is drawn.
+
+       Drag with the left button through a series of squares to draw more
+       than one segment of the loop in one go. Alternatively, drag over an
+       existing part of the loop to undraw it, or to undraw part of it and
+       then go in a different direction.
+
+       Click with the right button on a grid edge to mark it with a cross,
+       indicating that you are sure the loop does not go through that edge.
+       (For instance, if you have decided which of the squares adjacent
+       to a white clue has to be a corner, but don't yet know which way
+       the corner turns, you might mark the one way it _can't_ go with a
+       cross.)
+
+       Alternatively, use the cursor keys to move the cursor. Use the Enter
+       key to begin and end keyboard `drag' operations. Use the Space,
+       Escape or Backspace keys to cancel the drag. Or, hold Control while
+       dragging with the cursor keys to toggle segments as you move between
+       squares.
+
+       Pressing Control-Shift-arrowkey or Shift-arrowkey simulates a left
+       or right click, respectively, on the edge in the direction of the
+       key.
+
+       (All the actions described in section 2.1 are also available.)
+
+  36.2 Pearl parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+Chapter 37: Undead
+------------------
+
+       You are given a grid of squares, some of which contain diagonal
+       mirrors. Every square which is not a mirror must be filled with one
+       of three types of undead monster: a ghost, a vampire, or a zombie.
+
+       Vampires can be seen directly, but are invisible when reflected in
+       mirrors. Ghosts are the opposite way round: they can be seen in
+       mirrors, but are invisible when looked at directly. Zombies are
+       visible by any means.
+
+       You are also told the total number of each type of monster in the
+       grid. Also around the edge of the grid are written numbers, which
+       indicate how many monsters can be seen if you look into the grid
+       along a row or column starting from that position. (The diagonal
+       mirrors are reflective on both sides. If your reflected line of
+       sight crosses the same monster more than once, the number will count
+       it each time it is visible, not just once.)
+
+       This puzzle type was invented by David Millar, under the name
+       `Haunted Mirror Maze'. See [20] for more details.
+
+       Undead was contributed to this collection by Steffen Bauer.
+
+       [20] http://www.janko.at/Raetsel/Spukschloss/index.htm
+
+  37.1 Undead controls
+
+       Undead has a similar control system to Solo, Unequal and Keen.
+
+       To play Undead, click the mouse in any empty square and then type
+       a letter on the keyboard indicating the type of monster: `G' for
+       a ghost, `V' for a vampire, or `Z' for a zombie. If you make a
+       mistake, click the mouse in the incorrect square and press Space to
+       clear it again (or use the Undo feature).
+
+       If you _right_-click in a square and then type a letter, the
+       corresponding monster will be shown in reduced size in that square,
+       as a `pencil mark'. You can have pencil marks for multiple monsters
+       in the same square. A square containing a full-size monster cannot
+       also contain pencil marks.
+
+       The game pays no attention to pencil marks, so exactly what you
+       use them for is up to you: you can use them as reminders that a
+       particular square needs to be re-examined once you know more about
+       a particular monster, or you can use them as lists of the possible
+       monster in a given square, or anything else you feel like.
+
+       To erase a single pencil mark, right-click in the square and type
+       the same letter again.
+
+       All pencil marks in a square are erased when you left-click and type
+       a monster letter, or when you left-click and press Space. Right-
+       clicking and pressing space will also erase pencil marks.
+
+       As for Solo, the cursor keys can be used in conjunction with the
+       letter keys to place monsters or pencil marks. Use the cursor keys
+       to move a highlight around the grid, and type a monster letter to
+       enter it in the highlighted square. Pressing return toggles the
+       highlight into a mode in which you can enter or remove pencil marks.
+
+       If you prefer plain letters of the alphabet to cute monster
+       pictures, you can press `A' to toggle between showing the monsters
+       as monsters or showing them as letters.
+
+       Left-clicking a clue will mark it as done (grey it out), or unmark
+       it if it is already marked.
+
+       (All the actions described in section 2.1 are also available.)
+
+  37.2 Undead parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle.
+
+Chapter 38: Unruly
+------------------
+
+       You are given a grid of squares, which you must colour either black
+       or white. Some squares are provided as clues; the rest are left for
+       you to fill in. Each row and column must contain the same number
+       of black and white squares, and no row or column may contain three
+       consecutive squares of the same colour.
+
+       This puzzle type was invented by Adolfo Zanellati, under the name
+       `Tohu wa Vohu'. See [21] for more details.
+
+       Unruly was contributed to this collection by Lennard Sprong.
+
+       [21] http://www.janko.at/Raetsel/Tohu-Wa-Vohu/index.htm
+
+  38.1 Unruly controls
+
+       To play Unruly, click the mouse in a square to change its colour.
+       Left-clicking an empty square will turn it black, and right-clicking
+       will turn it white. Keep clicking the same button to cycle through
+       the three possible states for the square. If you middle-click in a
+       square it will be reset to empty.
+
+       You can also use the cursor keys to move around the grid. Pressing
+       the return or space keys will turn an empty square black or white
+       respectively (and then cycle the colours in the same way as the
+       mouse buttons), and pressing Backspace will reset a square to empty.
+
+       (All the actions described in section 2.1 are also available.)
+
+  38.2 Unruly parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares. (Note that the rules of the game
+           require both the width and height to be even numbers.)
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle.
+
+       _Unique rows and columns_
+
+           If enabled, no two rows are permitted to have exactly the same
+           pattern, and likewise columns. (A row and a column can match,
+           though.)
+
+Chapter 39: Flood
+-----------------
+
+       You are given a grid of squares, coloured at random in multiple
+       colours. In each move, you can flood-fill the top left square in a
+       colour of your choice (i.e. every square reachable from the starting
+       square by an orthogonally connected path of squares all the same
+       colour will be filled in the new colour). As you do this, more and
+       more of the grid becomes connected to the starting square.
+
+       Your aim is to make the whole grid the same colour, in as few moves
+       as possible. The game will set a limit on the number of moves, based
+       on running its own internal solver. You win if you can make the
+       whole grid the same colour in that many moves or fewer.
+
+       I saw this game (with a fixed grid size, fixed number of colours,
+       and fixed move limit) at http://floodit.appspot.com (no longer
+       accessible).
+
+  39.1 Flood controls
+
+       To play Flood, click the mouse in a square. The top left corner and
+       everything connected to it will be flood-filled with the colour of
+       the square you clicked. Clicking a square the same colour as the top
+       left corner has no effect, and therefore does not count as a move.
+
+       You can also use the cursor keys to move a cursor (outline black
+       square) around the grid. Pressing the return key will fill the top
+       left corner in the colour of the square under the cursor.
+
+       (All the actions described in section 2.1 are also available.)
+
+  39.2 Flood parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of the grid, in squares.
+
+       _Colours_
+
+           Number of colours used to fill the grid. Must be at least 3
+           (with two colours there would only be one legal move at any
+           stage, hence no choice to make at all), and at most 10.
+
+       _Extra moves permitted_
+
+           Controls the difficulty of the puzzle, by increasing the move
+           limit. In each new grid, Flood will run an internal solver to
+           generate its own solution, and then the value in this field
+           will be added to the length of Flood's solution to generate the
+           game's move limit. So a value of 0 requires you to be just as
+           efficient as Flood's automated solver, and a larger value makes
+           it easier.
+
+           (Note that Flood's internal solver will not necessarily find the
+           shortest possible solution, though I believe it's pretty close.
+           For a real challenge, set this value to 0 and then try to solve
+           a grid in _strictly fewer_ moves than the limit you're given!)
+
+Chapter 40: Tracks
+------------------
+
+       You are given a grid of squares, some of which are filled with train
+       tracks. You need to complete the track from A to B so that the
+       rows and columns contain the same number of track segments as are
+       indicated in the clues to the top and right of the grid.
+
+       There are only straight and 90 degree curved rails, and the track
+       may not cross itself.
+
+       Tracks was contributed to this collection by James Harvey.
+
+  40.1 Tracks controls
+
+       Left-clicking on an edge between two squares adds a track segment
+       between the two squares. Right-clicking on an edge adds a cross on
+       the edge, indicating no track is possible there.
+
+       Left-clicking in a square adds a colour indicator showing that
+       you know the square must contain a track, even if you don't know
+       which edges it crosses yet. Right-clicking in a square adds a cross
+       indicating it contains no track segment.
+
+       Left- or right-dragging between squares allows you to lay a straight
+       line of is-track or is-not-track indicators, useful for filling in
+       rows or columns to match the clue.
+
+       (All the actions described in section 2.1 are also available.)
+
+  40.2 Tracks parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of the grid, in squares.
+
+       _Difficulty_
+
+           Controls the difficulty of the generated puzzle: at Tricky
+           level, you are required to make more deductions regarding
+           disregarding moves that would lead to impossible crossings
+           later.
+
+       _Disallow consecutive 1 clues_
+
+           Controls whether the Tracks game generation permits two adjacent
+           rows or columns to have a 1 clue, or permits the row or column
+           of the track's endpoint to have a 1 clue. By default this is
+           not permitted, to avoid long straight boring segments of track
+           and make the games more twiddly and interesting. If you want to
+           restore the possibility, turn this option off.
+
+Chapter 41: Palisade
+--------------------
+
+       You're given a grid of squares, some of which contain numbers. Your
+       goal is to subdivide the grid into contiguous regions, all of the
+       same (given) size, such that each square containing a number is
+       adjacent to exactly that many edges (including those between the
+       inside and the outside of the grid).
+
+       Credit for this puzzle goes to Nikoli, who call it `Five Cells'.
+       [22].
+
+       Palisade was contributed to this collection by Jonas Koelker.
+
+       [22] http://nikoli.co.jp/en/puzzles/five_cells.html
+
+  41.1 Palisade controls
+
+       Left-click to place an edge. Right-click to indicate `no edge'.
+       Alternatively, the arrow keys will move a keyboard cursor. Holding
+       Control while pressing an arrow key will place an edge. Press Shift-
+       arrowkey to switch off an edge. Repeat an action to perform its
+       inverse.
+
+       (All the actions described in section 2.1 are also available.)
+
+  41.2 Palisade parameters
+
+       These parameters are available from the `Custom...' option on the
+       `Type' menu.
+
+       _Width_, _Height_
+
+           Size of grid in squares.
+
+       _Region size_
+
+           The size of the regions into which the grid must be subdivided.
+
+Appendix A: Licence
+-------------------
+
+       This software is copyright 2004-2014 Simon Tatham.
+
+       Portions copyright Richard Boulton, James Harvey, Mike Pinna, Jonas
+       Koelker, Dariusz Olszewski, Michael Schierl, Lambros Lambrou, Bernd
+       Schmidt, Steffen Bauer, Lennard Sprong and Rogier Goossens.
+
+       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.
+
diff --git a/apps/plugins/puzzles/random.c b/apps/plugins/puzzles/src/random.c
index c129a8d2ba..fb54560c95 100644
--- a/apps/plugins/puzzles/random.c
+++ b/apps/plugins/puzzles/src/random.c
@@ -10,6 +10,7 @@
  * easier to reuse it than to do anything else!
  */
 
+#include <assert.h>
 #include <string.h>
 #include <stdio.h>
 
@@ -271,7 +272,7 @@ unsigned long random_upto(random_state *state, unsigned long limit)
         bits++;
 
     bits += 3;
-    //assert(bits < 32);
+    assert(bits < 32);
 
     max = 1L << bits;
     divisor = max / limit;
diff --git a/apps/plugins/puzzles/range.R b/apps/plugins/puzzles/src/range.R
index f1256efd1e..f1256efd1e 100644
--- a/apps/plugins/puzzles/range.R
+++ b/apps/plugins/puzzles/src/range.R
diff --git a/apps/plugins/puzzles/range.c b/apps/plugins/puzzles/src/range.c
index e1067cbcc5..588178c003 100644
--- a/apps/plugins/puzzles/range.c
+++ b/apps/plugins/puzzles/src/range.c
@@ -56,7 +56,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1797,7 +1797,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 struct game const thegame = {
     "Range", "games.range", "range",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/range.html b/apps/plugins/puzzles/src/range.html
new file mode 100644
index 0000000000..7a93216805
--- /dev/null
+++ b/apps/plugins/puzzles/src/range.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Range</title>
+<link rel="previous" href="signpost.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="pearl.html">
+</head>
+<body>
+<p><a href="signpost.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="pearl.html">Next</a></p>
+<h1><a name="C35"></a>Chapter 35: <a name="i0"></a>Range</h1>
+<p>
+You have a grid of squares; some squares contain numbers. Your job is to colour some of the squares black, such that several criteria are satisfied:
+</p>
+<ul><li>
+no square with a number is coloured black.
+</li>
+<li>
+no two black squares are adjacent (horizontally or vertically).
+</li>
+<li>
+for any two white squares, there is a path between them using only white squares.
+</li>
+<li>
+for each square with a number, that number denotes the total number of white squares reachable from that square going in a straight line in any horizontal or vertical direction until hitting a wall or a black square; the square with the number is included in the total (once).
+</li>
+</ul>
+<p>
+For instance, a square containing the number one must have four black squares as its neighbours by the last criterion; but then it's impossible for it to be connected to any outside white square, which violates the second to last criterion. So no square will contain the number one.
+</p>
+<p>
+Credit for this puzzle goes to <a name="i1"></a>Nikoli, who have variously called it &#8216;Kurodoko&#8217;, &#8216;Kuromasu&#8217; or &#8216;Where is Black Cells&#8217;. <a href="#p0">[18]</a>.
+</p>
+<p>
+Range was contributed to this collection by Jonas K&#246;lker.
+</p>
+<p><a name="p0"></a>
+[18] <a href="http://www.nikoli.co.jp/en/puzzles/where_is_black_cells.html"><code>http://www.nikoli.co.jp/en/puzzles/where_is_black_cells.html</code></a>
+</p>
+<h2><a name="S35.1"></a>35.1 <a name="i2"></a>Range controls</h2>
+<p>
+Click with the left button to paint a square black, or with the right button to mark a square with a dot to indicate that you are sure it should <em>not</em> be painted black. Repeated clicking with either button will cycle the square through the three possible states (filled, dotted or empty) in opposite directions.
+</p>
+<p>
+You can also use the cursor keys to move around the grid squares. Pressing Return does the same as clicking with the left button, while pressing Space does the same as a right button click. Moving with the cursor keys while holding Shift will place dots in all squares that are moved through.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S35.2"></a>35.2 <a name="i3"></a>Range parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/rect.R b/apps/plugins/puzzles/src/rect.R
index 1448c0fa63..1448c0fa63 100644
--- a/apps/plugins/puzzles/rect.R
+++ b/apps/plugins/puzzles/src/rect.R
diff --git a/apps/plugins/puzzles/rect.c b/apps/plugins/puzzles/src/rect.c
index ca3cb984ea..465e1436fa 100644
--- a/apps/plugins/puzzles/rect.c
+++ b/apps/plugins/puzzles/src/rect.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2962,7 +2962,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Rectangles", "games.rectangles", "rect",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/rect.html b/apps/plugins/puzzles/src/rect.html
new file mode 100644
index 0000000000..923b34cefd
--- /dev/null
+++ b/apps/plugins/puzzles/src/rect.html
@@ -0,0 +1,76 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Rectangles</title>
+<link rel="previous" href="twiddle.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="netslide.html">
+</head>
+<body>
+<p><a href="twiddle.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="netslide.html">Next</a></p>
+<h1><a name="C8"></a>Chapter 8: <a name="i0"></a>Rectangles</h1>
+<p>
+You have a grid of squares, with numbers written in some (but not all) of the squares. Your task is to subdivide the grid into rectangles of various sizes, such that (a) every rectangle contains exactly one numbered square, and (b) the area of each rectangle is equal to the number written in its numbered square.
+</p>
+<p>
+Credit for this game goes to the Japanese puzzle magazine <a name="i1"></a>Nikoli <a href="#p0">[3]</a>; I've also seen a Palm implementation at <a name="i2"></a>Puzzle Palace <a href="#p1">[4]</a>. Unlike Puzzle Palace's implementation, my version automatically generates random grids of any size you like. The quality of puzzle design is therefore not quite as good as hand-crafted puzzles would be, but on the plus side you get an inexhaustible supply of puzzles tailored to your own specification.
+</p>
+<p><a name="p0"></a>
+[3] <a href="http://www.nikoli.co.jp/en/puzzles/shikaku.html"><code>http://www.nikoli.co.jp/en/puzzles/shikaku.html</code></a> (beware of Flash)
+</p>
+<p><a name="p1"></a>
+[4] <a href="https://web.archive.org/web/20041024001459/http://www.puzzle.gr.jp/puzzle/sikaku/palm/index.html.en"><code>https://web.archive.org/web/20041024001459/http://www.puzzle.gr.jp/puzzle/sikaku/palm/index.html.en</code></a>
+</p>
+<h2><a name="S8.1"></a>8.1 <a name="i3"></a>Rectangles controls</h2>
+<p>
+This game is played with the mouse or cursor keys.
+</p>
+<p>
+Left-click any edge to toggle it on or off, or left-click and drag to draw an entire rectangle (or line) on the grid in one go (removing any existing edges within that rectangle). Right-clicking and dragging will allow you to erase the contents of a rectangle without affecting its edges.
+</p>
+<p>
+Alternatively, use the cursor keys to move the position indicator around the board. Pressing the return key then allows you to use the cursor keys to drag a rectangle out from that position, and pressing the return key again completes the rectangle. Using the space bar instead of the return key allows you to erase the contents of a rectangle without affecting its edges, as above. Pressing escape cancels a drag.
+</p>
+<p>
+When a rectangle of the correct size is completed, it will be shaded.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S8.2"></a>8.2 <a name="i4"></a>Rectangles parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid, in squares.
+</dd>
+<dt>
+<em>Expansion factor</em>
+</dt>
+<dd>
+This is a mechanism for changing the type of grids generated by the program. Some people prefer a grid containing a few large rectangles to one containing many small ones. So you can ask Rectangles to essentially generate a <em>smaller</em> grid than the size you specified, and then to expand it by adding rows and columns.
+<p>
+The default expansion factor of zero means that Rectangles will simply generate a grid of the size you ask for, and do nothing further. If you set an expansion factor of (say) 0.5, it means that each dimension of the grid will be expanded to half again as big after generation. In other words, the initial grid will be 2/3 the size in each dimension, and will be expanded to its full size without adding any more rectangles.
+</p>
+<p>
+Setting an expansion factor of around 0.5 tends to make the game more difficult, and also (in my experience) rewards a less deductive and more intuitive playing style. If you set it <em>too</em> high, though, the game simply cannot generate more than a few rectangles to cover the entire grid, and the game becomes trivial.
+</p>
+
+</dd>
+<dt>
+<em>Ensure unique solution</em>
+</dt>
+<dd>
+Normally, Rectangles will make sure that the puzzles it presents have only one solution. Puzzles with ambiguous sections can be more difficult and more subtle, so if you like you can turn off this feature and risk having ambiguous puzzles. Also, finding <em>all</em> the possible solutions can be an additional challenge for an advanced player. Turning off this option can also speed up puzzle generation.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/resource.h b/apps/plugins/puzzles/src/resource.h
index f0bfa16d6d..f0bfa16d6d 100644
--- a/apps/plugins/puzzles/resource.h
+++ b/apps/plugins/puzzles/src/resource.h
diff --git a/apps/plugins/puzzles/samegame.R b/apps/plugins/puzzles/src/samegame.R
index cc0d350041..cc0d350041 100644
--- a/apps/plugins/puzzles/samegame.R
+++ b/apps/plugins/puzzles/src/samegame.R
diff --git a/apps/plugins/puzzles/samegame.c b/apps/plugins/puzzles/src/samegame.c
index ed5efd224e..88edad32b1 100644
--- a/apps/plugins/puzzles/samegame.c
+++ b/apps/plugins/puzzles/src/samegame.c
@@ -65,7 +65,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1643,7 +1643,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Same Game", "games.samegame", "samegame",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/samegame.html b/apps/plugins/puzzles/src/samegame.html
new file mode 100644
index 0000000000..8861e4b77b
--- /dev/null
+++ b/apps/plugins/puzzles/src/samegame.html
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Same Game</title>
+<link rel="previous" href="mines.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="flip.html">
+</head>
+<body>
+<p><a href="mines.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="flip.html">Next</a></p>
+<h1><a name="C13"></a>Chapter 13: <a name="i0"></a>Same Game</h1>
+<p>
+You have a grid of coloured squares, which you have to clear by highlighting contiguous regions of more than one coloured square; the larger the region you highlight, the more points you get (and the faster you clear the arena).
+</p>
+<p>
+If you clear the grid you win. If you end up with nothing but single squares (i.e., there are no more clickable regions left) you lose.
+</p>
+<p>
+Removing a region causes the rest of the grid to shuffle up: blocks that are suspended will fall down (first), and then empty columns are filled from the right.
+</p>
+<p>
+Same Game was contributed to this collection by James Harvey.
+</p>
+<h2><a name="S13.1"></a>13.1 <a name="i1"></a>Same Game controls</h2>
+<p>
+This game can be played with either the keyboard or the mouse.
+</p>
+<p>
+If you left-click an unselected region, it becomes selected (possibly clearing the current selection).
+</p>
+<p>
+If you left-click the selected region, it will be removed (and the rest of the grid shuffled immediately).
+</p>
+<p>
+If you right-click the selected region, it will be unselected.
+</p>
+<p>
+The cursor keys move a cursor around the grid. Pressing the Space or Enter keys while the cursor is in an unselected region selects it; pressing Space or Enter again removes it as above.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S13.2"></a>13.2 <a name="i2"></a>Same Game parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>No. of colours</em>
+</dt>
+<dd>
+Number of different colours used to fill the grid; the more colours, the fewer large regions of colour and thus the more difficult it is to successfully clear the grid.
+</dd>
+<dt>
+<em>Scoring system</em>
+</dt>
+<dd>
+Controls the precise mechanism used for scoring. With the default system, &#8216;(n-2)^2&#8217;, only regions of three squares or more will score any points at all. With the alternative &#8216;(n-1)^2&#8217; system, regions of two squares score a point each, and larger regions score relatively more points.
+</dd>
+<dt>
+<em>Ensure solubility</em>
+</dt>
+<dd>
+If this option is ticked (the default state), generated grids will be guaranteed to have at least one solution.
+<p>
+If you turn it off, the game generator will not try to guarantee soluble grids; it will, however, still ensure that there are at least 2 squares of each colour on the grid at the start (since a grid with exactly one square of a given colour is <em>definitely</em> insoluble). Grids generated with this option disabled may contain more large areas of contiguous colour, leading to opportunities for higher scores; they can also take less time to generate.
+</p>
+
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/signpost.R b/apps/plugins/puzzles/src/signpost.R
index 09ea367d57..09ea367d57 100644
--- a/apps/plugins/puzzles/signpost.R
+++ b/apps/plugins/puzzles/src/signpost.R
diff --git a/apps/plugins/puzzles/signpost.c b/apps/plugins/puzzles/src/signpost.c
index ce27da1a9d..ca72768c27 100644
--- a/apps/plugins/puzzles/signpost.c
+++ b/apps/plugins/puzzles/src/signpost.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2228,7 +2228,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Signpost", "games.signpost", "signpost",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/signpost.html b/apps/plugins/puzzles/src/signpost.html
new file mode 100644
index 0000000000..8a30030124
--- /dev/null
+++ b/apps/plugins/puzzles/src/signpost.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Signpost</title>
+<link rel="previous" href="magnets.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="range.html">
+</head>
+<body>
+<p><a href="magnets.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="range.html">Next</a></p>
+<h1><a name="C34"></a>Chapter 34: <a name="i0"></a>Signpost</h1>
+<p>
+You have a grid of squares; each square (except the last one) contains an arrow, and some squares also contain numbers. Your job is to connect the squares to form a continuous list of numbers starting at 1 and linked in the direction of the arrows &#8211; so the arrow inside the square with the number 1 will point to the square containing the number 2, which will point to the square containing the number 3, etc. Each square can be any distance away from the previous one, as long as it is somewhere in the direction of the arrow.
+</p>
+<p>
+By convention the first and last numbers are shown; one or more interim numbers may also appear at the beginning.
+</p>
+<p>
+Credit for this puzzle goes to <a name="i1"></a>Janko <a href="#p0">[17]</a>, who call it &#8216;Pfeilpfad&#8217; (&#8216;arrow path&#8217;).
+</p>
+<p>
+Signpost was contributed to this collection by James Harvey.
+</p>
+<p><a name="p0"></a>
+[17] <a href="http://janko.at/Raetsel/Pfeilpfad/index.htm"><code>http://janko.at/Raetsel/Pfeilpfad/index.htm</code></a>
+</p>
+<h2><a name="S34.1"></a>34.1 <a name="i2"></a>Signpost controls</h2>
+<p>
+To play Signpost, you connect squares together by dragging from one square to another, indicating that they are adjacent in the sequence. Drag with the left button from a square to its successor, or with the right button from a square to its predecessor.
+</p>
+<p>
+If you connect together two squares in this way and one of them has a number in it, the appropriate number will appear in the other square. If you connect two non-numbered squares, they will be assigned temporary algebraic labels: on the first occasion, they will be labelled &#8216;<code>a</code>&#8217; and &#8216;<code>a+1</code>&#8217;, and then &#8216;<code>b</code>&#8217; and &#8216;<code>b+1</code>&#8217;, and so on. Connecting more squares on to the ends of such a chain will cause them all to be labelled with the same letter.
+</p>
+<p>
+When you left-click or right-click in a square, the legal squares to connect it to will be shown.
+</p>
+<p>
+The arrow in each square starts off black, and goes grey once you connect the square to its successor. Also, each square which needs a predecessor has a small dot in the bottom left corner, which vanishes once you link a square to it. So your aim is always to connect a square with a black arrow to a square with a dot.
+</p>
+<p>
+To remove any links for a particular square (both incoming and outgoing), left-drag it off the grid. To remove a whole chain, right-drag any square in the chain off the grid.
+</p>
+<p>
+You can also use the cursor keys to move around the grid squares and lines. Pressing the return key when over a square starts a link operation, and pressing the return key again over a square will finish the link, if allowable. Pressing the space bar over a square will show the other squares pointing to it, and allow you to form a backward link, and pressing the space bar again cancels this.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S34.2"></a>34.2 <a name="i3"></a>Signpost parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>Force start/end to corners</em>
+</dt>
+<dd>
+If true, the start and end squares are always placed in opposite corners (the start at the top left, and the end at the bottom right). If false the start and end squares are placed randomly (although always both shown).
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/singles.R b/apps/plugins/puzzles/src/singles.R
index 2d10c4b388..2d10c4b388 100644
--- a/apps/plugins/puzzles/singles.R
+++ b/apps/plugins/puzzles/src/singles.R
diff --git a/apps/plugins/puzzles/singles.c b/apps/plugins/puzzles/src/singles.c
index 119be29122..5fe054c663 100644
--- a/apps/plugins/puzzles/singles.c
+++ b/apps/plugins/puzzles/src/singles.c
@@ -56,7 +56,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1814,7 +1814,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Singles", "games.singles", "singles",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/singles.html b/apps/plugins/puzzles/src/singles.html
new file mode 100644
index 0000000000..ee353a5962
--- /dev/null
+++ b/apps/plugins/puzzles/src/singles.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Singles</title>
+<link rel="previous" href="towers.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="magnets.html">
+</head>
+<body>
+<p><a href="towers.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="magnets.html">Next</a></p>
+<h1><a name="C32"></a>Chapter 32: <a name="i0"></a>Singles</h1>
+<p>
+You have a grid of white squares, all of which contain numbers. Your task is to colour some of the squares black (removing the number) so as to satisfy all of the following conditions:
+</p>
+<ul><li>
+No number occurs more than once in any row or column.
+</li>
+<li>
+No black square is horizontally or vertically adjacent to any other black square.
+</li>
+<li>
+The remaining white squares must all form one contiguous region (connected by edges, not just touching at corners).
+</li>
+</ul>
+<p>
+Credit for this puzzle goes to <a name="i1"></a>Nikoli <a href="#p0">[15]</a> who call it <a name="i2"></a>Hitori.
+</p>
+<p>
+Singles was contributed to this collection by James Harvey.
+</p>
+<p><a name="p0"></a>
+[15] <a href="http://www.nikoli.com/en/puzzles/hitori.html"><code>http://www.nikoli.com/en/puzzles/hitori.html</code></a> (beware of Flash)
+</p>
+<h2><a name="S32.1"></a>32.1 <a name="i3"></a>Singles controls</h2>
+<p>
+Left-clicking on an empty square will colour it black; left-clicking again will restore the number. Right-clicking will add a circle (useful for indicating that a cell is definitely not black).
+</p>
+<p>
+You can also use the cursor keys to move around the grid. Pressing the return or space keys will turn a square black or add a circle respectively, and pressing the key again will restore the number or remove the circle.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S32.2"></a>32.2 <a name="i4"></a>Singles parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/sixteen.R b/apps/plugins/puzzles/src/sixteen.R
index c63a27cef8..c63a27cef8 100644
--- a/apps/plugins/puzzles/sixteen.R
+++ b/apps/plugins/puzzles/src/sixteen.R
diff --git a/apps/plugins/puzzles/sixteen.c b/apps/plugins/puzzles/src/sixteen.c
index 1dd1d6b017..edc9771867 100644
--- a/apps/plugins/puzzles/sixteen.c
+++ b/apps/plugins/puzzles/src/sixteen.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1176,7 +1176,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Sixteen", "games.sixteen", "sixteen",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/sixteen.html b/apps/plugins/puzzles/src/sixteen.html
new file mode 100644
index 0000000000..cda88d5e6c
--- /dev/null
+++ b/apps/plugins/puzzles/src/sixteen.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Sixteen</title>
+<link rel="previous" href="fifteen.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="twiddle.html">
+</head>
+<body>
+<p><a href="fifteen.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="twiddle.html">Next</a></p>
+<h1><a name="C6"></a>Chapter 6: <a name="i0"></a>Sixteen</h1>
+<p>
+Another sliding tile puzzle, visually similar to Fifteen (see <a href="fifteen.html#C5">chapter 5</a>) but with a different type of move. This time, there is no hole: all 16 squares on the grid contain numbered squares. Your move is to shift an entire row left or right, or shift an entire column up or down; every time you do that, the tile you shift off the grid re-appears at the other end of the same row, in the space you just vacated. To win, arrange the tiles into numerical order (1,2,3,4 on the top row, 13,14,15,16 on the bottom). When you've done that, try playing on different sizes of grid.
+</p>
+<p>
+I <em>might</em> have invented this game myself, though only by accident if so (and I'm sure other people have independently invented it). I thought I was imitating a screensaver I'd seen, but I have a feeling that the screensaver might actually have been a Fifteen-type puzzle rather than this slightly different kind. So this might be the one thing in my puzzle collection which represents creativity on my part rather than just engineering.
+</p>
+<h2><a name="S6.1"></a>6.1 <a name="i1"></a>Sixteen controls</h2>
+<p>
+Left-clicking on an arrow will move the appropriate row or column in the direction indicated. Right-clicking will move it in the opposite direction.
+</p>
+<p>
+Alternatively, use the cursor keys to move the position indicator around the edge of the grid, and use the return key to move the row/column in the direction indicated.
+</p>
+<p>
+You can also move the tiles directly. Move the cursor onto a tile, hold Control and press an arrow key to move the tile under the cursor and move the cursor along with the tile. Or, hold Shift to move only the tile. Pressing Enter simulates holding down Control (press Enter again to release), while pressing Space simulates holding down shift.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S6.2"></a>6.2 <a name="i2"></a>Sixteen parameters</h2>
+<p>
+The parameters available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu are:
+</p>
+<ul><li>
+<em>Width</em> and <em>Height</em>, which are self-explanatory.
+</li>
+<li>
+You can ask for a limited shuffling operation to be performed on the grid. By default, Sixteen will shuffle the grid in such a way that any arrangement is about as probable as any other. You can override this by requesting a precise number of shuffling moves to be performed. Typically your aim is then to determine the precise set of shuffling moves and invert them exactly, so that you answer (say) a four-move shuffle with a four-move solution. Note that the more moves you ask for, the more likely it is that solutions shorter than the target length will turn out to be possible.
+</li>
+</ul>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/slant.R b/apps/plugins/puzzles/src/slant.R
index ff0d21f1eb..ff0d21f1eb 100644
--- a/apps/plugins/puzzles/slant.R
+++ b/apps/plugins/puzzles/src/slant.R
diff --git a/apps/plugins/puzzles/slant.c b/apps/plugins/puzzles/src/slant.c
index 3ab4d306ef..5f9f4f6fed 100644
--- a/apps/plugins/puzzles/slant.c
+++ b/apps/plugins/puzzles/src/slant.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2150,7 +2150,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Slant", "games.slant", "slant",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/slant.html b/apps/plugins/puzzles/src/slant.html
new file mode 100644
index 0000000000..79ba076d66
--- /dev/null
+++ b/apps/plugins/puzzles/src/slant.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Slant</title>
+<link rel="previous" href="blackbox.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="lightup.html">
+</head>
+<body>
+<p><a href="blackbox.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="lightup.html">Next</a></p>
+<h1><a name="C20"></a>Chapter 20: <a name="i0"></a>Slant</h1>
+<p>
+You have a grid of squares. Your aim is to draw a diagonal line through each square, and choose which way each line slants so that the following conditions are met:
+</p>
+<ul><li>
+The diagonal lines never form a loop.
+</li>
+<li>
+Any point with a circled number has precisely that many lines meeting at it. (Thus, a 4 is the centre of a cross shape, whereas a zero is the centre of a diamond shape &#8211; or rather, a partial diamond shape, because a zero can never appear in the middle of the grid because that would immediately cause a loop.)
+</li>
+</ul>
+<p>
+Credit for this puzzle goes to <a name="i1"></a>Nikoli <a href="#p0">[8]</a>.
+</p>
+<p><a name="p0"></a>
+[8] <a href="http://www.nikoli.co.jp/ja/puzzles/gokigen_naname"><code>http://www.nikoli.co.jp/ja/puzzles/gokigen_naname</code></a> (in Japanese)
+</p>
+<h2><a name="S20.1"></a>20.1 <a name="i2"></a>Slant controls</h2>
+<p>
+Left-clicking in a blank square will place a <code>\</code> in it (a line leaning to the left, i.e. running from the top left of the square to the bottom right). Right-clicking in a blank square will place a <code>/</code> in it (leaning to the right, running from top right to bottom left).
+</p>
+<p>
+Continuing to click either button will cycle between the three possible square contents. Thus, if you left-click repeatedly in a blank square it will change from blank to <code>\</code> to <code>/</code> back to blank, and if you right-click repeatedly the square will change from blank to <code>/</code> to <code>\</code> back to blank. (Therefore, you can play the game entirely with one button if you need to.)
+</p>
+<p>
+You can also use the cursor keys to move around the grid. Pressing the return or space keys will place a <code>\</code> or a <code>/</code>, respectively, and will then cycle them as above. You can also press <code>/</code> or <code>\</code> to place a <code>/</code> or <code>\</code>, respectively, independent of what is already in the cursor square. Backspace removes any line from the cursor square.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S20.2"></a>20.2 <a name="i3"></a>Slant parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle. At Hard level, you are required to do deductions based on knowledge of <em>relationships</em> between squares rather than always being able to deduce the exact contents of one square at a time. (For example, you might know that two squares slant in the same direction, even if you don't yet know what that direction is, and this might enable you to deduce something about still other squares.) Even at Hard level, guesswork and backtracking should never be necessary.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/solo.R b/apps/plugins/puzzles/src/solo.R
index 081a76147e..081a76147e 100644
--- a/apps/plugins/puzzles/solo.R
+++ b/apps/plugins/puzzles/src/solo.R
diff --git a/apps/plugins/puzzles/solo.c b/apps/plugins/puzzles/src/solo.c
index 26f0eddd1a..0d383c39aa 100644
--- a/apps/plugins/puzzles/solo.c
+++ b/apps/plugins/puzzles/src/solo.c
@@ -85,7 +85,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -5543,7 +5543,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Solo", "games.solo", "solo",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/solo.html b/apps/plugins/puzzles/src/solo.html
new file mode 100644
index 0000000000..472a85b2d3
--- /dev/null
+++ b/apps/plugins/puzzles/src/solo.html
@@ -0,0 +1,99 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Solo</title>
+<link rel="previous" href="pattern.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="mines.html">
+</head>
+<body>
+<p><a href="pattern.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="mines.html">Next</a></p>
+<h1><a name="C11"></a>Chapter 11: <a name="i0"></a>Solo</h1>
+<p>
+You have a square grid, which is divided into as many equally sized sub-blocks as the grid has rows. Each square must be filled in with a digit from 1 to the size of the grid, in such a way that
+</p>
+<ul><li>
+every row contains only one occurrence of each digit
+</li>
+<li>
+every column contains only one occurrence of each digit
+</li>
+<li>
+every block contains only one occurrence of each digit.
+</li>
+<li>
+(optionally, by default off) each of the square's two main diagonals contains only one occurrence of each digit.
+</li>
+</ul>
+<p>
+You are given some of the numbers as clues; your aim is to place the rest of the numbers correctly.
+</p>
+<p>
+Under the default settings, the sub-blocks are square or rectangular. The default puzzle size is 3&#215;3 (a 9&#215;9 actual grid, divided into nine 3&#215;3 blocks). You can also select sizes with rectangular blocks instead of square ones, such as 2&#215;3 (a 6&#215;6 grid divided into six 3&#215;2 blocks). Alternatively, you can select &#8216;jigsaw&#8217; mode, in which the sub-blocks are arbitrary shapes which differ between individual puzzles.
+</p>
+<p>
+Another available mode is &#8216;killer&#8217;. In this mode, clues are not given in the form of filled-in squares; instead, the grid is divided into &#8216;cages&#8217; by coloured lines, and for each cage the game tells you what the sum of all the digits in that cage should be. Also, no digit may appear more than once within a cage, even if the cage crosses the boundaries of existing regions.
+</p>
+<p>
+If you select a puzzle size which requires more than 9 digits, the additional digits will be letters of the alphabet. For example, if you select 3&#215;4 then the digits which go in your grid will be 1 to 9, plus &#8216;<code>a</code>&#8217;, &#8216;<code>b</code>&#8217; and &#8216;<code>c</code>&#8217;. This cannot be selected for killer puzzles.
+</p>
+<p>
+I first saw this puzzle in <a name="i1"></a>Nikoli <a href="#p0">[5]</a>, although it's also been popularised by various newspapers under the name &#8216;Sudoku&#8217; or &#8216;Su Doku&#8217;. Howard Garns is considered the inventor of the modern form of the puzzle, and it was first published in <em>Dell Pencil Puzzles and Word Games</em>. A more elaborate treatment of the history of the puzzle can be found on Wikipedia <a href="#p1">[6]</a>.
+</p>
+<p><a name="p0"></a>
+[5] <a href="http://www.nikoli.co.jp/en/puzzles/sudoku.html"><code>http://www.nikoli.co.jp/en/puzzles/sudoku.html</code></a> (beware of Flash)
+</p>
+<p><a name="p1"></a>
+[6] <a href="http://en.wikipedia.org/wiki/Sudoku"><code>http://en.wikipedia.org/wiki/Sudoku</code></a>
+</p>
+<h2><a name="S11.1"></a>11.1 <a name="i2"></a>Solo controls</h2>
+<p>
+To play Solo, simply click the mouse in any empty square and then type a digit or letter on the keyboard to fill that square. If you make a mistake, click the mouse in the incorrect square and press Space to clear it again (or use the Undo feature).
+</p>
+<p>
+If you <em>right</em>-click in a square and then type a number, that number will be entered in the square as a &#8216;pencil mark&#8217;. You can have pencil marks for multiple numbers in the same square. Squares containing filled-in numbers cannot also contain pencil marks.
+</p>
+<p>
+The game pays no attention to pencil marks, so exactly what you use them for is up to you: you can use them as reminders that a particular square needs to be re-examined once you know more about a particular number, or you can use them as lists of the possible numbers in a given square, or anything else you feel like.
+</p>
+<p>
+To erase a single pencil mark, right-click in the square and type the same number again.
+</p>
+<p>
+All pencil marks in a square are erased when you left-click and type a number, or when you left-click and press space. Right-clicking and pressing space will also erase pencil marks.
+</p>
+<p>
+Alternatively, use the cursor keys to move the mark around the grid. Pressing the return key toggles the mark (from a normal mark to a pencil mark), and typing a number in is entered in the square in the appropriate way; typing in a 0 or using the space bar will clear a filled square.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S11.2"></a>11.2 <a name="i3"></a>Solo parameters</h2>
+<p>
+Solo allows you to configure two separate dimensions of the puzzle grid on the &#8216;Type&#8217; menu: the number of columns, and the number of rows, into which the main grid is divided. (The size of a block is the inverse of this: for example, if you select 2 columns and 3 rows, each actual block will have 3 columns and 2 rows.)
+</p>
+<p>
+If you tick the &#8216;X&#8217; checkbox, Solo will apply the optional extra constraint that the two main diagonals of the grid also contain one of every digit. (This is sometimes known as &#8216;Sudoku-X&#8217; in newspapers.) In this mode, the squares on the two main diagonals will be shaded slightly so that you know it's enabled.
+</p>
+<p>
+If you tick the &#8216;Jigsaw&#8217; checkbox, Solo will generate randomly shaped sub-blocks. In this mode, the actual grid size will be taken to be the product of the numbers entered in the &#8216;Columns&#8217; and &#8216;Rows&#8217; boxes. There is no reason why you have to enter a number greater than 1 in both boxes; Jigsaw mode has no constraint on the grid size, and it can even be a prime number if you feel like it.
+</p>
+<p>
+If you tick the &#8216;Killer&#8217; checkbox, Solo will generate a set of of cages, which are randomly shaped and drawn in an outline of a different colour. Each of these regions contains a smaller clue which shows the digit sum of all the squares in this region.
+</p>
+<p>
+You can also configure the type of symmetry shown in the generated puzzles. More symmetry makes the puzzles look prettier but may also make them easier, since the symmetry constraints can force more clues than necessary to be present. Completely asymmetric puzzles have the freedom to contain as few clues as possible.
+</p>
+<p>
+Finally, you can configure the difficulty of the generated puzzles. Difficulty levels are judged by the complexity of the techniques of deduction required to solve the puzzle: each level requires a mode of reasoning which was not necessary in the previous one. In particular, on difficulty levels &#8216;Trivial&#8217; and &#8216;Basic&#8217; there will be a square you can fill in with a single number at all times, whereas at &#8216;Intermediate&#8217; level and beyond you will have to make partial deductions about the <em>set</em> of squares a number could be in (or the set of numbers that could be in a square). At &#8216;Unreasonable&#8217; level, even this is not enough, and you will eventually have to make a guess, and then backtrack if it turns out to be wrong.
+</p>
+<p>
+Generating difficult puzzles is itself difficult: if you select one of the higher difficulty levels, Solo may have to make many attempts at generating a puzzle before it finds one hard enough for you. Be prepared to wait, especially if you have also configured a large puzzle size.
+</p>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/tdq.c b/apps/plugins/puzzles/src/tdq.c
index 43c9c35de5..d66f9f4a83 100644
--- a/apps/plugins/puzzles/tdq.c
+++ b/apps/plugins/puzzles/src/tdq.c
@@ -3,7 +3,7 @@
  * list mechanism.
  */
 
-#include "rbassert.h"
+#include <assert.h>
 
 #include "puzzles.h"
 
diff --git a/apps/plugins/puzzles/tents.R b/apps/plugins/puzzles/src/tents.R
index 557f929840..557f929840 100644
--- a/apps/plugins/puzzles/tents.R
+++ b/apps/plugins/puzzles/src/tents.R
diff --git a/apps/plugins/puzzles/tents.c b/apps/plugins/puzzles/src/tents.c
index 1bc7a85188..4ffeb7be64 100644
--- a/apps/plugins/puzzles/tents.c
+++ b/apps/plugins/puzzles/src/tents.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2611,7 +2611,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Tents", "games.tents", "tents",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/tents.html b/apps/plugins/puzzles/src/tents.html
new file mode 100644
index 0000000000..c503f008d8
--- /dev/null
+++ b/apps/plugins/puzzles/src/tents.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Tents</title>
+<link rel="previous" href="inertia.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="bridges.html">
+</head>
+<body>
+<p><a href="inertia.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="bridges.html">Next</a></p>
+<h1><a name="C25"></a>Chapter 25: <a name="i0"></a>Tents</h1>
+<p>
+You have a grid of squares, some of which contain trees. Your aim is to place tents in some of the remaining squares, in such a way that the following conditions are met:
+</p>
+<ul><li>
+There are exactly as many tents as trees.
+</li>
+<li>
+The tents and trees can be matched up in such a way that each tent is directly adjacent (horizontally or vertically, but not diagonally) to its own tree. However, a tent may be adjacent to other trees as well as its own.
+</li>
+<li>
+No two tents are adjacent horizontally, vertically <em>or diagonally</em>.
+</li>
+<li>
+The number of tents in each row, and in each column, matches the numbers given round the sides of the grid.
+</li>
+</ul>
+<p>
+This puzzle can be found in several places on the Internet, and was brought to my attention by e-mail. I don't know who I should credit for inventing it.
+</p>
+<h2><a name="S25.1"></a>25.1 <a name="i1"></a>Tents controls</h2>
+<p>
+Left-clicking in a blank square will place a tent in it. Right-clicking in a blank square will colour it green, indicating that you are sure it <em>isn't</em> a tent. Clicking either button in an occupied square will clear it.
+</p>
+<p>
+If you <em>drag</em> with the right button along a row or column, every blank square in the region you cover will be turned green, and no other squares will be affected. (This is useful for clearing the remainder of a row once you have placed all its tents.)
+</p>
+<p>
+You can also use the cursor keys to move around the grid. Pressing the return key over an empty square will place a tent, and pressing the space bar over an empty square will colour it green; either key will clear an occupied square. Holding Shift and pressing the cursor keys will colour empty squares green. Holding Control and pressing the cursor keys will colour green both empty squares and squares with tents.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S25.2"></a>25.2 <a name="i2"></a>Tents parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle. More difficult puzzles require more complex deductions, but at present none of the available difficulty levels requires guesswork or backtracking.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/towers.R b/apps/plugins/puzzles/src/towers.R
index c060c697a7..c060c697a7 100644
--- a/apps/plugins/puzzles/towers.R
+++ b/apps/plugins/puzzles/src/towers.R
diff --git a/apps/plugins/puzzles/towers.c b/apps/plugins/puzzles/src/towers.c
index d8e087a4bc..a3a7e55a45 100644
--- a/apps/plugins/puzzles/towers.c
+++ b/apps/plugins/puzzles/src/towers.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1978,7 +1978,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Towers", "games.towers", "towers",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/towers.html b/apps/plugins/puzzles/src/towers.html
new file mode 100644
index 0000000000..415f30c0d8
--- /dev/null
+++ b/apps/plugins/puzzles/src/towers.html
@@ -0,0 +1,88 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Towers</title>
+<link rel="previous" href="keen.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="singles.html">
+</head>
+<body>
+<p><a href="keen.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="singles.html">Next</a></p>
+<h1><a name="C31"></a>Chapter 31: <a name="i0"></a>Towers</h1>
+<p>
+You have a square grid. On each square of the grid you can build a tower, with its height ranging from 1 to the size of the grid. Around the edge of the grid are some numeric clues.
+</p>
+<p>
+Your task is to build a tower on every square, in such a way that:
+</p>
+<ul><li>
+Each row contains every possible height of tower once
+</li>
+<li>
+Each column contains every possible height of tower once
+</li>
+<li>
+Each numeric clue describes the number of towers that can be seen if you look into the square from that direction, assuming that shorter towers are hidden behind taller ones. For example, in a 5&#215;5 grid, a clue marked &#8216;5&#8217; indicates that the five tower heights must appear in increasing order (otherwise you would not be able to see all five towers), whereas a clue marked &#8216;1&#8217; indicates that the tallest tower (the one marked 5) must come first.
+</li>
+</ul>
+<p>
+In harder or larger puzzles, some towers will be specified for you as well as the clues round the edge, and some edge clues may be missing.
+</p>
+<p>
+This puzzle appears on the web under various names, particularly &#8216;<a name="i1"></a>Skyscrapers&#8217;, but I don't know who first invented it.
+</p>
+<h2><a name="S31.1"></a>31.1 <a name="i2"></a>Towers controls</h2>
+<p>
+Towers shares much of its control system with Solo, Unequal and Keen.
+</p>
+<p>
+To play Towers, simply click the mouse in any empty square and then type a digit on the keyboard to fill that square with a tower of the given height. If you make a mistake, click the mouse in the incorrect square and press Space to clear it again (or use the Undo feature).
+</p>
+<p>
+If you <em>right</em>-click in a square and then type a number, that number will be entered in the square as a &#8216;pencil mark&#8217;. You can have pencil marks for multiple numbers in the same square. A square containing a tower cannot also contain pencil marks.
+</p>
+<p>
+The game pays no attention to pencil marks, so exactly what you use them for is up to you: you can use them as reminders that a particular square needs to be re-examined once you know more about a particular number, or you can use them as lists of the possible numbers in a given square, or anything else you feel like.
+</p>
+<p>
+To erase a single pencil mark, right-click in the square and type the same number again.
+</p>
+<p>
+All pencil marks in a square are erased when you left-click and type a number, or when you left-click and press space. Right-clicking and pressing space will also erase pencil marks.
+</p>
+<p>
+As for Solo, the cursor keys can be used in conjunction with the digit keys to set numbers or pencil marks. Use the cursor keys to move a highlight around the grid, and type a digit to enter it in the highlighted square. Pressing return toggles the highlight into a mode in which you can enter or remove pencil marks.
+</p>
+<p>
+Pressing M will fill in a full set of pencil marks in every square that does not have a main digit in it.
+</p>
+<p>
+Left-clicking a clue will mark it as done (grey it out), or unmark it if it is already marked. Holding Control or Shift and pressing an arrow key likewise marks any clue in the given direction.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S31.2"></a>31.2 <a name="i3"></a>Towers parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Grid size</em>
+</dt>
+<dd>
+Specifies the size of the grid. Lower limit is 3; upper limit is 9 (because the user interface would become more difficult with &#8216;digits&#8217; bigger than 9!).
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle. At Unreasonable level, some backtracking will be required, but the solution should still be unique. The remaining levels require increasingly complex reasoning to avoid having to backtrack.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/tracks.R b/apps/plugins/puzzles/src/tracks.R
index f88dfb03eb..f88dfb03eb 100644
--- a/apps/plugins/puzzles/tracks.R
+++ b/apps/plugins/puzzles/src/tracks.R
diff --git a/apps/plugins/puzzles/tracks.c b/apps/plugins/puzzles/src/tracks.c
index 3dfbf62d6a..43428a19e9 100644
--- a/apps/plugins/puzzles/tracks.c
+++ b/apps/plugins/puzzles/src/tracks.c
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2622,7 +2622,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Train Tracks", "games.tracks", "tracks",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/tracks.html b/apps/plugins/puzzles/src/tracks.html
new file mode 100644
index 0000000000..dbff14394f
--- /dev/null
+++ b/apps/plugins/puzzles/src/tracks.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Tracks</title>
+<link rel="previous" href="flood.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="palisade.html">
+</head>
+<body>
+<p><a href="flood.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="palisade.html">Next</a></p>
+<h1><a name="C40"></a>Chapter 40: <a name="i0"></a>Tracks</h1>
+<p>
+You are given a grid of squares, some of which are filled with train tracks. You need to complete the track from A to B so that the rows and columns contain the same number of track segments as are indicated in the clues to the top and right of the grid.
+</p>
+<p>
+There are only straight and 90 degree curved rails, and the track may not cross itself.
+</p>
+<p>
+Tracks was contributed to this collection by James Harvey.
+</p>
+<h2><a name="S40.1"></a>40.1 <a name="i1"></a>Tracks controls</h2>
+<p>
+Left-clicking on an edge between two squares adds a track segment between the two squares. Right-clicking on an edge adds a cross on the edge, indicating no track is possible there.
+</p>
+<p>
+Left-clicking in a square adds a colour indicator showing that you know the square must contain a track, even if you don't know which edges it crosses yet. Right-clicking in a square adds a cross indicating it contains no track segment.
+</p>
+<p>
+Left- or right-dragging between squares allows you to lay a straight line of is-track or is-not-track indicators, useful for filling in rows or columns to match the clue.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S40.2"></a>40.2 <a name="i2"></a>Tracks parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of the grid, in squares.
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle: at Tricky level, you are required to make more deductions regarding disregarding moves that would lead to impossible crossings later.
+</dd>
+<dt>
+<em>Disallow consecutive 1 clues</em>
+</dt>
+<dd>
+Controls whether the Tracks game generation permits two adjacent rows or columns to have a 1 clue, or permits the row or column of the track's endpoint to have a 1 clue. By default this is not permitted, to avoid long straight boring segments of track and make the games more twiddly and interesting. If you want to restore the possibility, turn this option off.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/tree234.c b/apps/plugins/puzzles/src/tree234.c
index 71c3be242a..4b3151ee2f 100644
--- a/apps/plugins/puzzles/tree234.c
+++ b/apps/plugins/puzzles/src/tree234.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "rbassert.h"
+#include <assert.h>
 
 #include "tree234.h"
 
diff --git a/apps/plugins/puzzles/tree234.h b/apps/plugins/puzzles/src/tree234.h
index f75c8f7fb3..f75c8f7fb3 100644
--- a/apps/plugins/puzzles/tree234.h
+++ b/apps/plugins/puzzles/src/tree234.h
diff --git a/apps/plugins/puzzles/twiddle.R b/apps/plugins/puzzles/src/twiddle.R
index 1495c33181..1495c33181 100644
--- a/apps/plugins/puzzles/twiddle.R
+++ b/apps/plugins/puzzles/src/twiddle.R
diff --git a/apps/plugins/puzzles/twiddle.c b/apps/plugins/puzzles/src/twiddle.c
index 2a2ab668ca..6e05f4ddec 100644
--- a/apps/plugins/puzzles/twiddle.c
+++ b/apps/plugins/puzzles/src/twiddle.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1281,7 +1281,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Twiddle", "games.twiddle", "twiddle",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/twiddle.html b/apps/plugins/puzzles/src/twiddle.html
new file mode 100644
index 0000000000..244ce45144
--- /dev/null
+++ b/apps/plugins/puzzles/src/twiddle.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Twiddle</title>
+<link rel="previous" href="sixteen.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="rect.html">
+</head>
+<body>
+<p><a href="sixteen.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="rect.html">Next</a></p>
+<h1><a name="C7"></a>Chapter 7: <a name="i0"></a>Twiddle</h1>
+<p>
+Twiddle is a tile-rearrangement puzzle, visually similar to Sixteen (see <a href="sixteen.html#C6">chapter 6</a>): you are given a grid of square tiles, each containing a number, and your aim is to arrange the numbers into ascending order.
+</p>
+<p>
+In basic Twiddle, your move is to rotate a square group of four tiles about their common centre. (Orientation is not significant in the basic puzzle, although you can select it.) On more advanced settings, you can rotate a larger square group of tiles.
+</p>
+<p>
+I first saw this type of puzzle in the GameCube game &#8216;Metroid Prime 2&#8217;. In the Main Gyro Chamber in that game, there is a puzzle you solve to unlock a door, which is a special case of Twiddle. I developed this game as a generalisation of that puzzle.
+</p>
+<h2><a name="S7.1"></a>7.1 <a name="i1"></a>Twiddle controls</h2>
+<p>
+To play Twiddle, click the mouse in the centre of the square group you wish to rotate. In the basic mode, you rotate a 2&#215;2 square, which means you have to click at a corner point where four tiles meet.
+</p>
+<p>
+In more advanced modes you might be rotating 3&#215;3 or even more at a time; if the size of the square is odd then you simply click in the centre tile of the square you want to rotate.
+</p>
+<p>
+Clicking with the left mouse button rotates the group anticlockwise. Clicking with the right button rotates it clockwise.
+</p>
+<p>
+You can also move an outline square around the grid with the cursor keys; the square is the size above (2&#215;2 by default, or larger). Pressing the return key or space bar will rotate the current square anticlockwise or clockwise respectively.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S7.2"></a>7.2 <a name="i2"></a>Twiddle parameters</h2>
+<p>
+Twiddle provides several configuration options via the &#8216;Custom&#8217; option on the &#8216;Type&#8217; menu:
+</p>
+<ul><li>
+You can configure the width and height of the puzzle grid.
+</li>
+<li>
+You can configure the size of square block that rotates at a time.
+</li>
+<li>
+You can ask for every square in the grid to be distinguishable (the default), or you can ask for a simplified puzzle in which there are groups of identical numbers. In the simplified puzzle your aim is just to arrange all the 1s into the first row, all the 2s into the second row, and so on.
+</li>
+<li>
+You can configure whether the orientation of tiles matters. If you ask for an orientable puzzle, each tile will have a triangle drawn in it. All the triangles must be pointing upwards to complete the puzzle.
+</li>
+<li>
+You can ask for a limited shuffling operation to be performed on the grid. By default, Twiddle will shuffle the grid so much that any arrangement is about as probable as any other. You can override this by requesting a precise number of shuffling moves to be performed. Typically your aim is then to determine the precise set of shuffling moves and invert them exactly, so that you answer (say) a four-move shuffle with a four-move solution. Note that the more moves you ask for, the more likely it is that solutions shorter than the target length will turn out to be possible.
+</li>
+</ul>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/undead.R b/apps/plugins/puzzles/src/undead.R
index 5907ed6b74..5907ed6b74 100644
--- a/apps/plugins/puzzles/undead.R
+++ b/apps/plugins/puzzles/src/undead.R
diff --git a/apps/plugins/puzzles/undead.c b/apps/plugins/puzzles/src/undead.c
index 28fd0f35fe..b1f536e8d0 100644
--- a/apps/plugins/puzzles/undead.c
+++ b/apps/plugins/puzzles/src/undead.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -2702,7 +2702,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Undead", "games.undead", "undead",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/undead.html b/apps/plugins/puzzles/src/undead.html
new file mode 100644
index 0000000000..f7a66c8a52
--- /dev/null
+++ b/apps/plugins/puzzles/src/undead.html
@@ -0,0 +1,84 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Undead</title>
+<link rel="previous" href="pearl.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="unruly.html">
+</head>
+<body>
+<p><a href="pearl.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="unruly.html">Next</a></p>
+<h1><a name="C37"></a>Chapter 37: <a name="i0"></a>Undead</h1>
+<p>
+You are given a grid of squares, some of which contain diagonal mirrors. Every square which is not a mirror must be filled with one of three types of undead monster: a ghost, a vampire, or a zombie.
+</p>
+<p>
+Vampires can be seen directly, but are invisible when reflected in mirrors. Ghosts are the opposite way round: they can be seen in mirrors, but are invisible when looked at directly. Zombies are visible by any means.
+</p>
+<p>
+You are also told the total number of each type of monster in the grid. Also around the edge of the grid are written numbers, which indicate how many monsters can be seen if you look into the grid along a row or column starting from that position. (The diagonal mirrors are reflective on both sides. If your reflected line of sight crosses the same monster more than once, the number will count it each time it is visible, not just once.)
+</p>
+<p>
+This puzzle type was invented by David Millar, under the name &#8216;Haunted Mirror Maze&#8217;. See <a href="#p0">[20]</a> for more details.
+</p>
+<p>
+Undead was contributed to this collection by Steffen Bauer.
+</p>
+<p><a name="p0"></a>
+[20] <a href="http://www.janko.at/Raetsel/Spukschloss/index.htm"><code>http://www.janko.at/Raetsel/Spukschloss/index.htm</code></a>
+</p>
+<h2><a name="S37.1"></a>37.1 <a name="i1"></a>Undead controls</h2>
+<p>
+Undead has a similar control system to Solo, Unequal and Keen.
+</p>
+<p>
+To play Undead, click the mouse in any empty square and then type a letter on the keyboard indicating the type of monster: &#8216;G&#8217; for a ghost, &#8216;V&#8217; for a vampire, or &#8216;Z&#8217; for a zombie. If you make a mistake, click the mouse in the incorrect square and press Space to clear it again (or use the Undo feature).
+</p>
+<p>
+If you <em>right</em>-click in a square and then type a letter, the corresponding monster will be shown in reduced size in that square, as a &#8216;pencil mark&#8217;. You can have pencil marks for multiple monsters in the same square. A square containing a full-size monster cannot also contain pencil marks.
+</p>
+<p>
+The game pays no attention to pencil marks, so exactly what you use them for is up to you: you can use them as reminders that a particular square needs to be re-examined once you know more about a particular monster, or you can use them as lists of the possible monster in a given square, or anything else you feel like.
+</p>
+<p>
+To erase a single pencil mark, right-click in the square and type the same letter again.
+</p>
+<p>
+All pencil marks in a square are erased when you left-click and type a monster letter, or when you left-click and press Space. Right-clicking and pressing space will also erase pencil marks.
+</p>
+<p>
+As for Solo, the cursor keys can be used in conjunction with the letter keys to place monsters or pencil marks. Use the cursor keys to move a highlight around the grid, and type a monster letter to enter it in the highlighted square. Pressing return toggles the highlight into a mode in which you can enter or remove pencil marks.
+</p>
+<p>
+If you prefer plain letters of the alphabet to cute monster pictures, you can press &#8216;A&#8217; to toggle between showing the monsters as monsters or showing them as letters.
+</p>
+<p>
+Left-clicking a clue will mark it as done (grey it out), or unmark it if it is already marked.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S37.2"></a>37.2 <a name="i2"></a>Undead parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares.
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/unequal.R b/apps/plugins/puzzles/src/unequal.R
index a061582768..a061582768 100644
--- a/apps/plugins/puzzles/unequal.R
+++ b/apps/plugins/puzzles/src/unequal.R
diff --git a/apps/plugins/puzzles/unequal.c b/apps/plugins/puzzles/src/unequal.c
index 1293de28e8..a63b7d8ed0 100644
--- a/apps/plugins/puzzles/unequal.c
+++ b/apps/plugins/puzzles/src/unequal.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1993,7 +1993,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Unequal", "games.unequal", "unequal",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/unequal.html b/apps/plugins/puzzles/src/unequal.html
new file mode 100644
index 0000000000..8337695c17
--- /dev/null
+++ b/apps/plugins/puzzles/src/unequal.html
@@ -0,0 +1,103 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Unequal</title>
+<link rel="previous" href="bridges.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="galaxies.html">
+</head>
+<body>
+<p><a href="bridges.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="galaxies.html">Next</a></p>
+<h1><a name="C27"></a>Chapter 27: <a name="i0"></a>Unequal</h1>
+<p>
+You have a square grid; each square may contain a digit from 1 to the size of the grid, and some squares have clue signs between them. Your aim is to fully populate the grid with numbers such that:
+</p>
+<ul><li>
+Each row contains only one occurrence of each digit
+</li>
+<li>
+Each column contains only one occurrence of each digit
+</li>
+<li>
+All the clue signs are satisfied.
+</li>
+</ul>
+<p>
+There are two modes for this game, &#8216;Unequal&#8217; and &#8216;Adjacent&#8217;.
+</p>
+<p>
+In &#8216;Unequal&#8217; mode, the clue signs are greater-than symbols indicating one square's value is greater than its neighbour's. In this mode not all clues may be visible, particularly at higher difficulty levels.
+</p>
+<p>
+In &#8216;Adjacent&#8217; mode, the clue signs are bars indicating one square's value is numerically adjacent (i.e. one higher or one lower) than its neighbour. In this mode all clues are always visible: absence of a bar thus means that a square's value is definitely not numerically adjacent to that neighbour's.
+</p>
+<p>
+In &#8216;Trivial&#8217; difficulty level (available via the &#8216;Custom&#8217; game type selector), there are no greater-than signs in &#8216;Unequal&#8217; mode; the puzzle is to solve the <a name="i1"></a>Latin square only.
+</p>
+<p>
+At the time of writing, the &#8216;Unequal&#8217; mode of this puzzle is appearing in the Guardian weekly under the name &#8216;<a name="i2"></a>Futoshiki&#8217;.
+</p>
+<p>
+Unequal was contributed to this collection by James Harvey.
+</p>
+<h2><a name="S27.1"></a>27.1 <a name="i3"></a>Unequal controls</h2>
+<p>
+Unequal shares much of its control system with Solo.
+</p>
+<p>
+To play Unequal, simply click the mouse in any empty square and then type a digit or letter on the keyboard to fill that square. If you make a mistake, click the mouse in the incorrect square and press Space to clear it again (or use the Undo feature).
+</p>
+<p>
+If you <em>right</em>-click in a square and then type a number, that number will be entered in the square as a &#8216;pencil mark&#8217;. You can have pencil marks for multiple numbers in the same square. Squares containing filled-in numbers cannot also contain pencil marks.
+</p>
+<p>
+The game pays no attention to pencil marks, so exactly what you use them for is up to you: you can use them as reminders that a particular square needs to be re-examined once you know more about a particular number, or you can use them as lists of the possible numbers in a given square, or anything else you feel like.
+</p>
+<p>
+To erase a single pencil mark, right-click in the square and type the same number again.
+</p>
+<p>
+All pencil marks in a square are erased when you left-click and type a number, or when you left-click and press space. Right-clicking and pressing space will also erase pencil marks.
+</p>
+<p>
+As for Solo, the cursor keys can be used in conjunction with the digit keys to set numbers or pencil marks. You can also use the &#8216;M&#8217; key to auto-fill every numeric hint, ready for removal as required, or the &#8216;H&#8217; key to do the same but also to remove all obvious hints.
+</p>
+<p>
+Alternatively, use the cursor keys to move the mark around the grid. Pressing the return key toggles the mark (from a normal mark to a pencil mark), and typing a number in is entered in the square in the appropriate way; typing in a 0 or using the space bar will clear a filled square.
+</p>
+<p>
+Left-clicking a clue will mark it as done (grey it out), or unmark it if it is already marked. Holding Control or Shift and pressing an arrow key likewise marks any clue adjacent to the cursor in the given direction.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S27.2"></a>27.2 <a name="i4"></a>Unequal parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Mode</em>
+</dt>
+<dd>
+Mode of the puzzle (&#8216;Unequal&#8217; or &#8216;Adjacent&#8217;)
+</dd>
+<dt>
+<em>Size (s*s)</em>
+</dt>
+<dd>
+Size of grid.
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle. At Trivial level, there are no greater-than signs; the puzzle is to solve the Latin square only. At Recursive level (only available via the &#8216;Custom&#8217; game type selector) backtracking will be required, but the solution should still be unique. The levels in between require increasingly complex reasoning to avoid having to backtrack.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/unfinished/README b/apps/plugins/puzzles/src/unfinished/README
index 0f8bb41d7c..0f8bb41d7c 100644
--- a/apps/plugins/puzzles/unfinished/README
+++ b/apps/plugins/puzzles/src/unfinished/README
diff --git a/apps/plugins/puzzles/unfinished/group.R b/apps/plugins/puzzles/src/unfinished/group.R
index a11d22e9b9..a11d22e9b9 100644
--- a/apps/plugins/puzzles/unfinished/group.R
+++ b/apps/plugins/puzzles/src/unfinished/group.R
diff --git a/apps/plugins/puzzles/unfinished/group.c b/apps/plugins/puzzles/src/unfinished/group.c
index bec826e367..4a4ad6ce53 100644
--- a/apps/plugins/puzzles/unfinished/group.c
+++ b/apps/plugins/puzzles/src/unfinished/group.c
@@ -2067,7 +2067,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Group", NULL, NULL,
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/unfinished/group.gap b/apps/plugins/puzzles/src/unfinished/group.gap
index 280adf4664..280adf4664 100644
--- a/apps/plugins/puzzles/unfinished/group.gap
+++ b/apps/plugins/puzzles/src/unfinished/group.gap
diff --git a/apps/plugins/puzzles/unfinished/numgame.c b/apps/plugins/puzzles/src/unfinished/numgame.c
index aed5c17347..aed5c17347 100644
--- a/apps/plugins/puzzles/unfinished/numgame.c
+++ b/apps/plugins/puzzles/src/unfinished/numgame.c
diff --git a/apps/plugins/puzzles/unfinished/path.c b/apps/plugins/puzzles/src/unfinished/path.c
index 61d6c61c6a..61d6c61c6a 100644
--- a/apps/plugins/puzzles/unfinished/path.c
+++ b/apps/plugins/puzzles/src/unfinished/path.c
diff --git a/apps/plugins/puzzles/unfinished/separate.R b/apps/plugins/puzzles/src/unfinished/separate.R
index f861c8f4fe..f861c8f4fe 100644
--- a/apps/plugins/puzzles/unfinished/separate.R
+++ b/apps/plugins/puzzles/src/unfinished/separate.R
diff --git a/apps/plugins/puzzles/unfinished/separate.c b/apps/plugins/puzzles/src/unfinished/separate.c
index 898304a0e6..a7b4fc96e1 100644
--- a/apps/plugins/puzzles/unfinished/separate.c
+++ b/apps/plugins/puzzles/src/unfinished/separate.c
@@ -823,7 +823,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Separate", NULL, NULL,
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/unfinished/slide.R b/apps/plugins/puzzles/src/unfinished/slide.R
index 189ed652d1..189ed652d1 100644
--- a/apps/plugins/puzzles/unfinished/slide.R
+++ b/apps/plugins/puzzles/src/unfinished/slide.R
diff --git a/apps/plugins/puzzles/unfinished/slide.c b/apps/plugins/puzzles/src/unfinished/slide.c
index b1aa04bc90..9d4fce1461 100644
--- a/apps/plugins/puzzles/unfinished/slide.c
+++ b/apps/plugins/puzzles/src/unfinished/slide.c
@@ -2320,7 +2320,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Slide", NULL, NULL,
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/unfinished/sokoban.R b/apps/plugins/puzzles/src/unfinished/sokoban.R
index 3b6dab56ba..3b6dab56ba 100644
--- a/apps/plugins/puzzles/unfinished/sokoban.R
+++ b/apps/plugins/puzzles/src/unfinished/sokoban.R
diff --git a/apps/plugins/puzzles/unfinished/sokoban.c b/apps/plugins/puzzles/src/unfinished/sokoban.c
index b5533c9034..2f0af35bc2 100644
--- a/apps/plugins/puzzles/unfinished/sokoban.c
+++ b/apps/plugins/puzzles/src/unfinished/sokoban.c
@@ -1443,7 +1443,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Sokoban", NULL, NULL,
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/unruly.R b/apps/plugins/puzzles/src/unruly.R
index 064ccc35ba..064ccc35ba 100644
--- a/apps/plugins/puzzles/unruly.R
+++ b/apps/plugins/puzzles/src/unruly.R
diff --git a/apps/plugins/puzzles/unruly.c b/apps/plugins/puzzles/src/unruly.c
index aea4cdf789..f418efa776 100644
--- a/apps/plugins/puzzles/unruly.c
+++ b/apps/plugins/puzzles/src/unruly.c
@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1912,7 +1912,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Unruly", "games.unruly", "unruly",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/unruly.html b/apps/plugins/puzzles/src/unruly.html
new file mode 100644
index 0000000000..92d19ad50a
--- /dev/null
+++ b/apps/plugins/puzzles/src/unruly.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Unruly</title>
+<link rel="previous" href="undead.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="flood.html">
+</head>
+<body>
+<p><a href="undead.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="flood.html">Next</a></p>
+<h1><a name="C38"></a>Chapter 38: <a name="i0"></a>Unruly</h1>
+<p>
+You are given a grid of squares, which you must colour either black or white. Some squares are provided as clues; the rest are left for you to fill in. Each row and column must contain the same number of black and white squares, and no row or column may contain three consecutive squares of the same colour.
+</p>
+<p>
+This puzzle type was invented by Adolfo Zanellati, under the name &#8216;Tohu wa Vohu&#8217;. See <a href="#p0">[21]</a> for more details.
+</p>
+<p>
+Unruly was contributed to this collection by Lennard Sprong.
+</p>
+<p><a name="p0"></a>
+[21] <a href="http://www.janko.at/Raetsel/Tohu-Wa-Vohu/index.htm"><code>http://www.janko.at/Raetsel/Tohu-Wa-Vohu/index.htm</code></a>
+</p>
+<h2><a name="S38.1"></a>38.1 <a name="i1"></a>Unruly controls</h2>
+<p>
+To play Unruly, click the mouse in a square to change its colour. Left-clicking an empty square will turn it black, and right-clicking will turn it white. Keep clicking the same button to cycle through the three possible states for the square. If you middle-click in a square it will be reset to empty.
+</p>
+<p>
+You can also use the cursor keys to move around the grid. Pressing the return or space keys will turn an empty square black or white respectively (and then cycle the colours in the same way as the mouse buttons), and pressing Backspace will reset a square to empty.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S38.2"></a>38.2 <a name="i2"></a>Unruly parameters</h2>
+<p>
+These parameters are available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu.
+</p>
+<dl><dt>
+<em>Width</em>, <em>Height</em>
+</dt>
+<dd>
+Size of grid in squares. (Note that the rules of the game require both the width and height to be even numbers.)
+</dd>
+<dt>
+<em>Difficulty</em>
+</dt>
+<dd>
+Controls the difficulty of the generated puzzle.
+</dd>
+<dt>
+<em>Unique rows and columns</em>
+</dt>
+<dd>
+If enabled, no two rows are permitted to have exactly the same pattern, and likewise columns. (A row and a column can match, though.)
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/untangle.R b/apps/plugins/puzzles/src/untangle.R
index a57f1e56fd..a57f1e56fd 100644
--- a/apps/plugins/puzzles/untangle.R
+++ b/apps/plugins/puzzles/src/untangle.R
diff --git a/apps/plugins/puzzles/untangle.c b/apps/plugins/puzzles/src/untangle.c
index d46afcbe66..47e839e875 100644
--- a/apps/plugins/puzzles/untangle.c
+++ b/apps/plugins/puzzles/src/untangle.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <math.h>
 
@@ -1601,7 +1601,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 const struct game thegame = {
     "Untangle", "games.untangle", "untangle",
     default_params,
-    game_fetch_preset,
+    game_fetch_preset, NULL,
     decode_params,
     encode_params,
     free_params,
diff --git a/apps/plugins/puzzles/src/untangle.html b/apps/plugins/puzzles/src/untangle.html
new file mode 100644
index 0000000000..340c0095cf
--- /dev/null
+++ b/apps/plugins/puzzles/src/untangle.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=US-ASCII">
+<title>Untangle</title>
+<link rel="previous" href="dominosa.html">
+<link rel="ToC" href="index.html">
+<link rel="up" href="index.html">
+<link rel="index" href="docindex.html">
+<link rel="next" href="blackbox.html">
+</head>
+<body>
+<p><a href="dominosa.html">Previous</a> | <a href="index.html">Contents</a> | <a href="docindex.html">Index</a> | <a href="blackbox.html">Next</a></p>
+<h1><a name="C18"></a>Chapter 18: <a name="i0"></a>Untangle</h1>
+<p>
+You are given a number of points, some of which have lines drawn between them. You can move the points about arbitrarily; your aim is to position the points so that no line crosses another.
+</p>
+<p>
+I originally saw this in the form of a Flash game called <a name="i1"></a>Planarity <a href="#p0">[7]</a>, written by John Tantalo.
+</p>
+<p><a name="p0"></a>
+[7] <a href="http://planarity.net"><code>http://planarity.net</code></a>
+</p>
+<h2><a name="S18.1"></a>18.1 <a name="i2"></a>Untangle controls</h2>
+<p>
+To move a point, click on it with the left mouse button and drag it into a new position.
+</p>
+<p>
+(All the actions described in <a href="common.html#S2.1">section 2.1</a> are also available.)
+</p>
+<h2><a name="S18.2"></a>18.2 <a name="i3"></a>Untangle parameters</h2>
+<p>
+There is only one parameter available from the &#8216;Custom...&#8217; option on the &#8216;Type&#8217; menu:
+</p>
+<dl><dt>
+<em>Number of points</em>
+</dt>
+<dd>
+Controls the size of the puzzle, by specifying the number of points in the generated graph.
+</dd>
+</dl>
+
+<hr><address></address></body>
+</html>
diff --git a/apps/plugins/puzzles/version.c b/apps/plugins/puzzles/src/version.c
index 1cef29feb7..1cef29feb7 100644
--- a/apps/plugins/puzzles/version.c
+++ b/apps/plugins/puzzles/src/version.c
diff --git a/apps/plugins/puzzles/version.h b/apps/plugins/puzzles/src/version.h
index 997e00592b..997e00592b 100644
--- a/apps/plugins/puzzles/version.h
+++ b/apps/plugins/puzzles/src/version.h
diff --git a/apps/plugins/puzzles/wceinf.pl b/apps/plugins/puzzles/src/wceinf.pl
index 4756f3c2b8..4756f3c2b8 100644
--- a/apps/plugins/puzzles/wceinf.pl
+++ b/apps/plugins/puzzles/src/wceinf.pl
diff --git a/apps/plugins/puzzles/webpage.pl b/apps/plugins/puzzles/src/webpage.pl
index 3a0779ef0a..3a0779ef0a 100755
--- a/apps/plugins/puzzles/webpage.pl
+++ b/apps/plugins/puzzles/src/webpage.pl
diff --git a/apps/plugins/puzzles/website.url b/apps/plugins/puzzles/src/website.url
index 2ab37f6faf..2ab37f6faf 100644
--- a/apps/plugins/puzzles/website.url
+++ b/apps/plugins/puzzles/src/website.url
diff --git a/apps/plugins/puzzles/windows.c b/apps/plugins/puzzles/src/windows.c
index 492e37ceac..d4b30386a6 100644
--- a/apps/plugins/puzzles/windows.c
+++ b/apps/plugins/puzzles/src/windows.c
@@ -14,7 +14,7 @@
 #endif
 
 #include <stdio.h>
-#include "rbassert.h"
+#include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -195,6 +195,11 @@ struct blitter {
 
 enum { CFG_PRINT = CFG_FRONTEND_SPECIFIC };
 
+struct preset_menuitemref {
+    HMENU which_menu;
+    int item_index;
+};
+
 struct frontend {
     const game *game;
     midend *me;
@@ -213,8 +218,9 @@ struct frontend {
     HMENU gamemenu, typemenu;
     UINT timer;
     DWORD timer_last_tickcount;
-    int npresets;
-    game_params **presets;
+    struct preset_menu *preset_menu;
+    struct preset_menuitemref *preset_menuitems;
+    int n_preset_menuitems;
     struct font *fonts;
     int nfonts, fontsize;
     config_item *cfg;
@@ -244,7 +250,6 @@ void frontend_free(frontend *fe)
     sfree(fe->colours);
     sfree(fe->brushes);
     sfree(fe->pens);
-    sfree(fe->presets);
     sfree(fe->fonts);
 
     sfree(fe);
@@ -1530,12 +1535,12 @@ static frontend *frontend_new(HINSTANCE inst)
                               NULL, NULL, inst, NULL);
     if (!fe->hwnd) {
         DWORD lerr = GetLastError();
-        printf("no window: 0x%x\n", lerr);
+        printf("no window: 0x%x\n", (unsigned)lerr);
     }
 #endif
 
     fe->gamemenu = NULL;
-    fe->presets = NULL;
+    fe->preset_menu = NULL;
 
     fe->statusbar = NULL;
     fe->bitmap = NULL;
@@ -1658,6 +1663,46 @@ static midend *midend_for_new_game(frontend *fe, const game *cgame,
     return me;
 }
 
+static void populate_preset_menu(frontend *fe,
+                                 struct preset_menu *menu, HMENU winmenu)
+{
+    int i;
+    for (i = 0; i < menu->n_entries; i++) {
+        struct preset_menu_entry *entry = &menu->entries[i];
+        UINT_PTR id_or_sub;
+        UINT flags = MF_ENABLED;
+
+        if (entry->params) {
+            id_or_sub = (UINT_PTR)(IDM_PRESETS + 0x10 * entry->id);
+
+            fe->preset_menuitems[entry->id].which_menu = winmenu;
+            fe->preset_menuitems[entry->id].item_index =
+                GetMenuItemCount(winmenu);
+        } else {
+            HMENU winsubmenu = CreateMenu();
+            id_or_sub = (UINT_PTR)winsubmenu;
+            flags |= MF_POPUP;
+
+            populate_preset_menu(fe, entry->submenu, winsubmenu);
+        }
+
+        /*
+         * FIXME: we ought to go through and do something with ampersands
+         * here.
+         */
+
+#ifndef _WIN32_WCE
+        AppendMenu(winmenu, flags, id_or_sub, entry->title);
+#else
+        {
+            TCHAR wName[255];
+            MultiByteToWideChar(CP_ACP, 0, entry->title, -1, wName, 255);
+            AppendMenu(winmenu, flags, id_or_sub, wName);
+        }
+#endif
+    }
+}
+
 /*
  * Populate a frontend structure with a new midend structure, and
  * create any window furniture that it needs.
@@ -1799,11 +1844,16 @@ static int fe_set_midend(frontend *fe, midend *me)
         AppendMenu(menu, MF_ENABLED, IDM_SEED, TEXT("Rando&m Seed..."));
 #endif
 
-        if (fe->presets)
-            sfree(fe->presets);
-        if ((fe->npresets = midend_num_presets(fe->me)) > 0 ||
-            fe->game->can_configure) {
-            int i;
+        if (!fe->preset_menu) {
+            int i;
+            fe->preset_menu = midend_get_presets(
+                fe->me, &fe->n_preset_menuitems);
+            fe->preset_menuitems = snewn(fe->n_preset_menuitems,
+                                         struct preset_menuitemref);
+            for (i = 0; i < fe->n_preset_menuitems; i++)
+                fe->preset_menuitems[i].which_menu = NULL;
+        }
+        if (fe->preset_menu->n_entries > 0 || fe->game->can_configure) {
 #ifndef _WIN32_WCE
             HMENU sub = CreateMenu();
 
@@ -1812,28 +1862,9 @@ static int fe_set_midend(frontend *fe, midend *me)
             HMENU sub = SHGetSubMenu(SHFindMenuBar(fe->hwnd), ID_TYPE);
             DeleteMenu(sub, 0, MF_BYPOSITION);
 #endif
-            fe->presets = snewn(fe->npresets, game_params *);
-
-            for (i = 0; i < fe->npresets; i++) {
-                char *name;
-#ifdef _WIN32_WCE
-                TCHAR wName[255];
-#endif
-
-                midend_fetch_preset(fe->me, i, &name, &fe->presets[i]);
 
-                /*
-                 * FIXME: we ought to go through and do something
-                 * with ampersands here.
-                 */
+            populate_preset_menu(fe, fe->preset_menu, sub);
 
-#ifndef _WIN32_WCE
-                AppendMenu(sub, MF_ENABLED, IDM_PRESETS + 0x10 * i, name);
-#else
-                MultiByteToWideChar (CP_ACP, 0, name, -1, wName, 255);
-                AppendMenu(sub, MF_ENABLED, IDM_PRESETS + 0x10 * i, wName);
-#endif
-            }
             if (fe->game->can_configure) {
                 AppendMenu(sub, MF_ENABLED, IDM_CONFIG, TEXT("&Custom..."));
             }
@@ -1841,7 +1872,6 @@ static int fe_set_midend(frontend *fe, midend *me)
             fe->typemenu = sub;
         } else {
             fe->typemenu = INVALID_HANDLE_VALUE;
-            fe->presets = NULL;
         }
 
 #ifdef COMBINED
@@ -2893,14 +2923,22 @@ static void update_type_menu_tick(frontend *fe)
     if (fe->typemenu == INVALID_HANDLE_VALUE)
         return;
 
-    total = GetMenuItemCount(fe->typemenu);
     n = midend_which_preset(fe->me);
-    if (n < 0)
-        n = total - 1;                 /* "Custom" item */
 
-    for (i = 0; i < total; i++) {
-        int flag = (i == n ? MF_CHECKED : MF_UNCHECKED);
-        CheckMenuItem(fe->typemenu, i, MF_BYPOSITION | flag);
+    for (i = 0; i < fe->n_preset_menuitems; i++) {
+        if (fe->preset_menuitems[i].which_menu) {
+            int flag = (i == n ? MF_CHECKED : MF_UNCHECKED);
+            CheckMenuItem(fe->preset_menuitems[i].which_menu,
+                          fe->preset_menuitems[i].item_index,
+                          MF_BYPOSITION | flag);
+        }
+    }
+
+    if (fe->game->can_configure) {
+        int flag = (n < 0 ? MF_CHECKED : MF_UNCHECKED);
+        /* "Custom" menu item is at the bottom of the top-level Type menu */
+        total = GetMenuItemCount(fe->typemenu);
+        CheckMenuItem(fe->typemenu, total - 1, MF_BYPOSITION | flag);
     }
 
     DrawMenuBar(fe->hwnd);
@@ -3146,10 +3184,12 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             } else
 #endif
             {
-                int p = ((wParam &~ 0xF) - IDM_PRESETS) / 0x10;
+                game_params *preset = preset_menu_lookup_by_id(
+                    fe->preset_menu,
+                    ((wParam &~ 0xF) - IDM_PRESETS) / 0x10);
 
-                if (p >= 0 && p < fe->npresets) {
-                    midend_set_params(fe->me, fe->presets[p]);
+                if (preset) {
+                    midend_set_params(fe->me, preset);
                     new_game_type(fe);
                 }
             }
@@ -3653,7 +3693,7 @@ void split_into_argv(char *cmdline, int *argc, char ***argv,
 int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 {
     MSG msg;
-    char *error;
+    char *error = NULL;
     const game *gg;
     frontend *fe;
     midend *me;
diff --git a/apps/plugins/puzzles/winiss.pl b/apps/plugins/puzzles/src/winiss.pl
index eca02d3b15..eca02d3b15 100755
--- a/apps/plugins/puzzles/winiss.pl
+++ b/apps/plugins/puzzles/src/winiss.pl
diff --git a/apps/plugins/puzzles/winwix.mc b/apps/plugins/puzzles/src/winwix.mc
index 1a1e620b82..1a1e620b82 100644
--- a/apps/plugins/puzzles/winwix.mc
+++ b/apps/plugins/puzzles/src/winwix.mc