From 27ff6f7d57ebdd3d3051040b982c1976f990c6e1 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Fri, 17 Jun 2022 12:47:58 +0200 Subject: Initialize: including *.conf files from the preparation phase Until now, when some configuration files were generated in the preparation phase, only the auto-generated (in the preparation phase) Makefiles (with the suffix '*.mk') were always included in 'initialize.mk'. As a consequence, if there were any configuration files (with suffix '*.conf'), they would not be automatically added, and it was necessary to manually include them. Since auto-generated configuration files are also one common output of the preparation phase of a project, it is better to include them automatically. With this commit, the '*.conf' configuration files generated in the preparation phase are added by 'initialize.mk' automatically (if necessary). In the process, the comments in the final target of 'reproduce/analysis/make/prepare.mk' were updated to be more clear. --- reproduce/analysis/make/initialize.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'reproduce/analysis/make/initialize.mk') diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk index 753c70a..eb5f2ff 100644 --- a/reproduce/analysis/make/initialize.mk +++ b/reproduce/analysis/make/initialize.mk @@ -62,13 +62,17 @@ pconfdir = reproduce/analysis/config # should be created, and in the 'make' phase, its contents should be # loaded. # -# If you don't need any preparation, please simply comment these lines. +# If your project doesn't need any preparation, you can ignore this. ifeq (x$(project-phase),xprepare) $(prepdir):; mkdir $@ else include $(bsdir)/preparation-done.mk ifeq (x$(include-prepare-results),xyes) -include $(prepdir)/*.mk +# The '-' behind the include is The '-' is used for adding the files only +# if it is possible (they exist). This is necessary because sometimes the +# user will have only '*.conf' or '*.mk' files. So, if the '-' is not used, +# Make will complain about not finding these files. +-include $(prepdir)/*.mk $(prepdir)/*.conf endif endif -- cgit v1.2.1