From 43a4a966499d31007239653f211cec6b90c3ac1a Mon Sep 17 00:00:00 2001
From: Gustav Eek <gustav.eek@fripost.org>
Date: Sun, 19 May 2024 10:30:12 +0200
Subject: Annual 2024. Update Makefile and add one for notes

---
 annual/2024/Makefile       | 45 ++++++++++++++++-----------------------------
 annual/2024/notes/Makefile |  3 +++
 2 files changed, 19 insertions(+), 29 deletions(-)
 create mode 100644 annual/2024/notes/Makefile

(limited to 'annual')

diff --git a/annual/2024/Makefile b/annual/2024/Makefile
index 352b861..1b7680e 100644
--- a/annual/2024/Makefile
+++ b/annual/2024/Makefile
@@ -2,41 +2,31 @@
 #
 # Makefile for Fripost annual meeting
 
-SLIDES = agenda
+SLIDES = agenda shortest-procedures
 MINUTES = minutes
-POLICY = annual-report operational-plan
+REPORTS = annual-report operational-plan short-procedures
 TRG = 2024-05-19-annual operational-plan-2024
+SUFFIX =
 
-# General (reusable) compilation and processing commands
+.PHONY: allall notes
+
+allall: notes all
+
+notes:
+	make -C notes
+
+ROOT = $(shell git rev-parse --show-toplevel)
 
 ALL = \
  $(addsuffix .pdf, $(SLIDES)) \
- $(addsuffix .pdf, $(POLICY)) \
+ $(addsuffix .pdf, $(REPORTS)) \
  $(addsuffix .pdf, $(MINUTES)) \
  $(addsuffix .pdf, $(TRG))
 
-all: $(ALL)
-
-$(addsuffix .pdf, $(SLIDES)): %.pdf: %.md
-	pandoc -s -f markdown -t beamer -o $@ < $<
 
-$(addsuffix .pdf, $(MINUTES)): %.pdf: %.yml %.md
-	pandoc -f markdown -t latex \
-	--template=fripost-minutes --metadata-file=$*.yml -o $@ $*.md
+include $(ROOT)/lib/Makefile
 
-$(addsuffix .pdf, $(POLICY)): %.pdf: %.yml %.md
-	pandoc -f markdown -t latex \
-	--template=fripost-by-laws --metadata-file=$*.yml -o $@ $*.md
-
-send:
-	make -f ../../resources/Makefile-common \
-	send SEND_FILES="$(TRG)"
-
-clean:
-	rm -f $(ALL)
-	rm -f *~
-
-# Specific commands for this year 2023
+# Specific commands for this year 2024
 
 2024-05-19-annual.pdf: \
   minutes.pdf \
@@ -44,13 +34,10 @@ clean:
   Balans-och-resultat-2023.pdf \
   revision2023.pdf \
   operational-plan.pdf \
-  motions/operational-policy.pdf
+  short-procedures.pdf
 	pdftk $^ cat output $@
 
-motions/example.pdf:
-	make -C $(dir $@)	
-
 operational-plan-2024.pdf: \
   operational-plan.pdf \
-  ../../by-laws/operational-policy-2023.pdf
+  $(ROOT)/by-laws/operational-policy-2023.pdf
 	pdftk $^ cat output $@
diff --git a/annual/2024/notes/Makefile b/annual/2024/notes/Makefile
new file mode 100644
index 0000000..52deafe
--- /dev/null
+++ b/annual/2024/notes/Makefile
@@ -0,0 +1,3 @@
+REPORTS = $(basename $(wildcard *.md))
+ROOT = $(shell git rev-parse --show-toplevel)
+include $(ROOT)/lib/Makefile
-- 
cgit v1.2.3