From f630a8da3b55f3f5ae825b512346009f1ca7970a Mon Sep 17 00:00:00 2001 From: aristocratos Date: Mon, 14 Feb 2022 22:19:26 +0100 Subject: [PATCH] Makefile fixed fallback for outdated find --- Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ec5c9cd..7268fdc 100644 --- a/Makefile +++ b/Makefile @@ -139,16 +139,19 @@ SOURCE_COUNT := $(words $(SOURCES)) OBJECTS := $(patsubst $(SRCDIR)/%,$(BUILDDIR)/%,$(SOURCES:.$(SRCEXT)=.$(OBJEXT))) -ifneq ($(wildcard $(BUILDDIR)/.*),) - SKIPPED_SOURCES := $(foreach fname,$(SOURCES),$(shell find $(BUILDDIR) -type f -newer $(fname) -name *.o | grep "$(basename $(notdir $(fname))).o" 2>/dev/null)) - override SOURCE_COUNT := $(shell expr $(SOURCE_COUNT) - $(words $(SKIPPED_SOURCES))) - ifeq ($(SOURCE_COUNT),0) - override SOURCE_COUNT = $(words $(SOURCES)) +ifeq ($(shell find $(BUILDDIR) -type f -newermt "$(DATESTAMP)" -name *.o; echo $$?),0) + ifneq ($(wildcard $(BUILDDIR)/.*),) + SKIPPED_SOURCES := $(foreach fname,$(SOURCES),$(shell find $(BUILDDIR) -type f -newer $(fname) -name *.o | grep "$(basename $(notdir $(fname))).o" 2>/dev/null)) + override SOURCE_COUNT := $(shell expr $(SOURCE_COUNT) - $(words $(SKIPPED_SOURCES))) + ifeq ($(SOURCE_COUNT),0) + override SOURCE_COUNT = $(words $(SOURCES)) + endif endif + PROGRESS = expr $$(find $(BUILDDIR) -type f -newermt "$(DATESTAMP)" -name *.o | wc -l || echo 1) '*' 90 / $(SOURCE_COUNT) | cut -c1-2 +else + PROGRESS = expr $$(find $(BUILDDIR) -type f -name *.o | wc -l || echo 1) '*' 90 / $(SOURCE_COUNT) | cut -c1-2 endif -PROGRESS = expr $$(find $(BUILDDIR) -type f -newermt "$(DATESTAMP)" -name *.o | wc -l || echo 1) '*' 90 / $(SOURCE_COUNT) | cut -c1-2 - P := %% #? Default Make