xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix make parallelism

Browse Source
This commit is contained in:
Stéphane Lesimple
2020-08-27 10:11:13 +02:00
parent 495a851356
commit 4d2e0ba32c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@@ -14,7 +14,7 @@
- Added support for BDXL-QL (quadruple layer, 128GB) - Added support for BDXL-QL (quadruple layer, 128GB)
- Added support to compile a CLI-only version, without - Added support to compile a CLI-only version, without
the GTK dependency (only glib2), compile with: 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 - Added support to compile a Windows version under MingW (tested
with MSYS2) with MSYS2)
- All regression tests are passing on Linux 64, Win 32 and Win 64. - All regression tests are passing on Linux 64, Win 32 and Win 64.

11
GNUmakefile.template
View File

@@ -67,13 +67,13 @@ OFILES = $(CFG_OFILES)
# Compilation related # Compilation related
###################################################################### ######################################################################
.PHONY : all help show locale time-stamp .PHONY : all help show locale build.h
${BUILDTMP}/%.o : %.c ${BUILDTMP}/%.o : %.c
@echo "Compiling:" $? @echo "Compiling:" $?
@$(CC) $(COPTS) -c $? -o $@ @$(CC) $(COPTS) -c $? -o $@
all: time-stamp dvdisaster all: dvdisaster
${BUILDTMP}/build.o : build.c build.h ${BUILDTMP}/build.o : build.c build.h
@echo "Compiling:" build.o @echo "Compiling:" build.o
@@ -81,10 +81,11 @@ ${BUILDTMP}/build.o : build.c build.h
# Building the dvdisaster binary # Building the dvdisaster binary
time-stamp: build.h:
@echo "Updating:" build.h
@$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/build.h @$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/build.h
dvdisaster: $(ICONS) $(OFILES) dvdisaster: $(ICONS) $(OFILES) build.h
@echo "Linking : dvdisaster" @echo "Linking : dvdisaster"
@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \ @if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
then windres -v winres.rc -O coff -o winres.o >/dev/null ; \ 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; @$(MAKE) --no-print-directory -C $(SRCDIR)/locale clean;
BUILD=`grep BUILD $(SRCDIR)/build.h | cut -d ' ' -f 3` 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) @cd .. ; tar -c -z -f $(TAR_PREFIX)/$(PKGNAME)-$(BUILD).tgz $(PKGNAME)
INSTALL: documentation/install.template INSTALL: documentation/install.template