Cleaning the examples' Makefiles and octaves scripts.

[Faustine.git] / examples / 2d_fft / Makefile

diff --git a/examples/2d_fft/Makefile b/examples/2d_fft/Makefile
index 163b306..1ab7a84 100644 (file)
--- a/examples/2d_fft/Makefile
+++ b/examples/2d_fft/Makefile
@@ -1,10 +1,23 @@
 SRC = fft2d.dsp
 SRC = fft2d.dsp

-INPUT = hcosine-32.csv
+IMGIN = hcosine-32.png
+LINES = 32

 
 

-all: clean fft2d
+BASENAME = output
+FORMAT = csv
+CSVIN = $(IMGIN:.png=.csv)
+CSVOUT = $(BASENAME)1.$(FORMAT)
+IMGOUT = $(SRC:.dsp=.png)

 
 

-fft2d: $(SRC) $(INPUT)
-       faustine -d $(SRC) -i $(INPUT) --oformat csv
+all: $(IMGOUT)
+
+$(IMGOUT): $(CSVOUT)
+       octave -qf img_write.m
+
+$(CSVOUT): $(SRC) $(CSVIN)
+       faustine -d $(SRC) -i $(CSVIN) -t $(LINES) --oformat $(FORMAT) --obasename $(BASENAME)
+
+$(CSVIN): $(IMGIN)
+       octave -qf img_read.m

 
 clean::
 
 clean::

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