diff --git a/Makefile b/Makefile index 6f879c4..63e2010 100644 --- a/Makefile +++ b/Makefile @@ -1,42 +1,35 @@ -LC = lualatex -LCFLAGS = --interaction=nonstopmode --output-directory $(OUTPUT) -SC = inkscape -SCFLAGS = --export-type=pdf --export-pdf-version=1.4 +PDF_APP ?= zathura +OUTPUT ?= output +GEN_DIR ?= images/generated +SVG_DIR ?= images/svg +PIX_DIR ?= images/bitmap +DOCUMENT ?= $(patsubst %.tex,%.pdf,$(wildcard *.tex)) -VIEWER = zathura -VIEWER_FLAGS = --fork +SVG_FILES = $(wildcard $(SVG_DIR)/*.svg) +GEN_FILES = $(subst $(SVG_DIR), $(GEN_DIR),$(patsubst %.svg,%.pdf,$(SVG_FILES))) +PIX_FILES = $(wildcard $(PIX_DIR)/*.*) -OUTPUT = build -IMAGES_DIR = images/bitmap -SVG_DIR = images/svg -SVG_EXPORTED_DIR = images/generated +default: build +build: $(addprefix $(OUTPUT)/, $(DOCUMENT)) +images: $(GEN_FILES) -DOCUMENTS = $(addprefix $(OUTPUT)/, $(patsubst %.tex,%.pdf,$(wildcard *.tex))) -IMAGES = $(wildcard $(IMAGES_DIR)/*.*) -SVG = $(wildcard $(SVG_DIR)/*.svg) +$(OUTPUT)/%.pdf: %.tex $(GEN_FILES) $(PIX_FILES) + @$(shell mkdir -p $(OUTPUT)) + lualatex --interaction=nonstopmode --output-directory $(OUTPUT) $< -SVG_EXPORTED = $(subst $(SVG_DIR),$(SVG_EXPORTED_DIR),$(patsubst %.svg,%.pdf,$(SVG))) +$(GEN_DIR)/%.pdf : $(SVG_DIR)/%.svg + @echo export PDF from $@ + @inkscape --export-type=pdf --export-pdf-version=1.4 -o $@ $< -default: $(DOCUMENTS) +.PHONY: echo view clean +echo: + @echo "document: $(DOCUMENT)" + @echo "bitmap images: $(PIX_FILES)" + @echo "svg images: $(SVG_FILES)" + @echo "generated images: $(GEN_FILES)" -$(OUTPUT)/%.pdf: %.tex $(IMAGES) $(SVG_EXPORTED) - @mkdir -p $(OUTPUT) - $(LC) $(LCFLAGS) $< +view: + $(PDF_APP) $(addprefix $(OUTPUT)/, $(DOCUMENT)) -$(SVG_EXPORTED_DIR)/%.pdf : $(SVG_DIR)/%.svg - $(SC) $(SCFLAGS) -o $@ $< - -.PHONY: clean -clean: - @rm -rf $(OUTPUT) - -.PHONY: info -info: - @echo "document.............'$(DOCUMENTS)'" - @echo "bitmap images........'$(IMAGES)'" - @echo "SVG images...........'$(SVG)'" - @echo "exported SVG images..'$(SVG_EXPORTED)'" - -.PHONY: view -view: default - @$(VIEWER) $(VIEWER_FLAGS) $(DOCUMENTS) +clean: + rm -rf $(GEN_DIR)/* $(OUTPUT) diff --git a/resume_fr.tex b/resume_fr.tex index 09d38b0..8732fe3 100644 --- a/resume_fr.tex +++ b/resume_fr.tex @@ -140,9 +140,6 @@ salariƩ.} \divider -\cvevent{Administration Kubernetes -- LFS458}{Linux Foundation}{mars 2023}{en ligne} -\vspace{5pt} - \cvevent{Formation Ansible}{Dawan}{mars 2022}{en ligne} \vspace{5pt} diff --git a/resume_fr.xmpdata b/resume_fr.xmpdata deleted file mode 100644 index 0efdfd0..0000000 --- a/resume_fr.xmpdata +++ /dev/null @@ -1,2 +0,0 @@ -\Author{Yorick Barbanneau} -\Title{Curriculum Vitae}