commit 6b77064abf4b6e44abb307e24960abfa4c88ea2c (tree) parent acea8cf54d9e3700bcb98ff2ee9a67203f009ba9 Author: Motiejus Jakštys <motiejus@uber.com> Date: Tue, 6 Apr 2021 09:17:53 +0300 tidy up Makefile Diffstat:
| M | IV/Makefile | | | 20 | ++++---------------- |
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/IV/Makefile b/IV/Makefile @@ -1,15 +1,10 @@ SOURCE ?= lithuania-latest.osm.pbf WHERE ?= name='Visinčia' OR name='Šalčia' OR name='Nemunas' OR name='Žeimena' OR name='Lakaja' - SLIDES = slides-2021-03-29.pdf + NON_ARCHIVABLES = notes.txt referatui.txt slides-2021-03-29.txt ARCHIVABLES = $(filter-out $(NON_ARCHIVABLES),$(shell git ls-files .)) -GIT_DEP= -ifeq ($(shell git rev-parse --is-inside-git-dir),true) -GIT_DEP=$(shell git rev-parse --show-toplevel)/.git -endif - .PHONY: test test: .faux_test @@ -73,18 +68,11 @@ $(SOURCE): wget http://download.geofabrik.de/europe/$@ REF = $(shell git describe --abbrev=12 --always --dirty) -version.tex: Makefile $(GIT_DEP) - ( \ - TZ=UTC date '+\gdef\VCDescribe{%F ($(REF))}%'; \ - ) > $@ +version.tex: Makefile $(shell git rev-parse --git-dir 2>/dev/null) + TZ=UTC date '+\gdef\VCDescribe{%F ($(REF))}%' > $@ -# slides slides-2021-03-29.pdf: slides-2021-03-29.txt pandoc -t beamer -i $< -o $@ -slides-2021-03-29.html: slides-2021-03-29.txt - pandoc --verbose -t slidy --self-contained $< -o $@ $(SLIDY_ARGS) - dump-debug_wm.sql.xz: - docker exec -ti wm-mj \ - pg_dump -Uosm osm -t debug_wm | xz > $@ + docker exec -ti wm-mj pg_dump -Uosm osm -t debug_wm | xz -v > $@