aboutsummaryrefslogtreecommitdiff
path: root/reproduce/analysis
diff options
context:
space:
mode:
Diffstat (limited to 'reproduce/analysis')
-rw-r--r--reproduce/analysis/make/initialize.mk36
-rw-r--r--reproduce/analysis/make/paper.mk2
-rw-r--r--reproduce/analysis/make/top.mk16
3 files changed, 12 insertions, 42 deletions
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk
index a034494..5f8a062 100644
--- a/reproduce/analysis/make/initialize.mk
+++ b/reproduce/analysis/make/initialize.mk
@@ -187,14 +187,14 @@ clean: clean-mmap
# features like ignoring the listing of a file with `!()' that we
# are using afterwards.
shopt -s extglob
- rm -rf $(BDIR)/!(dependencies)
+ rm -rf $(BDIR)/!(software)
distclean: clean
# We'll be deleting the built environent programs and just need the
# `rm' program. So for this recipe, we'll use the host system's
# `rm', not our own.
- $(sys-rm) -rf $(BDIR) reproduce/build
- $(sys-rm) -f Makefile .gnuastro .local
+ $(sys-rm) -rf $(BDIR)
+ $(sys-rm) -f Makefile .gnuastro .local .build
$(sys-rm) -f $(pconfdir)/LOCAL.mk $(gconfdir)/gnuastro-local.conf
@@ -295,36 +295,6 @@ dist-zip: $(packagecontents)
-# Check the version of programs which write their version
-# -------------------------------------------------------
-pvcheck = prog="$(strip $(1))"; \
- ver="$(strip $(2))"; \
- name="$(strip $(3))"; \
- macro="$(strip $(4))"; \
- verop="$(strip $(5))"; \
- if [ "x$$verop" = x ]; then V="--version"; else V=$$verop; fi; \
- v=$$($$prog $$V | awk '/'$$ver'/{print "y"; exit 0}'); \
- if [ x$$v != xy ]; then \
- echo; echo "PROJECT ERROR: Not running $$name $$ver"; echo; \
- exit 1; \
- fi; \
- echo "\newcommand{\\$$macro}{$$ver}" >> $@
-
-lvcheck = idir=$(BDIR)/dependencies/installed/include; \
- f="$$idir/$(strip $(1))"; \
- ver="$(strip $(2))"; \
- name="$(strip $(3))"; \
- macro="$(strip $(4))"; \
- v=$$(awk '/^\#/&&/define/&&/'$$ver'/{print "y";exit 0}' $$f); \
- if [ x$$v != xy ]; then \
- echo; echo "PROJECT ERROR: Not linking with $$name $$ver"; \
- echo; exit 1; \
- fi; \
- echo "\newcommand{\\$$macro}{$$ver}" >> $@
-
-
-
-
# Project initialization results
# ------------------------------
#
diff --git a/reproduce/analysis/make/paper.mk b/reproduce/analysis/make/paper.mk
index 549b7c0..c1d5b33 100644
--- a/reproduce/analysis/make/paper.mk
+++ b/reproduce/analysis/make/paper.mk
@@ -118,7 +118,7 @@ $(texbdir)/paper.bbl: tex/src/references.tex $(mtexdir)/dependencies-bib.tex \
# to run everything cleanly from there, it is necessary to add the current
# directory (top project directory) to the `TEXINPUTS' environment
# variable.
-paper.pdf: $(mtexdir)/project.tex paper.tex $(texbdir)/paper.bbl \
+paper.pdf: $(mtexdir)/project.tex paper.tex $(texbdir)/paper.bbl \
| $(tikzdir) $(texbdir)
# If `$(mtexdir)/project.tex' is empty, don't build the PDF.
diff --git a/reproduce/analysis/make/top.mk b/reproduce/analysis/make/top.mk
index a85c530..b753979 100644
--- a/reproduce/analysis/make/top.mk
+++ b/reproduce/analysis/make/top.mk
@@ -68,12 +68,12 @@ ifeq (x$(reproducible_paper_group_name),x$(GROUP-NAME))
all: paper.pdf
else
all:
- @if [ "x$(GROUP-NAME)" = x ]; then \
+ @if [ "x$(GROUP-NAME)" = x ]; then \
echo "Project is NOT configured for groups, please run"; \
- echo " $$ .local/bin/make"; \
- else \
- echo "Project is configured for groups, please run"; \
- echo " $$ ./for-group $(GROUP-NAME) make -j8"; \
+ echo " $$ .local/bin/make"; \
+ else \
+ echo "Project is configured for groups, please run"; \
+ echo " $$ ./for-group $(GROUP-NAME) make -j8"; \
fi
endif
@@ -110,9 +110,9 @@ endif
# a `foreach' loop in the next step to explicitly request loading them in
# the same order that they are defined here (we aren't just using a
# wild-card like the configuration Makefiles).
-makesrc = initialize \
- download \
- delete-me \
+makesrc = initialize \
+ download \
+ delete-me \
paper