diff options
| author | Gustav Eek <gustav.eek@fripost.org> | 2024-05-15 12:35:45 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@fripost.org> | 2024-05-18 22:59:57 +0200 |
| commit | 6360540b84a3c532957f1fdfaf0f64429ec19be5 (patch) | |
| tree | 94e4d942e84627a2db52bc0ad72b343b017b92f5 /annual | |
| parent | 8f310706f1c517508d37eef48d6c61d4192a639c (diff) | |
Annual 2023. Update Makefile and remove sync script
Diffstat (limited to 'annual')
| -rw-r--r-- | annual/2023/Makefile | 39 | ||||
| -rw-r--r-- | annual/2023/motions/Makefile | 14 | ||||
| -rw-r--r-- | annual/2023/pre.sed | 1 | ||||
| -rwxr-xr-x | annual/2023/sync | 18 |
4 files changed, 36 insertions, 36 deletions
diff --git a/annual/2023/Makefile b/annual/2023/Makefile index 81abadc..b38cb80 100644 --- a/annual/2023/Makefile +++ b/annual/2023/Makefile @@ -1,17 +1,38 @@ +#!/usr/bin/env make -f +# +# Makefile for Fripost annual meeting + SLIDES = agenda -PAPERS = annual-report +MINUTES = minutes +POLICY = annual-report operational-plan +PDF = 2023-06-11-annual operational-plan-2023 +SUFFIX = -all: \ +ALL = \ $(addsuffix .pdf, $(SLIDES)) \ - $(addsuffix .pdf, $(PAPERS)) + $(addsuffix .pdf, $(POLICY)) \ + $(addsuffix .pdf, $(MINUTES)) \ + $(addsuffix .pdf, $(PDF)) + +ROOT = $(shell git rev-parse --show-toplevel) -$(addsuffix .pdf, $(SLIDES)): %.pdf: %.md - pandoc -s -f markdown -t beamer -o $@ < $< +include $(ROOT)/lib/Makefile -$(addsuffix .pdf, $(PAPERS)): %.pdf: %.md - pandoc -s -f markdown -t latex -o $@ < $< +# Specific commands for this year 2023 -$(addsuffix .tex, $(PAPERS)): %.tex: %.md - pandoc -s -f markdown -t latex -o $@ < $< +2023-06-11-annual.pdf: \ + minutes.pdf \ + annual-report.pdf \ + Balans-och-resultat-2022.pdf \ + revision2022.pdf \ + operational-plan.pdf \ + motions/operational-policy.pdf + pdftk $^ cat output $@ +motions/%.pdf: + make -C $(dir $@) +operational-plan-2023.pdf: \ + operational-plan.pdf \ + ../../by-laws/operational-policy-2023.pdf + pdftk $^ cat output $@ diff --git a/annual/2023/motions/Makefile b/annual/2023/motions/Makefile index 244dbc8..2d6781f 100644 --- a/annual/2023/motions/Makefile +++ b/annual/2023/motions/Makefile @@ -1,11 +1,7 @@ -YL = $(basename $(wildcard *.yml)) +POLICY = $(basename $(wildcard *.md)) +ALL = \ + $(addsuffix .pdf, $(POLICY)) -all: $(addsuffix .pdf, $(YL)) +ROOT = $(shell git rev-parse --show-toplevel) -PD = \ - -N -s -f markdown -t latex -H ../head.tex \ - -V classoption=a4paper - -$(addsuffix .pdf, $(YL)): %.pdf: %.yml %.md - cat < $*.md | sed -f ../pre.sed | sed -f drop.sed | \ - pandoc $(PD) --metadata-file=$*.yml -o $@ +include $(ROOT)/lib/Makefile diff --git a/annual/2023/pre.sed b/annual/2023/pre.sed new file mode 100644 index 0000000..dabfef0 --- /dev/null +++ b/annual/2023/pre.sed @@ -0,0 +1 @@ +1 i `\\thispagestyle{fancy}`{=latex}\n diff --git a/annual/2023/sync b/annual/2023/sync deleted file mode 100755 index 2efb15e..0000000 --- a/annual/2023/sync +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -# Sync a set of sources with a Git repository target. Set target -# directory where the repository is found. Make sure that all pahts are -# absolute !!! - -mv ${0##*/} ${XDG_RUNTIME_DIR}/ - -TRG="$HOME/git/fripost/meetings/annual/2023" -SRC="$HOME/cloud-fripost/fripost/årsmöte" - -echo ${0##*/}: I: ${SRC} ${TRG} 1>&2 - -rsync -a --delete -P ${SRC}/ ${TRG}/ \ - | grep -iv "^sending" -git -C ${TRG} status --short --branch - -mv ${XDG_RUNTIME_DIR}/${0##*/} . |