New directory tree, with preprocessor/ inside interpretor/.

[Faustine.git] / Makefile

diff --git a/Makefile b/Makefile
index 7ed6e35..281af3b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SRC_DIR = interpretor
-PREPROCESSOR_DIR = $(SRC_DIR)/faust-0.9.47mr3
-OUTPUTSOUNDS_DIR = output_sounds
+PREPROCESSOR_DIR = $(SRC_DIR)/preprocessor/faust-0.9.47mr3
+OUTPUTSOUNDS_DIR = examples/output_sounds
 EXEC = faustine
 
 all: $(EXEC)
@@ -13,7 +13,7 @@ faustine:
 .PHONY: clean mrproper
 
 clean:
-       @cd $(SRC_DIR) && $(MAKE) clean)
+       @(cd $(SRC_DIR) && $(MAKE) clean)
        @(rm -f *~)
 
 mrproper: clean
@@ -22,17 +22,16 @@ mrproper: clean
 
 test: 
        @rm -f $(OUTPUTSOUNDS_DIR)/output0.wav
-       @cd $(SRC_DIR) && ./faustine -csv -wav ../dsp_files/sin.dsp
+       @cd $(SRC_DIR) && ./faustine -d ../dsp_files/sin.dsp
        @ls -l $(OUTPUTSOUNDS_DIR)/output0.wav
 
        @echo "    You might want to check the output file with either:"
-       @echo "audacity ../output_sounds/output0.wav"
-       @echo "open ../output_sounds/output0.wav"
-       @echo "octave -q --eval 'plot(wavread(\"output_sounds/output0.wav\")); pause'"
+       @echo "audacity ../examples/output_sounds/output0.wav"
+       @echo "open ../examples/output_sounds/output0.wav"
+       @echo "octave -q --eval 'plot(wavread(\"../examples/output_sounds/output0.wav\")); pause'"
 
 # Library paths for OCaml and libsndfile-ocaml
 # OCAML_INCLUDE_PATH
 # SNDFILE_PATH
-
 OCAML_INCLUDE_PATH = /usr/local/lib/ocaml
-SNDFILE_PATH = ~/Boulot/2013-07-CRI/lib/libsndfile-ocaml
+SNDFILE_PATH = /Users/karimbarkati/Boulot/2013-07-CRI/Interpretor/libsndfile-ocaml