From 33072b77580b6d8f21763d80b50bd6cb347727e6 Mon Sep 17 00:00:00 2001
From: "Jip J. Dekker" <jip@dekker.one>
Date: Tue, 9 Feb 2021 14:08:57 +1100
Subject: [PATCH] Keep generation commands in Makefile

---
 .latexmkrc | 12 +++++-------
 Makefile   | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.latexmkrc b/.latexmkrc
index 96bacb2..97e4deb 100644
--- a/.latexmkrc
+++ b/.latexmkrc
@@ -6,13 +6,11 @@ $bibtex_use = 2;
 $clean_ext = "run.xml %R-blx.bib %R-blx.aux ist xdy";
 
 # Rule to typeset minizinc files
-add_cus_dep('mzn', 'mzntex', 0, 'run_pygmentize_mzn');
-sub run_pygmentize_mzn {
-  system "pipenv run pygmentize -f latex -Olinenos=True,texcomments=True,mathescape=True $_[0].mzn > $_[0].mzntex";
-}
-add_cus_dep('py', 'pytex', 0, 'run_pygmentize_py');
-sub run_pygmentize_py {
-  system "pipenv run pygmentize -f latex -Olinenos=True,texcomments=True,mathescape=True $_[0].py > $_[0].pytex";
+add_cus_dep('mzn', 'mzntex', 0, 'run_make');
+add_cus_dep('py', 'pytex', 0, 'run_make');
+sub run_make {
+  my $dest = $$Pdest;
+  system "make $dest"
 }
 
 # Rule to generate glossaries
diff --git a/Makefile b/Makefile
index ab25e33..81f8d78 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,25 @@
 PROJECT=dekker_thesis
 
+MZN_LISTINGS := $(addsuffix tex, $(wildcard assets/mzn/*.mzn) )
+PY_LISTINGS := $(addsuffix tex, $(wildcard assets/py/*.py) )
+
 .PHONY: $(PROJECT).pdf clean clobber
 
-
 $(PROJECT).pdf: $(PROJECT).tex
 	latexmk -use-make $<
 
+listings: $(MZN_LISTINGS) $(PY_LISTINGS)
+
+%.mzntex : %.mzn
+	pipenv run pygmentize -f latex -Olinenos=True,texcomments=True,escapeinside="@@",envname="BVerbatim" $< > $@
+
+%.pytex : %.py
+	pipenv run pygmentize -f latex -Olinenos=True,texcomments=True,escapeinside="@@",envname="BVerbatim" $< > $@
+
 clean:
 	latexmk -c
 
 clobber:
 	latexmk -C
+	rm -f assets/mzn/*.mzntex
+	rm -f assets/py/*.pytex