fix extract-and-generate

This commit is contained in:
Motiejus Jakštys 2021-05-19 22:57:48 +03:00 committed by Motiejus Jakštys
parent bc5e8f575e
commit bff1c7eec7

View File

@ -3,9 +3,12 @@ WHERE ?= name='Visinčia' OR name='Šalčia' OR name='Nemunas' OR name='Žeimena
#WHERE ?= name like '%' #WHERE ?= name like '%'
SLIDES = slides-2021-03-29.pdf 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 \ FIGURES = test-figures \
fig8-definition-of-a-bend \ fig8-definition-of-a-bend \
@ -126,9 +129,6 @@ $(SOURCE):
# Report's non-test dependencies # 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) REF = $(shell git describe --abbrev=12 --always --dirty)
version.inc.tex: Makefile $(shell git rev-parse --git-dir 2>/dev/null) version.inc.tex: Makefile $(shell git rev-parse --git-dir 2>/dev/null)
TZ=UTC date '+\gdef\VCDescribe{%F ($(REF))}%' > $@ 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 vars.inc.tex: vars.awk wm.sql Makefile
awk -f $< wm.sql awk -f $< wm.sql
##################### ###############
# Almost never needed # Misc commands
##################### ###############
slides-2021-03-29.pdf: slides-2021-03-29.txt slides-2021-03-29.pdf: slides-2021-03-29.txt
pandoc -t beamer -i $< -o $@ pandoc -t beamer -i $< -o $@