Changeset 65bd3c2 for doc/theses/mike_brooks_MMath/Makefile

Timestamp:

Apr 25, 2025, 7:40:22 AM (11 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master, stuck-waitfor-destruct

Children:

ae0c1c3

Parents:

6b33e89 (diff), f85de47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• doc/theses/mike_brooks_MMath/Makefile (modified) (6 diffs)

doc/theses/mike_brooks_MMath/Makefile

@@ -2 +2 @@
 
 Build = build
+
+Benchmarks = benchmarks
 Pictures = pictures
+Plots = plots
 Programs = programs
 
@@ -11 +14 @@
 PicSRC = ${notdir ${wildcard ${Pictures}/*.png}} ${notdir ${wildcard ${Pictures}/*.fig}}
 PicSRC := ${PicSRC:.fig=.pdf}           # substitute ".fig" with ".pdf"
-GraphSRC = ${notdir ${wildcard ${Pictures}/*.dat}}
-GraphSRC := ${GraphSRC:.dat=.pdf}               # substitute ".dat" with ".pdf"
+GraphSRC_OLD = ${notdir ${wildcard ${Pictures}/*.dat}}
+GraphSRC_OLD := ${GraphSRC_OLD:.dat=.pdf}               # substitute ".dat" with ".pdf"
+PlotINPUTS = ${wildcard ${Plots}/*.gp} ${wildcard ${Plots}/*.py}
+PlotINPUTS := ${addsuffix .INPUTS,${PlotINPUTS}}
+PlotSRC = ${notdir ${wildcard ${Plots}/*.gp}}
+PlotSRC := ${addprefix ${Build}/plot-,${PlotSRC:.gp=.pdf}}              # substitute ".gp" with ".pdf"
 DemoPgmSRC = ${notdir ${wildcard ${Programs}/*-demo.cfa}}
 PgmSRC = ${notdir ${wildcard ${Programs}/*}}
@@ -42 +49 @@
 # Rules and Recipes
 
-.PHONY : all clean                              # not file names
+.PHONY : all clean                      # not file names
 .SECONDARY:
 #.PRECIOUS : ${Build}/%                         # don't delete intermediates
@@ -54 +61 @@
 # File Dependencies
 
-${DOCUMENT}: ${TeXSRC} $(RunPgmOut) ${DemoPgmOut} ${GraphSRC} ${PicSRC} ${BibSRC} ${BibRep}/pl.bib ${LaTMac}/common.tex Makefile | ${Build}
+${DOCUMENT}: ${TeXSRC} $(RunPgmOut) ${DemoPgmOut} ${GraphSRC_OLD} ${PlotSRC} ${PicSRC} ${BibSRC} ${BibRep}/pl.bib ${LaTMac}/common.tex Makefile | ${Build}
         echo ${PicSRC}
-        echo ${GraphSRC}
+        echo ${GraphSRC_OLD}
         ${LaTeX} ${BASE}
         ${BibTeX} ${Build}/${BASE}
@@ -87 +94 @@
         $< > $@
 
-string-graph-peq-cppemu.pdf: string-graph-peq-cppemu.dat plot-peq-cppemu.gp | ${Build}
-        gnuplot plot-peq-cppemu.gp
-
 string-graph-peq-sharing.pdf: string-graph-peq-sharing.dat plot-peq-sharing.gp | ${Build}
         gnuplot plot-peq-sharing.gp
@@ -105 +109 @@
         fig2dev -L pdf $< > ${Build}/$@
 
+-include $(Plots)/string-peq-cppemu.d
+
+${Build}/plot-%.dat: ${Plots}/%.py ${Plots}/%.py.INPUTS | ${Build}
+        echo ${PlotINPUTS}      
+        python3 $< > $@
+
+${Build}/plot-%.pdf: ${Plots}/%.gp ${Plots}/%.gp.INPUTS | ${Build}
+        gnuplot $<
+
 #-include ${Build}/*.d