From e3a51ee2a2aa817be50c5457aecafb767d6f8b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 19 May 2021 22:57:47 +0300
Subject: [PATCH] tidy up Makefile

---
 Makefile | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index d2728ec..0dd1dd0 100644
--- a/Makefile
+++ b/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 > $@