From 72c0097a737b21b1b14be8732db537d3098c8004 Mon Sep 17 00:00:00 2001 From: Kévin Le Gouguec Date: Tue, 9 Mar 2021 20:20:48 +0100 Subject: Tuck all folder shenanigans to the bottom of the Makefile --- Makefile | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 6fa182e..80fd7bd 100644 --- a/Makefile +++ b/Makefile @@ -25,23 +25,19 @@ all: site site: $(pages) $(members_pages) $(resources) $(images) $(stylesheets) -$(OUTDIR) $(images_folders) $(stylesheets_folders): - mkdir $@ - -.SECONDEXPANSION: -$(resources): $(OUTDIR)/%: % | $$(@D) +$(resources): $(OUTDIR)/%: % cp $< $@ -$(images): $(OUTDIR)/%: % | $$(@D) +$(images): $(OUTDIR)/%: % cp $< $@ -$(stylesheets): $(OUTDIR)/%: % | $$(@D) +$(stylesheets): $(OUTDIR)/%: % cp $< $@ -$(pages): $(OUTDIR)/%.html: %.html %.sh template.html | $$(@D) +$(pages): $(OUTDIR)/%.html: %.html %.sh template.html ./build.sh $< $*.sh $@ -$(members_pages): $(OUTDIR)/%.html: %.membre.in build-member.sh template.html | $$(@D) +$(members_pages): $(OUTDIR)/%.html: %.membre.in build-member.sh template.html ./build-member.sh $< $@ $(OUTDIR)/quatuor.html: quatuor.md @@ -49,3 +45,12 @@ $(OUTDIR)/programmes.html: programs.in clean: -rm -r $(OUTDIR) + +# Rules for automatic, incremental folder creation. +# ⚠ Fail for intermediate folders which hold only subdirs. + +$(OUTDIR) $(images_folders) $(stylesheets_folders): + mkdir $@ + +.SECONDEXPANSION: +$(resources) $(images) $(stylesheets) $(pages) $(members_pages): | $$(@D) -- cgit v1.2.3