From 2b146b8391fd5ca9c8c70d7530ad3968721324e9 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 21 Jan 2021 03:33:31 -0500 Subject: have a complete build for secondary docs, but tables and imgs not fully integrated --- Makefile | 54 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 152d80b..988cc35 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,11 @@ PDFTEX = pdftex PY = python3 -all: report.pdf poster.pdf logbook.pdf report2.pdf poster2.pdf \ +PDF = report.pdf poster.pdf logbook.pdf report2.pdf poster2.pdf \ logbook2.pdf +all: $(PDF) + +TABLE = gen/deathtable.i gen/deathtable2.i gen/table.i gen/pvals.i clean: rm -rf {report,poster,logbook}{,2}.{pdf,log} qr gen graph imgs @@ -19,25 +22,48 @@ qr: qrencode http://hrhr.dev/report.pdf -o qr/pdf.png qrencode http://git.hrhr.dev/scifair/about -o qr/git.png -report.pdf: report.tex src/abstract.i src/intro.i src/methods.i \ -src/analysis.i report/graphs.i report/pics.i src/biblio.i +report.pdf: src/abstract.i src/intro.i src/methods.i src/analysis.i \ +report/graphs.i report/pics.i src/biblio.i -poster.pdf: poster.tex qr fmt/multicol.h src/hypo.i src/abstr.i src/methods.i \ -poster/voronoi.i src/results.i src/vars.i src/notes.i src/analysis.i \ +poster.pdf: qr fmt/multicol.h src/hypo.i src/abstr.i src/methods.i \ +poster/voronoi.i poster/results.i src/vars.i src/notes.i src/analysis.i\ poster/img1.i poster/img2.i poster/img3.i poster/img4.i poster/img5.i \ img/diagram.jpg img/2019-12-13-3.jpg img/c.jpg img/a.jpg img/code.png -logbook.pdf: logbook.tex src/biblio.i src/hypo.i src/vars.i \ -src/methods.i src/bullets.i +logbook.pdf: src/biblio.i src/hypo.i src/vars.i src/methods.i \ +src/bullets.i + +report2.pdf: src/abstr2.i src/intro2.i src/research2.i \ +src/methods2.i src/mats2.i src/analysis2.i src/conc2.i report2/graphs.i\ +report2/tables.i report2/pics.i imgs graph/depth_width.png \ +graph/nearest_neighbor.png + +poster2.pdf: src/hypo2.i src/abstr2.i poster2/img1.i poster2/img2.i \ +poster2/img3.i poster2/img4.i poster2/img5.i src/research2.i \ +src/mats2.i src/methods2.i src/vars2.i img/obstacle-large.jpg \ +img/2019-10-18-1.jpg img/2019-12-13-2.jpg \ +img/final-settlement-fake-pits.jpg img/2019-12-13-3.jpg \ +img/overhead-fake-pits.jpg img/Overhead-with-obstacle.jpg \ +img/corner-settle.jpg img/fake-pits.jpg img/a.jpg img/code.png + +logbook2.pdf: src/research2.i src/biblio.i src/hypo2.i src/mats2.i \ +src/vars2.i src/methods2.i imgs graph/depth_width.png \ +graph/nearest_neighbor.png report/tables.i src/conc2.i src/bullets.i report.pdf logbook.pdf: img/2019-10-30-1.jpg img/2019-11-21-1.jpg \ img/2019-11-21-2.jpg img/2019-11-21-3.jpg img/2019-12-02-1.jpg src/conc.i \ img/2019-12-13-1.jpg img/2019-12-13-3.rot.jpg fmt/doc.h report/tables.i -report.pdf poster.pdf logbook.pdf: fmt/com.h imgs graph/made \ -tables.i gen/deathtable.i gen/table.i fmt/font.h src/mats.i \ -img/2019-12-02-2.jpg img/2019-10-18-2.jpg img/2019-10-18-1.jpg \ -img/2019-11-21-4.jpg img/2019-12-13-2.jpg +poster2.pdf: imgs + +report.pdf poster.pdf logbook.pdf: imgs graph/made \ +tables.i fmt/font.h src/mats.i img/2019-12-02-2.jpg \ +img/2019-10-18-2.jpg img/2019-10-18-1.jpg img/2019-11-21-4.jpg \ +img/2019-12-13-2.jpg + +report2.pdf logbook2.pdf: fmt/doc.h + +$(PDF): $(TABLE) fmt/com.h imgs: py/data.py py/img.py mkdir -p imgs @@ -50,9 +76,15 @@ gen/dir: gen/deathtable.i: py/data.py py/deathtable.py gen/dir $(PY) py/deathtable.py > gen/deathtable.i +gen/deathtable2.i: py/data2.py py/deathtable2.py gen/dir + $(PY) py/deathtable2.py > gen/deathtable2.py + gen/table.i: py/data.py py/table.py gen/dir $(PY) py/table.py > gen/table.i +gen/pvals.i: py/data2.py py/pvals.py gen/dir + $(PY) py/pvals.py > gen/pvals.i + graph/dir: mkdir -p graph touch graph/dir -- cgit