From cf5053225ae0cf245df3449900d30765623d4d5c Mon Sep 17 00:00:00 2001 From: Frank Milthaler Date: Wed, 26 Jun 2019 17:48:41 +0100 Subject: [PATCH] Makefiles: using "wildcard" to find .tex files, moreover, using string manipulation to perform checks on the logfile of standalone tex files --- abstract/Makefile | 2 +- content/appendix/Makefile | 2 +- content/conclusion/Makefile | 2 +- content/introduction/Makefile | 2 +- content/reschap1/Makefile | 2 +- content/reschap1/images/Makefile | 9 +++------ content/reschap2/Makefile | 2 +- content/reschap2/images/Makefile | 7 +++---- content/reschap3/Makefile | 2 +- content/reschap3/images/Makefile | 7 +++---- declaration/Makefile | 2 +- titlepage/Makefile | 2 +- 12 files changed, 18 insertions(+), 23 deletions(-) diff --git a/abstract/Makefile b/abstract/Makefile index 3b74ceb..b0bd795 100644 --- a/abstract/Makefile +++ b/abstract/Makefile @@ -1,6 +1,6 @@ include ../common.mk -TEXFILES=./*.tex +TEXFILES=$(wildcard *.tex) .PHONY: texfiles $(TEXFILES) diff --git a/content/appendix/Makefile b/content/appendix/Makefile index 29eec3f..264c946 100644 --- a/content/appendix/Makefile +++ b/content/appendix/Makefile @@ -1,6 +1,6 @@ include ../../common.mk -TEXFILES=./*.tex +TEXFILES=$(wildcard *.tex) .PHONY: texfiles $(TEXFILES) diff --git a/content/conclusion/Makefile b/content/conclusion/Makefile index 29eec3f..264c946 100644 --- a/content/conclusion/Makefile +++ b/content/conclusion/Makefile @@ -1,6 +1,6 @@ include ../../common.mk -TEXFILES=./*.tex +TEXFILES=$(wildcard *.tex) .PHONY: texfiles $(TEXFILES) diff --git a/content/introduction/Makefile b/content/introduction/Makefile index 29eec3f..264c946 100644 --- a/content/introduction/Makefile +++ b/content/introduction/Makefile @@ -1,6 +1,6 @@ include ../../common.mk -TEXFILES=./*.tex +TEXFILES=$(wildcard *.tex) .PHONY: texfiles $(TEXFILES) diff --git a/content/reschap1/Makefile b/content/reschap1/Makefile index 29eec3f..264c946 100644 --- a/content/reschap1/Makefile +++ b/content/reschap1/Makefile @@ -1,6 +1,6 @@ include ../../common.mk -TEXFILES=./*.tex +TEXFILES=$(wildcard *.tex) .PHONY: texfiles $(TEXFILES) diff --git a/content/reschap1/images/Makefile b/content/reschap1/images/Makefile index 3036bf6..71635ca 100644 --- a/content/reschap1/images/Makefile +++ b/content/reschap1/images/Makefile @@ -1,9 +1,6 @@ include ../../../common.mk -TEXFILES=./1way_coupling_prescribed_rotation \ -./fem_basis_function_linear_cg \ -./fem_basis_function_constant_dg -# add more files if needed +TEXFILES=$(wildcard *.tex) .PHONY: all .PHONY: clean @@ -14,8 +11,8 @@ all: texfiles texfiles: $(TEXFILES) $(TEXFILES): @echo "running ${@}.tex" - ${LATEX} ${LATEXOPT} ${@}.tex - if fgrep ${LATEXLABELCHG} ${@}.log; then make $@; fi + ${LATEX} ${LATEXOPT} ${@} + if fgrep ${LATEXLABELCHG} ${@:.tex=.log}; then make $@; fi clean: -rm *.aux *.log *.pdf diff --git a/content/reschap2/Makefile b/content/reschap2/Makefile index 29eec3f..264c946 100644 --- a/content/reschap2/Makefile +++ b/content/reschap2/Makefile @@ -1,6 +1,6 @@ include ../../common.mk -TEXFILES=./*.tex +TEXFILES=$(wildcard *.tex) .PHONY: texfiles $(TEXFILES) diff --git a/content/reschap2/images/Makefile b/content/reschap2/images/Makefile index 78c7c40..71635ca 100644 --- a/content/reschap2/images/Makefile +++ b/content/reschap2/images/Makefile @@ -1,7 +1,6 @@ include ../../../common.mk -TEXFILES= -# add more files if needed +TEXFILES=$(wildcard *.tex) .PHONY: all .PHONY: clean @@ -12,8 +11,8 @@ all: texfiles texfiles: $(TEXFILES) $(TEXFILES): @echo "running ${@}.tex" - ${LATEX} ${LATEXOPT} ${@}.tex - if fgrep ${LATEXLABELCHG} ${@}.log; then make $@; fi + ${LATEX} ${LATEXOPT} ${@} + if fgrep ${LATEXLABELCHG} ${@:.tex=.log}; then make $@; fi clean: -rm *.aux *.log *.pdf diff --git a/content/reschap3/Makefile b/content/reschap3/Makefile index 29eec3f..264c946 100644 --- a/content/reschap3/Makefile +++ b/content/reschap3/Makefile @@ -1,6 +1,6 @@ include ../../common.mk -TEXFILES=./*.tex +TEXFILES=$(wildcard *.tex) .PHONY: texfiles $(TEXFILES) diff --git a/content/reschap3/images/Makefile b/content/reschap3/images/Makefile index 78c7c40..71635ca 100644 --- a/content/reschap3/images/Makefile +++ b/content/reschap3/images/Makefile @@ -1,7 +1,6 @@ include ../../../common.mk -TEXFILES= -# add more files if needed +TEXFILES=$(wildcard *.tex) .PHONY: all .PHONY: clean @@ -12,8 +11,8 @@ all: texfiles texfiles: $(TEXFILES) $(TEXFILES): @echo "running ${@}.tex" - ${LATEX} ${LATEXOPT} ${@}.tex - if fgrep ${LATEXLABELCHG} ${@}.log; then make $@; fi + ${LATEX} ${LATEXOPT} ${@} + if fgrep ${LATEXLABELCHG} ${@:.tex=.log}; then make $@; fi clean: -rm *.aux *.log *.pdf diff --git a/declaration/Makefile b/declaration/Makefile index 3b74ceb..b0bd795 100644 --- a/declaration/Makefile +++ b/declaration/Makefile @@ -1,6 +1,6 @@ include ../common.mk -TEXFILES=./*.tex +TEXFILES=$(wildcard *.tex) .PHONY: texfiles $(TEXFILES) diff --git a/titlepage/Makefile b/titlepage/Makefile index 3b74ceb..b0bd795 100644 --- a/titlepage/Makefile +++ b/titlepage/Makefile @@ -1,6 +1,6 @@ include ../common.mk -TEXFILES=./*.tex +TEXFILES=$(wildcard *.tex) .PHONY: texfiles $(TEXFILES)