From ca14b62964828f8268945ed22a9446f02074d251 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 17:08:24 -0400 Subject: moved makefile to makefile.orig --- Makefile.orig | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 Makefile.orig (limited to 'Makefile.orig') diff --git a/Makefile.orig b/Makefile.orig new file mode 100644 index 0000000..f55bb12 --- /dev/null +++ b/Makefile.orig @@ -0,0 +1,64 @@ +.POSIX: +.SUFFIXES: .tex .pdf + +DIRS = outputs graph +PDFS = poster/document.pdf report/document.pdf logbook/document.pdf +pdfs: outputs/poster.pdf outputs/report.pdf outputs/logbook.pdf +$(DIRS): + mkdir -p $@ + +outputs/poster.pdf: poster/document.pdf outputs + cp -f $< $@ +outputs/report.pdf: report/document.pdf outputs + cp -f $< $@ +outputs/logbook.pdf: logbook/document.pdf outputs + cp -f $< $@ + +png: outputs/poster.png +clean: + rm -rf imgs gen/tables.tex $(DIRS) data/tables.tex $(PDFS) + +imgs: python/data.py python/img.py + mkdir -p imgs + cd imgs && \ + python3 ../python/img.py + +graph/depth_width.png: python/data.py python/depwid.py graph + cd graph && python3 ../python/depwid.py + +graph/nearest_neighbor.png: python/data.py python/neighbor.py graph + cd graph && python3 ../python/neighbor.py + +graph/made: graph/depth_width.png graph/nearest_neighbor.png graph + touch graph/made + +outputs/poster.png: outputs/poster.pdf outputs + gs -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf + +$(PDFS): gen/tables.tex imgs graph/made + +.tex.pdf: + cd ${@D} && \ + pdftex document.tex >/dev/null + rm ${@D}/document.log + +poster/document.pdf: poster/abstract.tex poster/analysis.tex poster/conclusion.tex poster/document.tex poster/format.tex poster/hypothesis.tex poster/imagesfive.tex poster/imagesfour.tex poster/imagesone.tex poster/imagesthree.tex poster/imagestwo.tex poster/materials.tex poster/methods.tex poster/notes.tex poster/palette.tex poster/research.tex poster/results.tex poster/vars.tex poster/voronoi.tex + +report/document.pdf: report/abstract.tex report/analysis.tex report/biblio.tex report/conclusion.tex report/document.tex report/format.tex report/graphs.tex report/intro.tex report/materials.tex report/pics.tex report/procedure.tex report/research.tex report/tables.tex + +logbook/document.pdf: logbook/biblio.tex logbook/bulletnotes.tex logbook/conclusion.tex logbook/document.tex logbook/hypothesis.tex logbook/mats.tex logbook/methods.tex logbook/research.tex logbook/vars.tex + +gen/tables.tex: gen/maketables.sh gen/tables.orig.tex + gen/maketables.sh + +poster/document.pdf: outputs/qr-source.png outputs/qr.png +logbook/document.pdf report/document.pdf: generic.tex + +logbook/tables.tex poster/tables.tex: data/tables.tex + +outputs/qr.png: outputs + qrencode https://hrhr.dev/report.pdf -o outputs/qr.png + +outputs/qr-source.png: outputs + qrencode https://git.hrhr.dev/scifair -o outputs/qr-source.png + -- cgit From 090dc2da6abd7dfcb9ab22559ccb684700148794 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 17:32:38 -0400 Subject: ./configure replaces manual tex search --- Makefile.orig | 7 ------- 1 file changed, 7 deletions(-) (limited to 'Makefile.orig') diff --git a/Makefile.orig b/Makefile.orig index f55bb12..6d668ef 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -42,12 +42,6 @@ $(PDFS): gen/tables.tex imgs graph/made pdftex document.tex >/dev/null rm ${@D}/document.log -poster/document.pdf: poster/abstract.tex poster/analysis.tex poster/conclusion.tex poster/document.tex poster/format.tex poster/hypothesis.tex poster/imagesfive.tex poster/imagesfour.tex poster/imagesone.tex poster/imagesthree.tex poster/imagestwo.tex poster/materials.tex poster/methods.tex poster/notes.tex poster/palette.tex poster/research.tex poster/results.tex poster/vars.tex poster/voronoi.tex - -report/document.pdf: report/abstract.tex report/analysis.tex report/biblio.tex report/conclusion.tex report/document.tex report/format.tex report/graphs.tex report/intro.tex report/materials.tex report/pics.tex report/procedure.tex report/research.tex report/tables.tex - -logbook/document.pdf: logbook/biblio.tex logbook/bulletnotes.tex logbook/conclusion.tex logbook/document.tex logbook/hypothesis.tex logbook/mats.tex logbook/methods.tex logbook/research.tex logbook/vars.tex - gen/tables.tex: gen/maketables.sh gen/tables.orig.tex gen/maketables.sh @@ -61,4 +55,3 @@ outputs/qr.png: outputs outputs/qr-source.png: outputs qrencode https://git.hrhr.dev/scifair -o outputs/qr-source.png - -- cgit From fd6f2bc4f1c97234b5d3d9989ea5fb4016969622 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 17:57:59 -0400 Subject: generalized python/pdftex/gs and added dep checks --- Makefile.orig | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'Makefile.orig') diff --git a/Makefile.orig b/Makefile.orig index 6d668ef..ed3c2d6 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -3,16 +3,12 @@ DIRS = outputs graph PDFS = poster/document.pdf report/document.pdf logbook/document.pdf +PYTHON = python3 +PDFTEX = pdftex +GHOSTSCRIPT = gs pdfs: outputs/poster.pdf outputs/report.pdf outputs/logbook.pdf $(DIRS): mkdir -p $@ - -outputs/poster.pdf: poster/document.pdf outputs - cp -f $< $@ -outputs/report.pdf: report/document.pdf outputs - cp -f $< $@ -outputs/logbook.pdf: logbook/document.pdf outputs - cp -f $< $@ png: outputs/poster.png clean: @@ -21,25 +17,25 @@ clean: imgs: python/data.py python/img.py mkdir -p imgs cd imgs && \ - python3 ../python/img.py + $(PYTHON) ../python/img.py graph/depth_width.png: python/data.py python/depwid.py graph - cd graph && python3 ../python/depwid.py + cd graph && $(PYTHON) ../python/depwid.py graph/nearest_neighbor.png: python/data.py python/neighbor.py graph - cd graph && python3 ../python/neighbor.py + cd graph && $(PYTHON) ../python/neighbor.py graph/made: graph/depth_width.png graph/nearest_neighbor.png graph touch graph/made outputs/poster.png: outputs/poster.pdf outputs - gs -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf + $(GHOSTSCRIPT) -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf $(PDFS): gen/tables.tex imgs graph/made .tex.pdf: cd ${@D} && \ - pdftex document.tex >/dev/null + $(PDFTEX) document.tex >/dev/null rm ${@D}/document.log gen/tables.tex: gen/maketables.sh gen/tables.orig.tex -- cgit From e56e36cb400c605baeec1f304927f9fe78bd428d Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:15:45 -0400 Subject: generalized gen/ --- Makefile.orig | 3 --- 1 file changed, 3 deletions(-) (limited to 'Makefile.orig') diff --git a/Makefile.orig b/Makefile.orig index ed3c2d6..3f23a3c 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -38,9 +38,6 @@ $(PDFS): gen/tables.tex imgs graph/made $(PDFTEX) document.tex >/dev/null rm ${@D}/document.log -gen/tables.tex: gen/maketables.sh gen/tables.orig.tex - gen/maketables.sh - poster/document.pdf: outputs/qr-source.png outputs/qr.png logbook/document.pdf report/document.pdf: generic.tex -- cgit From 69a6e7cea14d7310d84012b4870eb3464046c6ff Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:26:02 -0400 Subject: outputs/ made into symlink --- Makefile.orig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Makefile.orig') diff --git a/Makefile.orig b/Makefile.orig index 3f23a3c..68f8903 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -1,18 +1,18 @@ .POSIX: .SUFFIXES: .tex .pdf -DIRS = outputs graph PDFS = poster/document.pdf report/document.pdf logbook/document.pdf +QR = outputs/qr.png outputs/qr-source.png PYTHON = python3 PDFTEX = pdftex GHOSTSCRIPT = gs -pdfs: outputs/poster.pdf outputs/report.pdf outputs/logbook.pdf -$(DIRS): - mkdir -p $@ +pdfs: $(PDFS) +graph: + mkdir -p graph png: outputs/poster.png clean: - rm -rf imgs gen/tables.tex $(DIRS) data/tables.tex $(PDFS) + rm -rf imgs graph gen/tables.tex data/tables.tex $(PDFS) $(QR) imgs: python/data.py python/img.py mkdir -p imgs @@ -28,14 +28,14 @@ graph/nearest_neighbor.png: python/data.py python/neighbor.py graph graph/made: graph/depth_width.png graph/nearest_neighbor.png graph touch graph/made -outputs/poster.png: outputs/poster.pdf outputs +outputs/poster.png: poster/document.pdf $(GHOSTSCRIPT) -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf $(PDFS): gen/tables.tex imgs graph/made .tex.pdf: cd ${@D} && \ - $(PDFTEX) document.tex >/dev/null + $(PDFTEX) document.tex rm ${@D}/document.log poster/document.pdf: outputs/qr-source.png outputs/qr.png @@ -43,8 +43,8 @@ logbook/document.pdf report/document.pdf: generic.tex logbook/tables.tex poster/tables.tex: data/tables.tex -outputs/qr.png: outputs +outputs/qr.png: qrencode https://hrhr.dev/report.pdf -o outputs/qr.png -outputs/qr-source.png: outputs +outputs/qr-source.png: qrencode https://git.hrhr.dev/scifair -o outputs/qr-source.png -- cgit From b3cd8f95680e4248d34f283bab94db8ba721f2b1 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:28:48 -0400 Subject: removed trailing nl --- Makefile.orig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.orig') diff --git a/Makefile.orig b/Makefile.orig index 68f8903..24db337 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -9,7 +9,7 @@ GHOSTSCRIPT = gs pdfs: $(PDFS) graph: mkdir -p graph - + png: outputs/poster.png clean: rm -rf imgs graph gen/tables.tex data/tables.tex $(PDFS) $(QR) -- cgit From 48649e6423710ab1ce56ef1bec2310c363aebde3 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:33:18 -0400 Subject: symlinked datatables --- Makefile.orig | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile.orig') diff --git a/Makefile.orig b/Makefile.orig index 24db337..4159232 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -41,8 +41,6 @@ $(PDFS): gen/tables.tex imgs graph/made poster/document.pdf: outputs/qr-source.png outputs/qr.png logbook/document.pdf report/document.pdf: generic.tex -logbook/tables.tex poster/tables.tex: data/tables.tex - outputs/qr.png: qrencode https://hrhr.dev/report.pdf -o outputs/qr.png -- cgit From d6ed0246fef2253ad8f4c4e98fcf27c016bdbd37 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:42:16 -0400 Subject: reorganized makefile --- Makefile.orig | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Makefile.orig') diff --git a/Makefile.orig b/Makefile.orig index 4159232..b0a3d3e 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -6,10 +6,8 @@ QR = outputs/qr.png outputs/qr-source.png PYTHON = python3 PDFTEX = pdftex GHOSTSCRIPT = gs -pdfs: $(PDFS) -graph: - mkdir -p graph +pdfs: $(PDFS) png: outputs/poster.png clean: rm -rf imgs graph gen/tables.tex data/tables.tex $(PDFS) $(QR) @@ -19,19 +17,20 @@ imgs: python/data.py python/img.py cd imgs && \ $(PYTHON) ../python/img.py +graph: + mkdir -p graph + +GRAPH = graph/depth_width.png graph/nearest_neighbor.png graph/depth_width.png: python/data.py python/depwid.py graph cd graph && $(PYTHON) ../python/depwid.py graph/nearest_neighbor.png: python/data.py python/neighbor.py graph cd graph && $(PYTHON) ../python/neighbor.py -graph/made: graph/depth_width.png graph/nearest_neighbor.png graph - touch graph/made - outputs/poster.png: poster/document.pdf $(GHOSTSCRIPT) -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf -$(PDFS): gen/tables.tex imgs graph/made +$(PDFS): gen/tables.tex imgs $(GRAPH) .tex.pdf: cd ${@D} && \ -- cgit