From 4d2e0ba32c86926227ada0f4a9dcebbd6ef8ff7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= Date: Thu, 27 Aug 2020 10:11:13 +0200 Subject: [PATCH] chore: fix make parallelism --- CHANGELOG | 2 +- GNUmakefile.template | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d45da6a..433698f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,7 +14,7 @@ - Added support for BDXL-QL (quadruple layer, 128GB) - Added support to compile a CLI-only version, without the GTK dependency (only glib2), compile with: - $ CLI_ONLY=1 ./configure && make clean all + $ CLI_ONLY=1 ./configure && make clean && make -j4 - Added support to compile a Windows version under MingW (tested with MSYS2) - All regression tests are passing on Linux 64, Win 32 and Win 64. diff --git a/GNUmakefile.template b/GNUmakefile.template index ef8eaf9..6f280db 100644 --- a/GNUmakefile.template +++ b/GNUmakefile.template @@ -67,13 +67,13 @@ OFILES = $(CFG_OFILES) # Compilation related ###################################################################### -.PHONY : all help show locale time-stamp +.PHONY : all help show locale build.h ${BUILDTMP}/%.o : %.c @echo "Compiling:" $? @$(CC) $(COPTS) -c $? -o $@ -all: time-stamp dvdisaster +all: dvdisaster ${BUILDTMP}/build.o : build.c build.h @echo "Compiling:" build.o @@ -81,10 +81,11 @@ ${BUILDTMP}/build.o : build.c build.h # Building the dvdisaster binary -time-stamp: +build.h: + @echo "Updating:" build.h @$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/build.h -dvdisaster: $(ICONS) $(OFILES) +dvdisaster: $(ICONS) $(OFILES) build.h @echo "Linking : dvdisaster" @if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \ then windres -v winres.rc -O coff -o winres.o >/dev/null ; \ @@ -324,7 +325,7 @@ clean: @$(MAKE) --no-print-directory -C $(SRCDIR)/locale clean; BUILD=`grep BUILD $(SRCDIR)/build.h | cut -d ' ' -f 3` -arch: archclean time-stamp +arch: archclean build.h @cd .. ; tar -c -z -f $(TAR_PREFIX)/$(PKGNAME)-$(BUILD).tgz $(PKGNAME) INSTALL: documentation/install.template