Move generated files to ./out

This commit is contained in:
regnat 2017-07-13 15:27:07 +02:00
parent be785ba2f1
commit fb7115bdcf
4 changed files with 13 additions and 13 deletions

2
.gitignore vendored
View File

@ -226,4 +226,4 @@ TSWLatexianTemp*
*.pdf
# Generated latex files
generated
out

View File

@ -5,7 +5,7 @@ VIEWER=evince
.PHONY: clean main.pdf
GENERATED_LATEX=$(shell find . -name '*.md' | sed 's_./\(.*\).md_generated/\1.tex_g')
GENERATED_LATEX=$(shell find . -name '*.md' | sed 's_./\(.*\).md_out/generated/\1.tex_g')
all: main.pdf
@ -25,9 +25,10 @@ main.pdf: main.tex $(GENERATED_LATEX)
-interaction=nonstopmode \
$<
generated/%.tex: %.md
out/generated/%.tex: %.md
mkdir -p $(shell dirname $@)
pandoc \
--from markdown-auto_identifiers \
--listings \
--biblatex \
$< \
@ -35,7 +36,6 @@ generated/%.tex: %.md
clean:
rm -r out
rm -r generated
# Fore some reasons that are far behind my understanding of make, The PHONY
# rule doesn't work for the "%.pdf" rule, so let's use this old trick to

16
main.md
View File

@ -15,12 +15,12 @@
\input{contexte/nix/presentation-generale}
### Syntax and semantics
\input{generated/context/nix/syntax-and-semantics}
\input{out/generated/context/nix/syntax-and-semantics}
## Set-theoretic types
<!-- Présentation de l'interprétation ensembliste des types -->
<!-- Justification informelle de pourquoi le système convient à Nix -->
\input{generated/context/set-theoretic-types}
\input{out/generated/context/set-theoretic-types}
# Nix-light <!-- TODO: find another name for this -->
\label{sec:nix-light}
@ -30,15 +30,15 @@
Explication de pourquoi nix est trop permissif et pourquoi il vaut mieux
bosser sur autre chose.
-->
\input{generated/nix-light/motivation.tex}
\input{out/generated/nix-light/motivation.tex}
## Description
<!-- Description du langage, grammaire + sémantique -->
\input{generated/nix-light/description.tex}
\input{out/generated/nix-light/description.tex}
## From Nix to Nix-light
<!-- Compilation -->
\input{generated/nix-light/compilation.tex}
\input{out/generated/nix-light/compilation.tex}
# Typage
@ -46,11 +46,11 @@
<!-- Présentation des types utilisés -->
<!-- Discussion autour du sous-typage lazy -->
<!-- Sous-typage graduel -->
\input{generated/typing/types.tex}
\input{out/generated/typing/types.tex}
## Lambda-calcul
<!-- Typage du langage sans records et sans listes -->
\input{generated/typing/lambda-calculus.tex}
\input{out/generated/typing/lambda-calculus.tex}
## Structures de données
<!-- Description du typage des deux structures de données de Nix -->
@ -63,7 +63,7 @@
original (mais joli par contre)
-->
\label{typing::structures::listes}
\input{generated/typing/lists.tex}
\input{out/generated/typing/lists.tex}
### Records
<!-- Typage des records. Probablement plein de choses à dire ici. -->

View File

@ -116,6 +116,6 @@
\pagebreak
\input{generated/main.tex}
\input{out/generated/main.tex}
\printbibliography{}
\end{document}