From: Ben Gras <ben@minix3.org>
Date: Fri, 21 Oct 2005 18:31:45 +0000 (+0000)
Subject: call libraries with $(GMAKE)
X-Git-Tag: v3.1.2a~555
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=40066b06f503d638c852ec4c4afd4fa02fabbff1;p=minix.git

call libraries with $(GMAKE)
---

diff --git a/Makefile b/Makefile
index 2b786e190..ef5c5705a 100755
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,28 @@
 # Master Makefile to compile everything in /usr/src except the system.
 
 MAKE	= exec make -$(MAKEFLAGS)
+GMAKE	= gmake
 
 usage:
-	@echo "" >&2
-	@echo "Master Makefile for MINIX commands and utilities." >&2
-	@echo "Root privileges are required for some actions." >&2
-	@echo "" >&2
-	@echo "Usage:" >&2
-	@echo "	make world      # Compile everything (libraries & commands)" >&2
-	@echo "	make includes   # Install include files from src/" >&2
-	@echo "	make libraries  # Compile and install libraries" >&2
-	@echo "	make cmds       # Compile all, commands, but don't install" >&2
-	@echo "	make install    # Compile and install commands" >&2
-	@echo "	make depend     # Generate required .depend files" >&2
-	@echo "	make clean      # Remove all compiler results" >&2
-	@echo "" >&2
-	@echo "Run 'make' in tools/ to create a new MINIX configuration." >&2; exit 0
-	@echo "" >&2
+	@echo "" 
+	@echo "Master Makefile for MINIX commands and utilities." 
+	@echo "Root privileges are required for some actions." 
+	@echo "" 
+	@echo "Usage:" 
+	@echo "	make world      # Compile everything (libraries & commands)" 
+	@echo "	make includes   # Install include files from src/" 
+	@echo "	make libraries  # Compile and install libraries" 
+	@echo "	make cmds       # Compile all, commands, but don't install" 
+	@echo "	make install    # Compile and install commands" 
+	@echo "	make depend     # Generate required .depend files" 
+	@echo "	make clean      # Remove all compiler results" 
+	@echo "" 
+	@echo "Run 'make' in tools/ to create a new MINIX configuration." 
+	@echo "" 
+	@echo "Rebuilding the libraries uses gmake and gcc too, which takes" 
+	@echo "a lot of memory currently. See src/lib/ackonly/README for" 
+	@echo "more information." 
+	@echo "" 
 
 # world has to be able to make a new system, even if there
 # is no complete old system. it has to install commands, for which
@@ -30,10 +35,10 @@ usage:
 world: includes depend libraries cmds install postinstall
 
 includes:
-	cd include && $(MAKE) install
+	cd include && $(MAKE) install gcc
 
 libraries:
-	cd lib && $(MAKE) install
+	cd lib && $(GMAKE) install
 
 cmds:
 	if [ -f commands/Makefile ] ; then cd commands && $(MAKE) all; fi
@@ -51,7 +56,7 @@ depend::
 
 
 clean::
-	cd lib && $(MAKE) $@
+	cd lib && $(GMAKE) $@
 	test ! -f commands/Makefile || { cd commands && $(MAKE) $@; }
 
 etcfiles::