From 077f76eb12d74535c3a0c91af11538d03b303253 Mon Sep 17 00:00:00 2001
From: Martin Fredin <fredin.martin@gmail.com>
Date: Mon, 3 Apr 2023 12:24:22 +0200
Subject: [PATCH] Separate make file actions

---
 .gitignore |  2 ++
 Makefile   |  8 +++++---
 shell.nix  | 22 +++++++++++++---------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd90be9..3a31ecd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ test_program_result
 output/
 *.o
 *.out
+*.aux
+*.log
diff --git a/Makefile b/Makefile
index eef33fd..6c1ebde 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY : sdist clean
 
-language : src/Grammar/Test Grammar.pdf
+language : src/Grammar/Test
 	cabal install --installdir=. --overwrite-policy=always
 
 src/Grammar/Test.hs src/Grammar/Lex.x src/Grammar/Par.y src/Grammar/Layout : Grammar.cf
@@ -23,13 +23,15 @@ Grammar.tex :
 
 Grammar.pdf : Grammar.tex
 	pdflatex Grammar.tex
-	rm Grammar.aux Grammar.dvi Grammar.fdb_latexmk Grammar.fls Grammar.log
+	rm Grammar.aux Grammar.log
+
+pdf : Grammar.pdf
 
 clean :
 	rm -r src/Grammar
 	rm language
 	rm -rf dist-newstyles
-	rm Grammar.aux Grammar.fdb_latexmk Grammar.fls Grammar.log Grammar.pdf Grammar.synctex.gz Grammar.tex
+	rm Grammar.aux Grammar.fdb_latexmk Grammar.fls Grammar.log Grammar.synctex.gz Grammar.tex
 
 test :
 	cabal v2-test
diff --git a/shell.nix b/shell.nix
index 0af8c7b..cbc2899 100644
--- a/shell.nix
+++ b/shell.nix
@@ -6,15 +6,19 @@ pkgs.haskellPackages.developPackage {
   withHoogle = true;
   modifier = drv:
   pkgs.haskell.lib.addBuildTools drv (
-    (with pkgs; [ hlint haskell-language-server ghc jasmin llvmPackages_15.libllvm])
+    (with pkgs; [ hlint 
+                  haskell-language-server 
+                  ghc 
+                  jasmin 
+                  llvmPackages_15.libllvm 
+                  texlive.combined.scheme-full
+                ])
     ++
-    (with pkgs.haskellPackages; [ 
-      cabal-install
-      stylish-haskell 
-      BNFC 
-      alex
-      happy
-    ])
-  );
+    (with pkgs.haskellPackages; [ cabal-install
+                                  stylish-haskell 
+                                  BNFC 
+                                  alex
+                                  happy
+                                ]));
 }