manus_continuum_granular1_exp

commit e67662e737625ad9ae464b8af4f75eeca37387d4
parent ddc356cbfb5d4d49f127f9de046bf59646b70cf6
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Tue, 25 Jun 2019 10:09:15 +0200

Put figure PDFs in root directory

Diffstat:
M
Makefile
 | 
11
++++++++---
M
fig1/Makefile
 | 
6
+++---

2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,10 +1,11 @@
 REPO = 1d_fd_simple_shear
-FIGURES := $(wildcard fig*/)
+FIGDIRS := $(wildcard fig*/)
+FIGURES := $(FIGDIRS:/=).pdf
 
 default: $(FIGURES)
 
-fig%/fig%.pdf:
-	make -C 
+fig%.pdf: fig%
+	make -C fig%
 
 $(REPO)/$(REPO): $(REPO)/Makefile
 	make -C $(REPO)
@@ -12,7 +13,11 @@ $(REPO)/$(REPO): $(REPO)/Makefile
 $(REPO)/Makefile:
 	git submodule update --init --recursive
 
+print-%:
+	@echo '$*=$($*)'
+
 clean:
 	$(RM) -r $(REPO)/
+	$(RM) -r fig*.pdf
 
 .PHONY: default figures clean
diff --git a/fig1/Makefile b/fig1/Makefile
@@ -1,12 +1,12 @@
 BIN = ../1d_fd_simple_shear/1d_fd_simple_shear
 FIG = fig1
 
-default: $(FIG).pdf
+default: ../$(FIG).pdf
 
 # mimic Iverson 2010 fig 2a
 # shear-strain rate from 10^1 to 10^6 m/a
 # friction around 0.55
-$(FIG).pdf: fig.gp
+../$(FIG).pdf: fig.gp
 	/bin/bash -c '\
 	for b in $$(printf "0.01\n0.10\n"; seq 0.20 0.20 0.90) 0.94; do \
 		out="out_b$${b}.txt"; \
@@ -20,6 +20,6 @@ $(FIG).pdf: fig.gp
 
 clean:
 	$(RM) *.txt
-	$(RM) $(FIG).pdf
+	$(RM) ../$(FIG).pdf
 
 .PHONY: default clean