simplify common Make targets and introduce generic markdown rule

1 files changed, 5 insertions, 12 deletions

diff --git a/common.mk b/common.mk
index 6c8939ed..f705520e 100644
--- a/common.mk
+++ b/common.mk
@@ -8,29 +8,22 @@ COMMON_PANDOC_OPTIONS := --pdf-engine=lualatex --resource-path="$(COMMON_IMAGES)
 PANDOC := pandoc $(COMMON_PANDOC_OPTIONS)
 
 SLIDES_OPTIONS := --slide-level 2 -t beamer
-SLIDES_FORMAT := markdown
-SCHEDULE_FORMAT := markdown+pipe_tables
-SEQUENCE_FORMAT := markdown
 
 ADDITIONAL_TEX_INPUTS := LATEX_BASE:
 
 RUBBER_OPTS := -m lualatex:pdf --shell-escape -I "$(LATEX_BASE)"
 
-sequence.pdf: sequence.md $(MAKEFILE_LIST)
-	@echo "building $@"
-	$(PANDOC) $< -f $(SEQUENCE_FORMAT) -o $@
-
-schedule.pdf: schedule.md $(MAKEFILE_LIST)
+slides.pdf: slides.md $(wildcard img/*) $(MAKEFILE_LIST)
 	@echo "building $@"
-	$(PANDOC) $< -f $(SCHEDULE_FORMAT) -o $@
+	$(PANDOC) $(SLIDES_OPTIONS) $< -o $@
 
-slides.pdf: slides.md $(wildcard img/*) $(MAKEFILE_LIST)
+%.pdf: %.md $(MAKEFILE_LIST)
 	@echo "building $@"
-	$(PANDOC) $(SLIDES_OPTIONS) -f $(SLIDES_FORMAT) $< -o $@
+	$(PANDOC) -f markdown $< -o $@
 
 slides%.pdf: slides%.md slides.md $(wildcard img/*) $(MAKEFILE_LIST)
 	@echo "building $@"
-	$(PANDOC) $(SLIDES_OPTIONS) -f $(SLIDES_FORMAT) $< -o $@
+	$(PANDOC) $(SLIDES_OPTIONS) $< -o $@
 
 %.pdf: %.tex $(MAKEFILE_LIST)
 	@echo "building $@"