X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/81eef9aa2f4506e6bd0610e6b1b0ab3c6bb69467..08d7c4ba7266c626d28273750218446d3c693805:/Recipe

diff --git a/Recipe b/Recipe
index ebaba9e..9bdd30e 100644
--- a/Recipe
+++ b/Recipe
@@ -25,10 +25,13 @@ UNTANGLE = untangle tree234
 SLANT    = slant dsf
 MAP      = map dsf
 LOOPY    = loopy tree234 dsf
+LIGHTUP  = lightup combi
+TENTS    = tents maxflow
+BRIDGES  = bridges dsf
 
 ALL      = list NET NETSLIDE cube fifteen sixteen rect pattern solo twiddle
          + MINES samegame FLIP guess PEGS dominosa UNTANGLE blackbox SLANT
-         + lightup MAP LOOPY inertia
+         + LIGHTUP MAP LOOPY inertia TENTS BRIDGES
 
 GTK      = gtk printing ps
 
@@ -50,21 +53,31 @@ dominosa : [X] GTK COMMON dominosa
 untangle : [X] GTK COMMON UNTANGLE
 blackbox : [X] GTK COMMON blackbox
 slant    : [X] GTK COMMON SLANT
-lightup  : [X] GTK COMMON lightup
+lightup  : [X] GTK COMMON LIGHTUP
 map      : [X] GTK COMMON MAP
 loopy    : [X] GTK COMMON LOOPY
 inertia  : [X] GTK COMMON inertia
+tents    : [X] GTK COMMON TENTS
+bridges  : [X] GTK COMMON BRIDGES
 
 # Auxiliary command-line programs.
-solosolver :    [U] solo[STANDALONE_SOLVER] malloc
-patternsolver : [U] pattern[STANDALONE_SOLVER] malloc
-mineobfusc :    [U] mines[STANDALONE_OBFUSCATOR] malloc random tree234 misc
-slantsolver :   [U] slant[STANDALONE_SOLVER] dsf malloc
+STANDALONE = nullfe random misc malloc
 
-solosolver :    [C] solo[STANDALONE_SOLVER] malloc
-patternsolver : [C] pattern[STANDALONE_SOLVER] malloc
-mineobfusc :    [C] mines[STANDALONE_OBFUSCATOR] malloc random tree234 misc
-slantsolver :   [C] slant[STANDALONE_SOLVER] dsf malloc
+solosolver :    [U] solo[STANDALONE_SOLVER] STANDALONE
+patternsolver : [U] pattern[STANDALONE_SOLVER] STANDALONE
+mineobfusc :    [U] mines[STANDALONE_OBFUSCATOR] tree234 STANDALONE
+slantsolver :   [U] slant[STANDALONE_SOLVER] dsf STANDALONE
+mapsolver :     [U] map[STANDALONE_SOLVER] dsf STANDALONE m.lib
+lightupsolver : [U] lightup[STANDALONE_SOLVER] combi STANDALONE
+tentssolver :   [U] tents[STANDALONE_SOLVER] maxflow STANDALONE
+
+solosolver :    [C] solo[STANDALONE_SOLVER] STANDALONE
+patternsolver : [C] pattern[STANDALONE_SOLVER] STANDALONE
+mineobfusc :    [C] mines[STANDALONE_OBFUSCATOR] tree234 STANDALONE
+slantsolver :   [C] slant[STANDALONE_SOLVER] dsf STANDALONE
+mapsolver :     [C] map[STANDALONE_SOLVER] dsf STANDALONE
+lightupsolver : [C] lightup[STANDALONE_SOLVER] combi STANDALONE
+tentssolver :   [C] tents[STANDALONE_SOLVER] maxflow STANDALONE
 
 # The Windows Net shouldn't be called `net.exe' since Windows
 # already has a reasonably important utility program by that name!
@@ -86,10 +99,12 @@ dominosa : [G] WINDOWS COMMON dominosa
 untangle : [G] WINDOWS COMMON UNTANGLE
 blackbox : [G] WINDOWS COMMON blackbox
 slant    : [G] WINDOWS COMMON SLANT
-lightup  : [G] WINDOWS COMMON lightup
+lightup  : [G] WINDOWS COMMON LIGHTUP
 map      : [G] WINDOWS COMMON MAP
 loopy    : [G] WINDOWS COMMON LOOPY
 inertia  : [G] WINDOWS COMMON inertia
+tents    : [G] WINDOWS COMMON TENTS
+bridges  : [G] WINDOWS COMMON BRIDGES
 
 # Mac OS X unified application containing all the puzzles.
 Puzzles  : [MX] osx osx.icns osx-info.plist COMMON ALL
@@ -182,7 +197,8 @@ install:
 	for i in cube net netslide fifteen sixteen twiddle \
 	         pattern rect solo mines samegame flip guess \
 		 pegs dominosa untangle blackbox slant lightup \
-		 map loopy inertia; do \
-		$(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i; \
+		 map loopy inertia tents bridges; do \
+		$(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i \
+		|| exit 1; \
 	done
 !end