Changeset bd72f517 for doc/theses/mike_brooks_MMath/Makefile

Timestamp:

May 13, 2025, 1:17:50 PM (10 months ago)

Author:

Mike Brooks <mlbrooks@…>

Branches:

master, stuck-waitfor-destruct

Children:

0528d79

Parents:

7d02d35 (diff), 2410424 (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) (5 diffs)

doc/theses/mike_brooks_MMath/Makefile

@@ -13 +13 @@
 TeXSRC = ${wildcard *.tex}
 PicSRC = ${notdir ${wildcard ${Pictures}/*.png}} ${notdir ${wildcard ${Pictures}/*.fig}}
-PicSRC := ${PicSRC:.fig=.pdf}           # substitute ".fig" 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}}
+PicSRC := ${PicSRC:.fig=.pdf}                   # substitute ".fig" with ".pdf"
 PlotSRC = ${notdir ${wildcard ${Plots}/*.gp}}
-PlotSRC := ${addprefix ${Build}/plot-,${PlotSRC:.gp=.pdf}}              # substitute ".gp" with ".pdf"
+PlotSRC := ${addprefix ${Build}/plot-,${PlotSRC:.gp=.pdf}} # substitute ".gp" with ".pdf"
 DemoPgmSRC = ${notdir ${wildcard ${Programs}/*-demo.cfa}}
 PgmSRC = ${notdir ${wildcard ${Programs}/*}}
@@ -49 +45 @@
 # Rules and Recipes
 
-.PHONY : all clean                      # not file names
+.PHONY : all clean                              # not file names
 .SECONDARY:
 #.PRECIOUS : ${Build}/%                         # don't delete intermediates
@@ -61 +57 @@
 # File Dependencies
 
-${DOCUMENT}: ${TeXSRC} $(RunPgmOut) ${DemoPgmOut} ${GraphSRC_OLD} ${PlotSRC} ${PicSRC} ${BibSRC} ${BibRep}/pl.bib ${LaTMac}/common.tex Makefile | ${Build}
+${DOCUMENT}: ${TeXSRC} $(RunPgmOut) ${DemoPgmOut} ${PlotSRC} ${PicSRC} ${BibSRC} ${BibRep}/pl.bib ${LaTMac}/common.tex Makefile | ${Build}
         echo ${PicSRC}
         echo ${GraphSRC_OLD}
@@ -82 +78 @@
         ${CFA} $< -o $@
 
-${Build}/%: ${Programs}/%.run.cfa | ${Build} # cfa cannot handle pipe
+${Build}/%: ${Programs}/%.run.cfa | ${Build}    # cfa cannot handle pipe
         sed -f ${Programs}/sedcmd $< > ${Build}/tmp.cfa; ${CFA} ${Build}/tmp.cfa -o $@
 
@@ -94 +90 @@
         $< > $@
 
-string-graph-peq-sharing.pdf: string-graph-peq-sharing.dat plot-peq-sharing.gp | ${Build}
-        gnuplot plot-peq-sharing.gp
-
-string-graph-pta-sharing.pdf: string-graph-pta-sharing.dat plot-pta-sharing.gp | ${Build}
-        gnuplot plot-pta-sharing.gp
-
-string-graph-pbv.pdf: string-graph-pbv.dat plot-pbv.gp | ${Build}
-        gnuplot plot-pbv.gp
-
-string-graph-allocn.pdf: string-graph-allocn.dat plot-allocn.gp | ${Build}
-        gnuplot plot-allocn.gp
-
 %.pdf: %.fig | ${Build}
         fig2dev -L pdf $< > ${Build}/$@
 
--include $(Plots)/string-peq-cppemu.d
+-include $(Plots)/*.d
 
 ${Build}/plot-%.dat: ${Plots}/%.py ${Plots}/%.py.INPUTS | ${Build}
-        echo ${PlotINPUTS}      
         python3 $< > $@