X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/blobdiff_plain/dbded051d69cc5ba556884eb285feba032e09d29..02c1ef905d2101df872ccccccb2e4c7c0a508571:/examples/dilation/Makefile?ds=inline

diff --git a/examples/dilation/Makefile b/examples/dilation/Makefile
index 43cdf34..ef567ac 100644
--- a/examples/dilation/Makefile
+++ b/examples/dilation/Makefile
@@ -2,22 +2,26 @@ SRC = dilation.dsp
 IMGIN = letter_j.png
 LINES = 150
 
-BASENAME = output
-FORMAT = csv
+BASENAME = $(SRC:.dsp=)
+FORMAT = nst
+FILEOUT = $(BASENAME).$(FORMAT)
+CSVOUT = dilation.csv
 CSVIN = $(IMGIN:.png=.csv)
-CSVOUT = $(BASENAME)1.$(FORMAT)
 IMGOUT = $(SRC:.dsp=.png)
 
-all: $(IMGOUT)
+all: $(IMGOUT) #$(FILEOUT)
 
 $(IMGOUT): $(CSVOUT)
 	octave -qf img_write.m
 
+$(FILEOUT): $(SRC) $(CSVIN)
+	faustine -f $(SRC) -l $(LINES) < $(CSVIN) 1> $@
+
 $(CSVOUT): $(SRC) $(CSVIN)
-	faustine -d $(SRC) -i $(CSVIN) -t $(LINES) --oformat $(FORMAT) --obasename $(BASENAME)
+	faustine -f $(SRC) -l $(LINES) < $(CSVIN) 1> $@
 
 $(CSVIN): $(IMGIN)
 	octave -qf img_read.m
 
 clean::
-	rm -f gmon.out $(IMGOUT) $(BASENAME)* *csv
+	rm -f gmon.out $(IMGOUT) $(CSVOUT)