Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

[Faustine.git] / examples / dilation / Makefile

diff --git a/examples/dilation/Makefile b/examples/dilation/Makefile
index 43cdf34..93a2ece 100644 (file)
--- a/examples/dilation/Makefile
+++ b/examples/dilation/Makefile
@@ -2,10 +2,8 @@ SRC = dilation.dsp
 IMGIN = letter_j.png
 LINES = 150
 
 IMGIN = letter_j.png
 LINES = 150
 

-BASENAME = output
-FORMAT = csv
+CSVOUT = dilation.csv

 CSVIN = $(IMGIN:.png=.csv)
 CSVIN = $(IMGIN:.png=.csv)

-CSVOUT = $(BASENAME)1.$(FORMAT)

 IMGOUT = $(SRC:.dsp=.png)
 
 all: $(IMGOUT)
 IMGOUT = $(SRC:.dsp=.png)
 
 all: $(IMGOUT)


@@ -14,10 +12,10 @@ $(IMGOUT): $(CSVOUT)
        octave -qf img_write.m
 
 $(CSVOUT): $(SRC) $(CSVIN)
        octave -qf img_write.m
 
 $(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::
 
 $(CSVIN): $(IMGIN)
        octave -qf img_read.m
 
 clean::

-       rm -f gmon.out $(IMGOUT) $(BASENAME)* *csv
+       rm -f gmon.out $(IMGOUT) $(CSVOUT)