2 Commits

Author SHA1 Message Date
Topkek-190 4522a53fe6 Merge 5ba3309448 into 65228e5c79 2021-10-01 17:39:44 +00:00
Linux User 5ba3309448 Let number of jobs be user-configurable
j16 is an awful lot of jobs and usually results in termination of the compiler.
The number of jobs used by make can be set using the command line argument -jN
to make, where N is the number of jobs
2021-10-01 13:15:25 +00:00
2 changed files with 10 additions and 12 deletions
+9 -11
View File
@@ -1,7 +1,5 @@
.NOTPARALLEL:
MAX_THREADS ?= 16
PROGRAM_NAME ?= bin/vlmcsd
CLIENT_NAME ?= bin/vlmcs
MULTI_NAME ?= bin/vlmcsdmulti
@@ -104,30 +102,30 @@ endif
.DEFAULT:
+@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build)
+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
+@$(MAKE) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
all:
+@(test -d bin || mkdir bin) & (test -d lib || mkdir lib) & (test -d build || mkdir build)
+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
+@$(MAKE) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
clean:
+@$(MAKE) -j$(MAX_THREADS) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
+@$(MAKE) -j$(MAX_THREADS) -C man $@
+@$(MAKE) -C src $@ FROM_PARENT=1 PROGRAM_NAME=$(PROGRAM_NAME) CLIENT_NAME=$(CLIENT_NAME) MULTI_NAME=$(MULTI_NAME) DLL_NAME=$(DLL_NAME) A_NAME=$(A_NAME)
+@$(MAKE) -C man $@
alldocs:
+@$(MAKE) -j$(MAX_THREADS) -C man $@
+@$(MAKE) -C man $@
dosdocs:
+@$(MAKE) -j$(MAX_THREADS) -C man $@
+@$(MAKE) -C man $@
unixdocs:
+@$(MAKE) -j$(MAX_THREADS) -C man $@
+@$(MAKE) -C man $@
htmldocs:
+@$(MAKE) -j$(MAX_THREADS) -C man $@
+@$(MAKE) -C man $@
pdfdocs:
+@$(MAKE) -j$(MAX_THREADS) -C man $@
+@$(MAKE) -C man $@
GNUmakefile:
+1 -1
View File
@@ -70,7 +70,7 @@ VERBOSE ?= NO
################################################################################
CC ?= gcc
TARGETPLATFORM := $(shell LANG=en_US.UTF-8 LANGUAGE=en_US $(CC) -v 2>&1 | grep '^Target: ' | cut -f 2 -d ' ')
TARGETPLATFORM := $(shell LANG=en_US.UTF-8 $(CC) -v 2>&1 | grep '^Target: ' | cut -f 2 -d ' ')
ifneq (,$(findstring darwin,$(TARGETPLATFORM)))
DARWIN := 1