From d26535d6665879f77d39e790b4aa9ee0dcb63dcf Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Wed, 14 Feb 2018 14:13:36 +0100 Subject: Sanity checks added, local settings now in LOCAL.mk.in The choice of whether or not to make a PDF is now also a local system issue, not a general pipeline issue. So it has been put in the new `LOCAL.mk.in' file which replaces the old `DIRECTORIES.mk.in'. All local settings (things that when changed should not be version-controlled) should be defined in this file. A sanity check was added to find if `./configure' has been run before `make' or not (using the `LOCAL.mk' file which is an output of the configuration step). If `LOCAL.mk' doesn't exist, an error will be printed informing the user that `./configure' needs to be run first. The configure script also provides more clear and hopefully better information on its purpose and what must be done. Since `make clean', it is executed even when `./configure' hasn't been run, it will only delete the build directory and its contents when local configuration has been done. A `distclean' target was also added which will first "clean" the pipeline, then delete the `LOCAL.mk.in' file. To allow rules like `make' to be run even if `BDIR' isn't defined (`./configure' hasn't been run yet), a fake `BDIR' is defined in such cases. --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 357a2e0..051332b 100644 --- a/Makefile +++ b/Makefile @@ -85,16 +85,17 @@ include $(foreach f, initialize download paper, reproduce/src/make/$(f).mk) # try to be remade on every call and `ln' will complain and abort). # # Note that if you don't want the final PDF and just want the processing -# and file outputs, you can remove the value of the `pdf-compile' variable -# in `reproduce/config/pipeline/pdf.mk'. +# and file outputs, you can remove the value of the `BUILD-FINAL-PDF' +# variable in `reproduce/config/LOCAL.mk'. tex/pipeline.tex: $(foreach f, initialize download, $(mtexdir)/$(f).tex) \ | $(bdirsym) # If no PDF is requested, then just exit here. -ifeq ($(pdf-compile),) +ifeq ($(BUILD-FINAL-PDF),) @echo; @echo "Everything is OK until this point, but not building PDF." - @echo "To do so, give a value to the 'pdf-compile' variable." + @echo "To do so, give a value to the 'BUILD-FINAL-PDF' variable." + @echo "It is defined in 'reproduce/config/pipeline/LOCAL.mk'." @echo; @exit 1 endif -- cgit v1.2.1