Build and run monster in most Travis targets.

And remove the separate MONSTER=1 target.  The monster-specific parts
compile quickly enough that this should be a net win in Travis build
time.

Also, do not try running monster in Travis TILE=1 builds.

Author: neilmoore

.travis.yml

@@ -16,7 +16,6 @@ env:
     - USE_DGAMELAUNCH=1 WEBTILES=1 EXTERNAL_DEFINES=-UTOURNEY
     - TILES=1 BUILD_ALL=1
     - WEBTILES=1 BUILD_ALL=1
-    - MONSTER=1
 git:
     submodules: false
 install: perl .travis/deps.pl

.travis/build.pl

@@ -17,20 +17,18 @@
 $ENV{FORCE_CC} = $ENV{CC};
 $ENV{FORCE_CXX} = $ENV{CXX};
 
-if ($ENV{MONSTER}) {
-    try("make -j2 monster");
-    # pick something more exciting here possibly?
-    # or use a variety to touch all the code paths?
-    try("util/monster/monster Orb Guardian");
-}
-elsif ($ENV{FULLDEBUG}) {
-    try("make -j2 debug");
+if ($ENV{FULLDEBUG}) {
+    try("make -j2 debug monster");
 }
 else {
-    try("make -j2");
+    try("make -j2 all monster");
 }
 
 if (!$ENV{TILES}) {
+    # pick something more exciting here possibly?
+    # or use a variety to touch all the code paths?
+    try("util/monster/monster Orb Guardian");
+
     if ($ENV{FULLDEBUG}) {
         try("make test");
     }