From bedf92b840b2310b43473c2c0c070f39e36aa0d1 Mon Sep 17 00:00:00 2001 From: Orestis Malaspinas <orestis.malaspinas@hesge.ch> Date: Fri, 15 Jun 2018 21:22:06 +0200 Subject: [PATCH] updated makefile, thanks to florent, and updated gitlab-ci accordingly --- .gitlab-ci.yml | 6 ------ Makefile | 9 +++++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14511c9..e06b366 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,16 +2,10 @@ image: omalaspinas/archlinux-pandoc:thirdtry build_only: script: - - cd figs - - ./convert.sh - - cd .. - make build_artifacts: script: - - cd figs - - ./convert.sh - - cd .. - make artifacts: paths: diff --git a/Makefile b/Makefile index 49517ca..880cbce 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,13 @@ REVEALOPRIONS += --highlight-style espresso REVEALOPRIONS += --self-contained # REVEALOPRIONS += --include-in-header=reveal.js/left_just.css +SVG=$(wildcard figs/*.svg) +PNG=$(SVG:%.svg=%.png) -all: intro.html variables.html +all: $(PNG) intro.html variables.html + +figs/%.png: figs/%.svg + convert \-flatten $< $@ intro.html: intro.md Makefile pandoc -s $(REVEALOPRIONS) -o $@ $< @@ -36,4 +41,4 @@ variables.html: variables.md Makefile pandoc -s $(REVEALOPRIONS) -o $@ $< clean: - rm -rf intro.html variables.html \ No newline at end of file + rm -rf intro.html variables.html -- GitLab