From dd9658249fb32791207ab4473b0d632f73f436cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Sat, 17 Apr 2021 16:55:49 +0300 Subject: [PATCH] fix extract-and-generate --- IV/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/IV/Makefile b/IV/Makefile index 57fea30..09598de 100644 --- a/IV/Makefile +++ b/IV/Makefile @@ -3,9 +3,12 @@ WHERE ?= name='Visinčia' OR name='Šalčia' OR name='Nemunas' OR name='Žeimena #WHERE ?= name like '%' SLIDES = slides-2021-03-29.pdf -################################################################ -# This has to be before first use due to how macros are expanded -################################################################ +############################################################################## +# These variables have to come before first use due to how macros are expanded +############################################################################## + +NON_ARCHIVABLES = notes.txt referatui.txt slides-2021-03-29.txt +ARCHIVABLES = $(filter-out $(NON_ARCHIVABLES),$(shell git ls-files .)) FIGURES = test-figures \ fig8-definition-of-a-bend \ @@ -126,9 +129,6 @@ $(SOURCE): # Report's non-test dependencies ################################ -NON_ARCHIVABLES = notes.txt referatui.txt slides-2021-03-29.txt -ARCHIVABLES = $(filter-out $(NON_ARCHIVABLES),$(shell git ls-files .)) - REF = $(shell git describe --abbrev=12 --always --dirty) version.inc.tex: Makefile $(shell git rev-parse --git-dir 2>/dev/null) TZ=UTC date '+\gdef\VCDescribe{%F ($(REF))}%' > $@ @@ -136,9 +136,9 @@ version.inc.tex: Makefile $(shell git rev-parse --git-dir 2>/dev/null) vars.inc.tex: vars.awk wm.sql Makefile awk -f $< wm.sql -##################### -# Almost never needed -##################### +############### +# Misc commands +############### slides-2021-03-29.pdf: slides-2021-03-29.txt pandoc -t beamer -i $< -o $@