1 files changed, 43 insertions, 42 deletions
diff --git a/Master/texmf-dist/source/latex/thuthesis/Makefile b/Master/texmf-dist/source/latex/thuthesis/Makefile
index 95f40360082..f3dd43cc77b 100644
--- a/Master/texmf-dist/source/latex/thuthesis/Makefile
+++ b/Master/texmf-dist/source/latex/thuthesis/Makefile
@@ -1,73 +1,74 @@
 # Makefile for ThuThesis
 
-# Set opts for latexmk if you use it
-LATEXMKOPTS = -xelatex -file-line-error -halt-on-error -interaction=nonstopmode
-# Basename of thesis
-THESISMAIN = main
-# Basename of shuji
-SHUJIMAIN = shuji
-
-PACKAGE=thuthesis
-SOURCES=$(PACKAGE).ins $(PACKAGE).dtx
-THESISCONTENTS=$(THESISMAIN).tex data/*.tex $(FIGURES)
-# NOTE: update this to reflect your local file types.
-FIGURES=$(wildcard figures/*.pdf)
-BIBFILE=ref/*.bib
-BSTFILE=*.bst
-SHUJICONTENTS=$(SHUJIMAIN).tex
-CLSFILES=dtx-style.sty $(PACKAGE).cls
+PACKAGE = thuthesis
+THESIS  = main
+SPINE   = spine
+
+SOURCES = $(PACKAGE).ins $(PACKAGE).dtx
+CLSFILE = dtx-style.sty $(PACKAGE).cls
+
+LATEXMK = latexmk
 
 # make deletion work on Windows
 ifdef SystemRoot
 	RM = del /Q
-	OPEN = start
 else
 	RM = rm -f
-	OPEN = open
 endif
 
-.PHONY: all clean distclean dist thesis viewthesis shuji viewshuji doc viewdoc cls check FORCE_MAKE
+.PHONY: all all-dev clean distclean dist thesis viewthesis spine viewspine doc viewdoc cls check save savepdf test FORCE_MAKE
 
-all: doc thesis shuji
+thesis: $(THESIS).pdf
 
-cls: $(CLSFILES)
+all: thesis spine
 
-$(CLSFILES): $(SOURCES)
-	xetex $(PACKAGE).ins
+all-dev: doc all
 
-viewdoc: doc
-	$(OPEN) $(PACKAGE).pdf
+cls: $(CLSFILE)
+
+$(CLSFILE): $(SOURCES)
+	xetex $(PACKAGE).ins
 
 doc: $(PACKAGE).pdf
 
-viewthesis: thesis
-	$(OPEN) $(THESISMAIN).pdf
+spine: $(SPINE).pdf
+
+$(PACKAGE).pdf: cls FORCE_MAKE
+	$(LATEXMK) $(PACKAGE).dtx
+
+$(THESIS).pdf: cls FORCE_MAKE
+	$(LATEXMK) $(THESIS)
 
-thesis: $(THESISMAIN).pdf
+$(SPINE).pdf: cls FORCE_MAKE
+	$(LATEXMK) $(SPINE)
 
-viewshuji: shuji
-	$(OPEN) $(SHUJIMAIN).pdf
+viewdoc: doc
+	$(LATEXMK) -pv $(PACKAGE).dtx
+
+viewthesis: thesis
+	$(LATEXMK) -pv $(THESIS)
 
-shuji: $(SHUJIMAIN).pdf
+viewspine: spine
+	$(LATEXMK) -pv $(SPINE)
 
-$(PACKAGE).pdf: $(CLSFILES) $(THESISMAIN).tex FORCE_MAKE
-	latexmk $(LATEXMKOPTS) $(PACKAGE).dtx
+save:
+	bash testfiles/save.sh
 
-$(THESISMAIN).pdf: $(CLSFILES) $(BSTFILE) FORCE_MAKE
-	latexmk $(LATEXMKOPTS) $(THESISMAIN)
+savepdf:
+	bash testfiles/save-pdf.sh
 
-$(SHUJIMAIN).pdf: $(CLSFILES) FORCE_MAKE
-	latexmk $(LATEXMKOPTS) $(SHUJIMAIN)
+test:
+	l3build check
 
 clean:
-	latexmk -c $(PACKAGE).dtx $(THESISMAIN) $(SHUJIMAIN)
-	-@$(RM) *~
+	$(LATEXMK) -c $(PACKAGE).dtx $(THESIS) $(SPINE)
+	-@$(RM) *~ main-survey.*
 
 cleanall: clean
-	-@$(RM) $(PACKAGE).pdf $(THESISMAIN).pdf $(SHUJIMAIN).pdf
+	-@$(RM) $(PACKAGE).pdf $(THESIS).pdf $(SPINE).pdf
 
 distclean: cleanall
-	-@$(RM) $(CLSFILES)
+	-@$(RM) $(CLSFILE)
 	-@$(RM) -r dist
 
 check: FORCE_MAKE
@@ -78,5 +79,5 @@ else
 	@[[ $(shell grep -E -c '"version": "$(version)"' package.json) -eq 1 ]] || (echo "update version in package.json before release"; exit 1)
 endif
 
-dist: check all
+dist: check all-dev
 	npm run build -- --version=$(version)