aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustav Eek <gustav.eek@fripost.org>2020-05-02 21:26:08 +0200
committerGustav Eek <gustav.eek@fripost.org>2020-05-02 21:26:08 +0200
commit2b39c12a9db1b89fbaef25b1b254023abf3b4066 (patch)
tree959d5cb7f8765daaba7355a57bdca9b5e3056798
parentde9dbd42a6df25f3e03e92e8e69fecc3721779b5 (diff)
Annual 2020. Prepare 2019
-rw-r--r--annual-meetings/2019-05-05-annual.tex8
-rw-r--r--annual-meetings/Makefile24
-rw-r--r--annual-meetings/motions/2019-a-soederqvist-01.mdwn (renamed from annual-meetings/motions/soederqvist-01.mdwn)0
-rw-r--r--annual-meetings/motions/2019-b-soederqvist-02.mdwn (renamed from annual-meetings/motions/soederqvist-02.mdwn)0
-rw-r--r--annual-meetings/motions/2019-c-roedven-01.mdwn (renamed from annual-meetings/motions/roedven-01.mdwn)0
-rw-r--r--annual-meetings/motions/2019-d-roedven-02.mdwn (renamed from annual-meetings/motions/roedven-02.mdwn)0
6 files changed, 16 insertions, 16 deletions
diff --git a/annual-meetings/2019-05-05-annual.tex b/annual-meetings/2019-05-05-annual.tex
index a2a6cb1..83f0c6f 100644
--- a/annual-meetings/2019-05-05-annual.tex
+++ b/annual-meetings/2019-05-05-annual.tex
@@ -334,13 +334,13 @@ punkter.
\newpage
\section{Propositioner och motioner} \label{sec:motions}
-\input{motions/soederqvist-01_}
+\input{motions/2019-a-soederqvist-01_}
-\input{motions/soederqvist-02_}
+\input{motions/2019-b-soederqvist-02_}
-\input{motions/roedven-01_}
+\input{motions/2019-c-roedven-01_}
-\input{motions/roedven-02_}
+\input{motions/2019-d-roedven-02_}
\newpage
diff --git a/annual-meetings/Makefile b/annual-meetings/Makefile
index 1a94cbe..ba62278 100644
--- a/annual-meetings/Makefile
+++ b/annual-meetings/Makefile
@@ -14,29 +14,29 @@ all: $(MINUTES)
make -f $(common-makefile) compile FILE=$*
-annual-job = 2019-05-05-annual
+2019-job = 2019-05-05-annual
-annual-tex = \
+2019-tex = \
2019-05-05-annual \
../operational-plans/operational-plan-2019 \
../annual-reports/annual-report-2019 \
-annual-pdf = \
+2019-pdf = \
../annual-reports/economical-report-2019 \
../annual-reports/auditors-report-2019
-motions = \
- motions/soederqvist-01_.tex \
- motions/soederqvist-02_.tex \
- motions/roedven-01_.tex \
- motions/roedven-02_.tex \
+2019-motions = \
+ motions/2019-a-soederqvist-01_.tex \
+ motions/2019-b-soederqvist-02_.tex \
+ motions/2019-c-roedven-01_.tex \
+ motions/2019-d-roedven-02_.tex \
-$(annual-job): $(addsuffix .pdf, $(annual-pdf)) $(motions)
- make -f $(common-makefile) compile FILE=$(annual-job) FILES_TEX="$(annual-tex)" FILES_PDF="$(annual-pdf)"
-$(addsuffix .pdf, $(annual-pdf)):
+$(2019-job): $(addsuffix .pdf, $(2019-pdf)) $(2019-motions)
+ make -f $(common-makefile) compile FILE=$(2019-job) FILES_TEX="$(2019-tex)" FILES_PDF="$(2019-pdf)"
+$(addsuffix .pdf, $(2019-pdf)):
make -C ../annual-reports $(notdir $@)
-operational-policy-2019_.tex: ../by-laws/operational-policy-2019.tex
+operational-policy-2018_.tex: ../by-laws/operational-policy-2018.tex
sed -e "s/\\\(.*\)section\*{/\\sub\1section{/g" < $< > $@
motions/%:
diff --git a/annual-meetings/motions/soederqvist-01.mdwn b/annual-meetings/motions/2019-a-soederqvist-01.mdwn
index a9fb7de..a9fb7de 100644
--- a/annual-meetings/motions/soederqvist-01.mdwn
+++ b/annual-meetings/motions/2019-a-soederqvist-01.mdwn
diff --git a/annual-meetings/motions/soederqvist-02.mdwn b/annual-meetings/motions/2019-b-soederqvist-02.mdwn
index 36d7c31..36d7c31 100644
--- a/annual-meetings/motions/soederqvist-02.mdwn
+++ b/annual-meetings/motions/2019-b-soederqvist-02.mdwn
diff --git a/annual-meetings/motions/roedven-01.mdwn b/annual-meetings/motions/2019-c-roedven-01.mdwn
index de09d9a..de09d9a 100644
--- a/annual-meetings/motions/roedven-01.mdwn
+++ b/annual-meetings/motions/2019-c-roedven-01.mdwn
diff --git a/annual-meetings/motions/roedven-02.mdwn b/annual-meetings/motions/2019-d-roedven-02.mdwn
index 36cf18c..36cf18c 100644
--- a/annual-meetings/motions/roedven-02.mdwn
+++ b/annual-meetings/motions/2019-d-roedven-02.mdwn