diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-04-19 14:00:59 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-04-19 14:00:59 +0200 |
| commit | e32780bc0560027e1e48f9b84c43f3be12a1c037 (patch) | |
| tree | 3850760f33e60bbdf35761d6b04e9df3133801d4 /resources | |
| parent | f891531ca224bade49c10733f98c65db6553caf5 (diff) | |
| parent | b28d72988add82f68d345cd5a9f3a34951626653 (diff) | |
Merge branch 'mar22-annual'
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/Makefile-common | 6 | ||||
| -rw-r--r-- | resources/participants | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/resources/Makefile-common b/resources/Makefile-common index 9ba957f..3d066b1 100644 --- a/resources/Makefile-common +++ b/resources/Makefile-common @@ -24,19 +24,21 @@ FILE = PREAMBLE = ../preamble/preamble FILES_TEX = FILES_JPG = +FILES_PDF = SEND_FILES = input = $(FILE).tex output = $(FILE).pdf preamble = $(PREAMBLE).tex files-tex = $(foreach f, $(FILES_TEX), $(f).tex) -files-jgp = $(foreach f, $(FILES_JPG), $(f).jpg) +files-jpg = $(foreach f, $(FILES_JPG), $(f).jpg) +files-pdf = $(foreach f, $(FILES_PDF), $(f).pdf) send-files = $(foreach f, $(SEND_FILES), $(f).pdf) compile: $(output) # The most general latex compilation command -$(output): $(input) $(preamble) $(files-tex) $(files-jpg) +$(output): $(input) $(preamble) $(files-tex) $(files-jpg) $(files-pdf) latex_count=5 ;\ latex_log=$$(echo $@ | sed 's/.pdf/.log/') ;\ pdflatex $< ;\ diff --git a/resources/participants b/resources/participants index 468c9eb..8b124f1 100644 --- a/resources/participants +++ b/resources/participants @@ -12,13 +12,14 @@ Dagfinn L. Hotvedt Mattias Ivarsson Stefan Kangas Jens Lideström +Lorena Llozhi Guilhem Moulin Lola Möller Leif-Jöran Olsson Taraka Rama Dan Ros\'en Stian Rødven Eide -Albin S. +Albin Söderqvist Andreas Skyman Delphine Szymczak Johan Söderberg |