Makefiles: $(MAKE) -> +$(MAKE)

This allows for recursive $(MAKE) calls to run with
the appropriate job count option (i.e. -j2).

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

2 files changed, 15 insertions, 20 deletions

diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile
index 8b40a64ea3..0f0ba0fd5e 100644
--- a/crawl-ref/source/makefile
+++ b/crawl-ref/source/makefile
@@ -16,48 +16,43 @@ MAKEFILE ?= makefile.unix
 #MAKEFILE ?= makefile.mgw_unix
 #MAKEFILE ?= makefile_tiles.mgw_unix
 
-# number of concurrent jobs -- good value is (#_of_CPUs * 2) + 1
-#     cuts build time a lot on multi-cpu machines
-# Note: do not use enable this for builds of the tiles version.
-#OTHER=-j2
-
 all:
-	$(MAKE) $(OTHER) -f $(MAKEFILE)
+	+$(MAKE) -f $(MAKEFILE)
 
 profile:
-	$(MAKE) $(OTHER) -f $(MAKEFILE) EXTRA_FLAGS='-pg'
+	+$(MAKE) -f $(MAKEFILE) EXTRA_FLAGS='-pg'
 
 noopt:
-	$(MAKE) $(OTHER) -f $(MAKEFILE)
+	+$(MAKE) -f $(MAKEFILE)
 
 install:
-	$(MAKE) $(OTHER) -f $(MAKEFILE) install
+	+$(MAKE) -f $(MAKEFILE) install
 
 clean:
-	$(MAKE) $(OTHER) -f $(MAKEFILE) clean
+	+$(MAKE) -f $(MAKEFILE) clean
 
 distclean:
-	$(MAKE) $(OTHER) -f $(MAKEFILE) distclean
+	+$(MAKE) -f $(MAKEFILE) distclean
 
 depend:
-	$(MAKE) $(OTHER) -f $(MAKEFILE) depend
+	+$(MAKE) -f $(MAKEFILE) depend
 
 # WIZARD mode currently includes asserts, bounds checking, item checking and
 # monster checking.
 wizard:
-	$(MAKE) $(OTHER) -f $(MAKEFILE) debug EXTRA_FLAGS='-g -DWIZARD -DDEBUG -DDEBUG_ITEM_SCAN -DDEBUG_MONS_SCAN'
+	+$(MAKE) -f $(MAKEFILE) debug EXTRA_FLAGS='-g -DWIZARD -DDEBUG -DDEBUG_ITEM_SCAN -DDEBUG_MONS_SCAN'
 
 # DEBUG mode includes WIZARD mode as well as copious debugging input
 debug:
-	$(MAKE) $(OTHER) -f $(MAKEFILE) DEBUG_CRAWL=y debug EXTRA_FLAGS='-g -DFULLDEBUG -DWIZARD'
+	+$(MAKE) -f $(MAKEFILE) DEBUG_CRAWL=y debug EXTRA_FLAGS='-g -DFULLDEBUG -DWIZARD'
 
 # [dshaligram] The individual makefile need not necessarily support
 # package-source; only makefile.unix does at the moment.
 package-source:
-	$(MAKE) -f $(MAKEFILE) package-source
+	+$(MAKE) -f $(MAKEFILE) package-source
 
 prebuildyacc:
-	$(MAKE) -f $(MAKEFILE) prebuildyacc
+	+$(MAKE) -f $(MAKEFILE) prebuildyacc
 
 # DO NOT DELETE THIS LINE -- $(MAKE) depend depends on it.
 
diff --git a/crawl-ref/source/makefile.unix b/crawl-ref/source/makefile.unix
index 9892a8a94a..f8fc9e30eb 100644
--- a/crawl-ref/source/makefile.unix
+++ b/crawl-ref/source/makefile.unix
@@ -243,10 +243,10 @@ clean:
 	$(DELETE) *.ixx
 
 clean-lua:
-	cd $(LUASRC) && $(MAKE) clean
+	+$(MAKE) -C $(LUASRC) clean
 
 clean-sql:
-	cd $(SQLSRC) && $(MAKE) clean
+	+$(MAKE) -C $(SQLSRC) clean
 
 distclean: clean clean-lua clean-sql
 	$(DELETE) bones.*
@@ -283,14 +283,14 @@ $(UTIL)%.o: $(UTIL)%.cc
 
 $(LUASRC)$(LUALIBA):
 	echo Building Lua...
-	cd $(LUASRC) && $(MAKE) crawl_unix
+	+$(MAKE) -C $(LUASRC) crawl_unix
 
 #############################################################################
 # Build SQLite
 
 $(FSQLLIBA):
 	echo Building SQLite
-	cd $(SQLSRC) && $(MAKE)
+	+$(MAKE) -C $(SQLSRC)
 
 #############################################################################
 # Build unrandart data