Nested vectors are implemented, including parser and class nstio.

[Faustine.git] / examples / fft / Makefile

diff --git a/examples/fft/Makefile b/examples/fft/Makefile
index 8194124..67d69cc 100644 (file)
--- a/examples/fft/Makefile
+++ b/examples/fft/Makefile
@@ -4,16 +4,11 @@ FORMAT = csv
 CSVOUT = $(BASENAME)1.$(FORMAT)
 IMGOUT = $(SRC:.dsp=.png)
 
 CSVOUT = $(BASENAME)1.$(FORMAT)
 IMGOUT = $(SRC:.dsp=.png)
 

-SINS = four_sins.dsp
-WAV_BASENAME = $(SINS:.dsp=)
+SINSUM = sinsum.dsp
+WAV_BASENAME = $(SINSUM:.dsp=)

 WAV_FORMAT = wav
 WAVIN = $(WAV_BASENAME)1.$(WAV_FORMAT)
 WAV_FORMAT = wav
 WAVIN = $(WAV_BASENAME)1.$(WAV_FORMAT)

-
-INPUT1 = sin_1378Hz_0.005_ampli_128samples.wav
-INPUT2 = sin_2067Hz_0.005_ampli_128samples.wav
-INPUT3 = sin_16536Hz_0.005_ampli_128samples.wav
-INPUT4 = sin_22000Hz_0.005_ampli_128samples.wav
-
+WAV_LENGTH = 128

 
 all: $(IMGOUT)
 
 
 all: $(IMGOUT)
 


@@ -21,13 +16,13 @@ $(IMGOUT): $(CSVOUT)
        octave -qf img_write.m
 
 $(CSVOUT): $(SRC) $(WAVIN)
        octave -qf img_write.m
 
 $(CSVOUT): $(SRC) $(WAVIN)

-       faustine -d $(SRC) -i $(WAVIN) --oformat $(FORMAT) --obasename $(BASENAME)
+       faustine -f $(SRC) -i $(WAVIN) > $@

 
 

-$(WAVIN): $(SINS) $(INPUT1) $(INPUT2) $(INPUT3) $(INPUT4)
-       faustine -d $(SINS) -i $(INPUT1) -i $(INPUT2) -i $(INPUT3) -i $(INPUT4) --oformat $(WAV_FORMAT) --obasename $(WAV_BASENAME)
+$(WAVIN): $(SINS)
+       faustine -f $(SINSUM) -l $(WAV_LENGTH) > $@

 
 clean::
 
 clean::

-       rm -f gmon.out output*
+       rm -f gmon.out $(CSVOUT) $(IMGOUT) $(WAVIN) *~