3 files changed, 8 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
index 0e07b00..a8010fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,14 +8,8 @@
 *.out
 *.snm
 *.vrb
-*/*/*.pdf
-*/*/*.aux
-*/*/*.log
-*/*/*.nav
-*/*/*.toc
-*/*/*.out
-*/*/*.snm
-*/*/*.vrb
+*.fls
+*.fdb_latexmk
 *.o
 *.a
 kernel-devel/module-basics/vain/.*
diff --git a/Makefile b/Makefile
index 08c9992..6cfaed7 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,7 @@ HANDOUT_FOLDER	:= handouts
 HANDOUT		:=$(DEPLOY)/$(HANDOUT_FOLDER)
 CONFIG_FOLDER	:= configs
 
-BUILD_COMMAND   := xelatex
-BUILD_COMMAND_BIB := bibtex
+BUILD_COMMAND   := latexmk -xelatex -bibtex -pdf
 BUILD_DEBUG	:= -halt-on-error --interaction=errorstopmode
 BUILD_ARGS      :=
 BUILD           := $(BUILD_COMMAND) $(BUILD_DEBUG) $(BUILD_ARGS)
diff --git a/modules.mk b/modules.mk
index 941598f..5d511e6 100644
--- a/modules.mk
+++ b/modules.mk
@@ -16,14 +16,10 @@ ifdef CONFIG_BUILD_HANDOUTS
         done
 endif
 
-%.pdf: %.tex
+.FORCE:
+%.pdf: %.tex .FORCE
 	echo "Build" $@
-	TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS):`pwd`/distribution/autotools $(BUILD) $(subst .pdf,.tex,$@)
-ifneq ($(CONFIG_BUILD_FAST_BUILD),y)
-	TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS):`pwd`/distribution/autotools $(BUILD_BIB) $(subst .pdf,.aux,$@)
-	TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS):`pwd`/distribution/autotools $(BUILD) $(subst .pdf,.tex,$@)
-	TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS):`pwd`/distribution/autotools $(BUILD) $(subst .pdf,.tex,$@)
-endif
+	TEXINPUTS=`pwd`/../..:.:..:$(TEXINPUTS):`pwd`/distribution/autotools $(BUILD) $<
 
 # DON'T delete this empty target! Need for incremental build
 %.tex:
@@ -40,6 +36,8 @@ clean_texfiles:
 	rm -f *.blg
 	rm -f *.out
 	rm -f *.vrb
+	rm -f *.fls
+	rm -f *.fdb_latexmk
 
 build_master_pres:
 ifneq ($(filter $(PRES_PREFIX)%,$(obj-y)), )